diff --git a/docs/openstack.md b/docs/openstack.md index 1a82133c08cb99464c3d7667c256618e4049bab4..77bb293bfa32469648242b98a89393a0a962d1d0 100644 --- a/docs/openstack.md +++ b/docs/openstack.md @@ -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. diff --git a/roles/kubernetes-apps/helm/tasks/main.yml b/roles/kubernetes-apps/helm/tasks/main.yml index 1d50f8b9b996e999037588856ce278014987ec86..f12875da2bcab9c950520d228bd1ff81966e6fec 100644 --- a/roles/kubernetes-apps/helm/tasks/main.yml +++ b/roles/kubernetes-apps/helm/tasks/main.yml @@ -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"] ) diff --git a/scripts/premoderator.sh b/scripts/premoderator.sh index 4b35af8d20107606636d18fbebc2295f643b04df..9ad490a57344ad1f7267066f7236d16540890b93 100644 --- a/scripts/premoderator.sh +++ b/scripts/premoderator.sh @@ -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/kargo/issues/${issue}/comments" \ +user=$(curl ${CURL_ARGS} "https://api.github.com/repos/kubernetes-incubator/kubespray/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