From db15b5e30b597600ced588e5916ec3f85ba65948 Mon Sep 17 00:00:00 2001 From: Sean Eagan Date: Tue, 20 Mar 2018 10:53:53 -0500 Subject: [PATCH] Support pod dependencies Adds support for a new feature of kubernetes-entrypoint, pod dependencies, that was added in v0.3.0. Change-Id: I78d9e0545ca3b837cd2386783386a253f7f5a2d6 --- calico/values.yaml | 2 +- elasticsearch/values.yaml | 2 +- flannel/values.yaml | 2 +- fluent-logging/values.yaml | 2 +- grafana/values.yaml | 2 +- .../snippets/_kubernetes_entrypoint_init_container.tpl | 4 ++++ .../templates/snippets/_kubernetes_pod_rbac_roles.tpl | 2 +- .../snippets/_kubernetes_pod_rbac_serviceaccount.tpl | 2 ++ kibana/values.yaml | 2 +- kube-dns/values.yaml | 2 +- nfs-provisioner/values.yaml | 2 +- prometheus-alertmanager/values.yaml | 2 +- prometheus-kube-state-metrics/values.yaml | 2 +- prometheus-node-exporter/values.yaml | 2 +- prometheus-openstack-exporter/values.yaml | 2 +- prometheus/values.yaml | 2 +- redis/values.yaml | 2 +- registry/values.yaml | 4 ++-- tiller/values.yaml | 2 +- 19 files changed, 24 insertions(+), 18 deletions(-) diff --git a/calico/values.yaml b/calico/values.yaml index d48c62f8e..4f3d6e3f9 100644 --- a/calico/values.yaml +++ b/calico/values.yaml @@ -33,7 +33,7 @@ images: calico_ctl: quay.io/calico/ctl:v1.6.2 calico_settings: quay.io/calico/ctl:v1.6.2 calico_kube_policy_controller: quay.io/calico/kube-policy-controller:v0.7.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index df27d6819..9e13ea350 100644 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -24,7 +24,7 @@ images: elasticsearch: docker.io/elasticsearch:5.6.4 helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 prometheus_elasticsearch_exporter: docker.io/justwatch/elasticsearch_exporter:1.0.1 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 snapshot_repository: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/flannel/values.yaml b/flannel/values.yaml index a920a0f99..6257fd037 100644 --- a/flannel/values.yaml +++ b/flannel/values.yaml @@ -21,7 +21,7 @@ labels: images: tags: flannel: quay.io/coreos/flannel:v0.8.0-amd64 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/fluent-logging/values.yaml b/fluent-logging/values.yaml index 0c6a8121b..8e4bcf3d5 100644 --- a/fluent-logging/values.yaml +++ b/fluent-logging/values.yaml @@ -37,7 +37,7 @@ images: fluentbit: docker.io/fluent/fluent-bit:0.12.14 fluentd: docker.io/kolla/ubuntu-source-fluentd:ocata prometheus_fluentd_exporter: docker.io/srwilkers/fluentd_exporter:v0.1 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 elasticsearch_template: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 image_repo_sync: docker.io/docker:17.07.0 diff --git a/grafana/values.yaml b/grafana/values.yaml index d0fb39f95..026ea15d3 100644 --- a/grafana/values.yaml +++ b/grafana/values.yaml @@ -20,7 +20,7 @@ images: tags: grafana: docker.io/grafana/grafana:4.5.2 datasource: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 grafana_db_session_sync: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 image_repo_sync: docker.io/docker:17.07.0 diff --git a/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl b/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl index 669daf02e..78e422474 100644 --- a/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl +++ b/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl @@ -33,6 +33,8 @@ limitations under the License. fieldPath: metadata.namespace - name: INTERFACE_NAME value: eth0 + - name: PATH + value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/ - name: DEPENDENCY_SERVICE value: "{{ tuple $deps.services $envAll | include "helm-toolkit.utils.comma_joined_service_list" }}" - name: DEPENDENCY_JOBS @@ -41,6 +43,8 @@ limitations under the License. value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.daemonset }}" - name: DEPENDENCY_CONTAINER value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.container }}" + - name: DEPENDENCY_POD + value: {{ if $deps.pod }}{{ toJson $deps.pod | quote }}{{ else }}""{{ end }} - name: COMMAND value: "echo done" command: diff --git a/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_roles.tpl b/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_roles.tpl index 1284b36c9..f9f48ef7b 100644 --- a/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_roles.tpl +++ b/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_roles.tpl @@ -57,7 +57,7 @@ rules: {{ if eq $v "jobs" }} - jobs {{- end -}} - {{ if or (eq $v "daemonsets") (eq $v "jobs") }} + {{ if or (eq $v "pods") (eq $v "daemonsets") (eq $v "jobs") }} - pods {{- end -}} {{ if eq $v "services" }} diff --git a/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl b/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl index 73bc903b9..b96f099b9 100644 --- a/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl +++ b/helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl @@ -40,6 +40,8 @@ metadata: {{- $_ := set $allNamespace $saNamespace (printf "%s%s" "jobs," ((index $allNamespace $saNamespace) | default "")) }} {{- else if and (eq $k "daemonset") $v }} {{- $_ := set $allNamespace $saNamespace (printf "%s%s" "daemonsets," ((index $allNamespace $saNamespace) | default "")) }} +{{- else if and (eq $k "pod") $v }} +{{- $_ := set $allNamespace $saNamespace (printf "%s%s" "pods," ((index $allNamespace $saNamespace) | default "")) }} {{- end -}} {{- end -}} {{- $_ := unset $allNamespace $randomKey }} diff --git a/kibana/values.yaml b/kibana/values.yaml index e1b43f619..a8f2872c0 100644 --- a/kibana/values.yaml +++ b/kibana/values.yaml @@ -21,7 +21,7 @@ images: tags: apache_proxy: docker.io/httpd:2.4 kibana: docker.io/kibana:5.6.4 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/kube-dns/values.yaml b/kube-dns/values.yaml index c365a769d..ecbb61173 100644 --- a/kube-dns/values.yaml +++ b/kube-dns/values.yaml @@ -23,7 +23,7 @@ images: kube_dns: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5 kube_dns_nanny: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5 kube_dns_sidecar: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/nfs-provisioner/values.yaml b/nfs-provisioner/values.yaml index e3b988226..f816dcd14 100644 --- a/nfs-provisioner/values.yaml +++ b/nfs-provisioner/values.yaml @@ -47,7 +47,7 @@ pod: images: tags: nfs_provisioner: quay.io/kubernetes_incubator/nfs-provisioner:v1.0.8 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/prometheus-alertmanager/values.yaml b/prometheus-alertmanager/values.yaml index 75180e612..d0127a049 100644 --- a/prometheus-alertmanager/values.yaml +++ b/prometheus-alertmanager/values.yaml @@ -20,7 +20,7 @@ images: tags: alertmanager: docker.io/prom/alertmanager:v0.11.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/prometheus-kube-state-metrics/values.yaml b/prometheus-kube-state-metrics/values.yaml index 52c213bfa..3258cd029 100644 --- a/prometheus-kube-state-metrics/values.yaml +++ b/prometheus-kube-state-metrics/values.yaml @@ -19,7 +19,7 @@ images: tags: kube_state_metrics: quay.io/coreos/kube-state-metrics:v1.2.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/prometheus-node-exporter/values.yaml b/prometheus-node-exporter/values.yaml index a35df2226..5580b4dcd 100644 --- a/prometheus-node-exporter/values.yaml +++ b/prometheus-node-exporter/values.yaml @@ -19,7 +19,7 @@ images: tags: node_exporter: docker.io/prom/node-exporter:v0.15.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/prometheus-openstack-exporter/values.yaml b/prometheus-openstack-exporter/values.yaml index 0983b36e9..cccb4b046 100644 --- a/prometheus-openstack-exporter/values.yaml +++ b/prometheus-openstack-exporter/values.yaml @@ -19,7 +19,7 @@ images: tags: prometheus_openstack_exporter: docker.io/rakeshpatnaik/prometheus-openstack-exporter:v0.1 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 image_repo_sync: docker.io/docker:17.07.0 ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 pull_policy: IfNotPresent diff --git a/prometheus/values.yaml b/prometheus/values.yaml index 10fffb584..ff830b272 100644 --- a/prometheus/values.yaml +++ b/prometheus/values.yaml @@ -21,7 +21,7 @@ images: tags: prometheus: docker.io/prom/prometheus:v2.0.0 helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/redis/values.yaml b/redis/values.yaml index 388edee75..ff5aaeca5 100644 --- a/redis/values.yaml +++ b/redis/values.yaml @@ -20,7 +20,7 @@ images: tags: redis: docker.io/redis:4.0.1 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/registry/values.yaml b/registry/values.yaml index 04423c182..d7f600359 100644 --- a/registry/values.yaml +++ b/registry/values.yaml @@ -28,7 +28,7 @@ images: registry: docker.io/registry:2 registry_proxy: gcr.io/google_containers/kube-registry-proxy:0.4 bootstrap: docker.io/docker:17.07.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 pull_policy: "IfNotPresent" local_registry: active: false @@ -117,7 +117,7 @@ bootstrap: script: docker info preload_images: - - quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + - quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 dependencies: static: diff --git a/tiller/values.yaml b/tiller/values.yaml index 8c577ee89..695e8a3fe 100644 --- a/tiller/values.yaml +++ b/tiller/values.yaml @@ -26,7 +26,7 @@ release_group: null images: tags: tiller: gcr.io/kubernetes-helm/tiller:v2.7.2 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: