Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
bae5ce0b
Commit
bae5ce0b
authored
7 years ago
by
Spencer Smith
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into rename
parents
8203383c
cc5edb72
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/openstack.md
+3
-7
3 additions, 7 deletions
docs/openstack.md
roles/kubernetes-apps/helm/tasks/main.yml
+1
-1
1 addition, 1 deletion
roles/kubernetes-apps/helm/tasks/main.yml
scripts/premoderator.sh
+1
-1
1 addition, 1 deletion
scripts/premoderator.sh
with
5 additions
and
9 deletions
docs/openstack.md
+
3
−
7
View file @
bae5ce0b
...
...
@@ -37,12 +37,8 @@ Then you can use the instance ids to find the connected [neutron](https://wiki.o
Given the port ids on the left, you can set the
`allowed_address_pairs`
in neutron:
# allow kube_service_addresses network
neutron port-update 5662a4e0-e646-47f0-bf88-d80fbd2d99ef --allowed_address_pairs list=true type=dict ip_address=10.233.0.0/18
neutron port-update e5ae2045-a1e1-4e99-9aac-4353889449a7 --allowed_address_pairs list=true type=dict ip_address=10.233.0.0/18
# allow kube_pods_subnet network
neutron port-update 5662a4e0-e646-47f0-bf88-d80fbd2d99ef --allowed_address_pairs list=true type=dict ip_address=10.233.64.0/18
neutron port-update e5ae2045-a1e1-4e99-9aac-4353889449a7 --allowed_address_pairs list=true type=dict ip_address=10.233.64.0/18
# allow kube_service_addresses and kube_pods_subnet network
neutron port-update 5662a4e0-e646-47f0-bf88-d80fbd2d99ef --allowed_address_pairs list=true type=dict ip_address=10.233.0.0/18 ip_address=10.233.64.0/18
neutron port-update e5ae2045-a1e1-4e99-9aac-4353889449a7 --allowed_address_pairs list=true type=dict ip_address=10.233.0.0/18 ip_address=10.233.64.0/18
Now you can finally run the playbook.
This diff is collapsed.
Click to expand it.
roles/kubernetes-apps/helm/tasks/main.yml
+
1
−
1
View file @
bae5ce0b
...
...
@@ -15,5 +15,5 @@
when
:
helm_container.changed
-
name
:
Helm | Set up bash completion
shell
:
"
umask
022
&&
{{
bin_dir
}}/helm
completion
>/etc/bash_completion.d/helm.sh"
shell
:
"
umask
022
&&
{{
bin_dir
}}/helm
completion
bash
>/etc/bash_completion.d/helm.sh"
when
:
( helm_container.changed and not ansible_os_family in ["CoreOS", "Container Linux by CoreOS"] )
This diff is collapsed.
Click to expand it.
scripts/premoderator.sh
+
1
−
1
View file @
bae5ce0b
...
...
@@ -8,7 +8,7 @@ MAGIC="${MAGIC:-ci check this}"
# Get PR number from CI_BUILD_REF_NAME
issue
=
$(
echo
${
CI_BUILD_REF_NAME
}
| perl
-ne
'/^pr-(\d+)-\S+$/ && print $1'
)
# Get the user name from the PR comments with the wanted magic incantation casted
user
=
$(
curl
${
CURL_ARGS
}
"https://api.github.com/repos/kubernetes-incubator/k
argo
/issues/
${
issue
}
/comments"
\
user
=
$(
curl
${
CURL_ARGS
}
"https://api.github.com/repos/kubernetes-incubator/k
ubespray
/issues/
${
issue
}
/comments"
\
| jq
-M
"map(select(.body | contains (
\"
$MAGIC
\"
))) | .[0] .user.login"
|
tr
-d
'"'
)
# Check for the required user group membership to allow (exit 0) or decline (exit >0) the pipeline
if
[
"
$user
"
=
"null"
]
;
then
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment