openstack
/
openstack-helm-infra
Code Issues Proposed changes

Support pod dependencies 

Adds support for a new feature of kubernetes-entrypoint, pod
dependencies, that was added in v0.3.0.

Change-Id: I78d9e0545ca3b837cd2386783386a253f7f5a2d6
This commit is contained in:
Sean Eagan 2018-03-20 10:53:53 -05:00
parent f461e53e52
commit db15b5e30b
19 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calico/values.yaml
View File

@ -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:

2
elasticsearch/values.yaml
View File

@ -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"

2
flannel/values.yaml
View File

@ -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:

2
fluent-logging/values.yaml
View File

@ -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

2
grafana/values.yaml
View File

@ -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

4
helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl
View File

@ -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:

2
helm-toolkit/templates/snippets/_kubernetes_pod_rbac_roles.tpl
View File

@ -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" }}

2
helm-toolkit/templates/snippets/_kubernetes_pod_rbac_serviceaccount.tpl
View File

@ -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 }}

2
kibana/values.yaml
View File

@ -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:

2
kube-dns/values.yaml
View File

@ -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:

2
nfs-provisioner/values.yaml
View File

@ -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:

2
prometheus-alertmanager/values.yaml
View File

@ -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:

2
prometheus-kube-state-metrics/values.yaml
View File

@ -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:

2
prometheus-node-exporter/values.yaml
View File

@ -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:

2
prometheus-openstack-exporter/values.yaml
View File

@ -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

2
prometheus/values.yaml
View File

@ -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:

2
redis/values.yaml
View File

@ -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:

4
registry/values.yaml
View File

@ -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:

2
tiller/values.yaml
View File

@ -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: