From e0c688d7eeada1cc5a2c5b7a301dc583ff180c28 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Fri, 23 Feb 2018 10:35:23 -0800 Subject: [PATCH] dependencies: move static dependencies under a 'static' key This PS moves static dependencies unser a 'static' key to allow expansion to cover dynamic dependencies. Change-Id: Ia0e853564955e0fbbe5a9e91a8b8924c703b1b02 --- calico/templates/daemonset-calico-etcd.yaml | 4 +- calico/templates/daemonset-calico-node.yaml | 4 +- .../deployment-calico-kube-controllers.yaml | 4 +- calico/templates/job-calico-settings.yaml | 2 +- calico/templates/job-image-repo-sync.yaml | 2 +- calico/values.yaml | 29 ++++---- elasticsearch/templates/cron-job-curator.yaml | 2 +- .../templates/deployment-client.yaml | 4 +- .../templates/deployment-master.yaml | 4 +- .../templates/job-image-repo-sync.yaml | 2 +- .../job-register-snapshot-repository.yaml | 2 +- .../prometheus/exporter-deployment.yaml | 4 +- elasticsearch/templates/statefulset-data.yaml | 4 +- elasticsearch/values.yaml | 41 +++++------ .../templates/daemonset-kube-flannel-ds.yaml | 4 +- flannel/templates/job-image-repo-sync.yaml | 2 +- flannel/values.yaml | 13 ++-- .../templates/daemonset-fluent-bit.yaml | 6 +- .../templates/deployment-fluentd.yaml | 4 +- .../templates/job-elasticsearch-template.yaml | 2 +- .../templates/job-image-repo-sync.yaml | 2 +- .../prometheus/exporter-deployment.yaml | 2 +- fluent-logging/values.yaml | 69 ++++++++++--------- grafana/templates/deployment.yaml | 4 +- grafana/templates/job-db-init-session.yaml | 2 +- grafana/templates/job-db-init.yaml | 2 +- grafana/templates/job-db-session-sync.yaml | 2 +- grafana/templates/job-image-repo-sync.yaml | 2 +- .../templates/job-prometheus-datasource.yaml | 2 +- grafana/values.yaml | 59 ++++++++-------- kibana/templates/deployment.yaml | 4 +- kibana/templates/job-image-repo-sync.yaml | 2 +- kibana/values.yaml | 17 ++--- kube-dns/templates/deployment-kube-dns.yaml | 4 +- kube-dns/templates/job-image-repo-sync.yaml | 2 +- kube-dns/values.yaml | 13 ++-- nfs-provisioner/templates/deployment.yaml | 4 +- .../templates/job-image-repo-sync.yaml | 2 +- nfs-provisioner/values.yaml | 13 ++-- .../templates/job-image-repo-sync.yaml | 2 +- .../templates/statefulset.yaml | 4 +- prometheus-alertmanager/values.yaml | 23 ++++--- .../templates/deployment.yaml | 4 +- .../templates/job-image-repo-sync.yaml | 2 +- prometheus-kube-state-metrics/values.yaml | 19 ++--- .../templates/daemonset.yaml | 4 +- .../templates/job-image-repo-sync.yaml | 2 +- prometheus-node-exporter/values.yaml | 23 ++++--- .../templates/deployment.yaml | 4 +- .../templates/job-image-repo-sync.yaml | 2 +- .../templates/job-ks-user.yaml | 2 +- prometheus-openstack-exporter/values.yaml | 29 ++++---- prometheus/templates/job-image-repo-sync.yaml | 2 +- prometheus/templates/statefulset.yaml | 4 +- prometheus/values.yaml | 23 ++++--- redis/templates/deployment.yaml | 4 +- redis/templates/job-image-repo-sync.yaml | 2 +- redis/values.yaml | 13 ++-- .../templates/daemonset-registry-proxy.yaml | 4 +- registry/templates/deployment-registry.yaml | 4 +- registry/templates/job-bootstrap.yaml | 4 +- registry/values.yaml | 39 ++++++----- tiller/templates/deployment-tiller.yaml | 4 +- tiller/templates/job-image-repo-sync.yaml | 2 +- tiller/values.yaml | 13 ++-- tools/gate/chart-deploys/default.yaml | 14 ++-- 66 files changed, 308 insertions(+), 290 deletions(-) diff --git a/calico/templates/daemonset-calico-etcd.yaml b/calico/templates/daemonset-calico-etcd.yaml index 2f7109c90..ce1521d96 100644 --- a/calico/templates/daemonset-calico-etcd.yaml +++ b/calico/templates/daemonset-calico-etcd.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.etcd .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.etcd .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.etcd -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.etcd -}} {{- end -}} {{- $serviceAccountName := "calico-etcd"}} diff --git a/calico/templates/daemonset-calico-node.yaml b/calico/templates/daemonset-calico-node.yaml index 63f49d903..e54f1b63e 100644 --- a/calico/templates/daemonset-calico-node.yaml +++ b/calico/templates/daemonset-calico-node.yaml @@ -35,9 +35,9 @@ limitations under the License. {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.calico_node .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.calico_node .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.calico_node -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.calico_node -}} {{- end -}} {{- $prometheus_annotations := $envAll.Values.monitoring.prometheus.calico_node }} diff --git a/calico/templates/deployment-calico-kube-controllers.yaml b/calico/templates/deployment-calico-kube-controllers.yaml index af7f41bef..ef778642b 100644 --- a/calico/templates/deployment-calico-kube-controllers.yaml +++ b/calico/templates/deployment-calico-kube-controllers.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.calico_kube_policy_controllers .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.calico_kube_policy_controllers .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.calico_kube_policy_controllers -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.calico_kube_policy_controllers -}} {{- end -}} {{- $serviceAccountName := printf "%s-%s" .Release.Name "calico-kube-controllers"}} diff --git a/calico/templates/job-calico-settings.yaml b/calico/templates/job-calico-settings.yaml index 45a513bb2..1096557aa 100644 --- a/calico/templates/job-calico-settings.yaml +++ b/calico/templates/job-calico-settings.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_calico_settings }} {{- $envAll := . }} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.calico_settings -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.calico_settings -}} {{- $serviceAccountName := "calico-settings"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/calico/templates/job-image-repo-sync.yaml b/calico/templates/job-image-repo-sync.yaml index afd26fd43..edfc09012 100644 --- a/calico/templates/job-image-repo-sync.yaml +++ b/calico/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "calico-image-repo-sync"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/calico/values.yaml b/calico/values.yaml index 4837df38e..66901d2cc 100644 --- a/calico/values.yaml +++ b/calico/values.yaml @@ -117,20 +117,21 @@ pod: timeout: 5 dependencies: - etcd: - services: null - calico_node: - services: - - service: etcd - endpoint: internal - calico_settings: - services: - - service: etcd - endpoint: internal - calico_kube_policy_controllers: - services: - - service: etcd - endpoint: internal + static: + calico_kube_policy_controllers: + services: + - endpoint: internal + service: etcd + calico_node: + services: + - endpoint: internal + service: etcd + calico_settings: + services: + - endpoint: internal + service: etcd + etcd: + services: null conditional_dependencies: local_image_registry: diff --git a/elasticsearch/templates/cron-job-curator.yaml b/elasticsearch/templates/cron-job-curator.yaml index 60f41417e..a6da2dae0 100644 --- a/elasticsearch/templates/cron-job-curator.yaml +++ b/elasticsearch/templates/cron-job-curator.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.cron_curator }} {{- if .Capabilities.APIVersions.Has "batch/v2alpha1" }} {{- $envAll := . }} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.curator -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.curator -}} {{- $serviceAccountName := "elastic-curator"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/elasticsearch/templates/deployment-client.yaml b/elasticsearch/templates/deployment-client.yaml index 324412936..fd2f98bbb 100644 --- a/elasticsearch/templates/deployment-client.yaml +++ b/elasticsearch/templates/deployment-client.yaml @@ -19,9 +19,9 @@ limitations under the License. {{- $esUserSecret := .Values.secrets.elasticsearch.user }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.elasticsearch_client .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.elasticsearch_client .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.elasticsearch_client -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.elasticsearch_client -}} {{- end -}} {{- $mounts_elasticsearch := .Values.pod.mounts.elasticsearch.elasticsearch }} diff --git a/elasticsearch/templates/deployment-master.yaml b/elasticsearch/templates/deployment-master.yaml index 8b02bcb60..a8ced6b88 100644 --- a/elasticsearch/templates/deployment-master.yaml +++ b/elasticsearch/templates/deployment-master.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.elasticsearch_master .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.elasticsearch_master .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.elasticsearch_master -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.elasticsearch_master -}} {{- end -}} {{- $mounts_elasticsearch := .Values.pod.mounts.elasticsearch.elasticsearch }} diff --git a/elasticsearch/templates/job-image-repo-sync.yaml b/elasticsearch/templates/job-image-repo-sync.yaml index 0d75d6d19..d07425b85 100644 --- a/elasticsearch/templates/job-image-repo-sync.yaml +++ b/elasticsearch/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "elasticsearch-image-repo-sync"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/elasticsearch/templates/job-register-snapshot-repository.yaml b/elasticsearch/templates/job-register-snapshot-repository.yaml index e82554545..e86a92deb 100644 --- a/elasticsearch/templates/job-register-snapshot-repository.yaml +++ b/elasticsearch/templates/job-register-snapshot-repository.yaml @@ -18,7 +18,7 @@ limitations under the License. {{- if .Values.conf.elasticsearch.repository.enabled }} {{- $envAll := . }} {{- $esUserSecret := .Values.secrets.elasticsearch.user }} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.snapshot_repository -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.snapshot_repository -}} {{- $serviceAccountName := "elasticsearch-register-snapshot-repository" }} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/elasticsearch/templates/monitoring/prometheus/exporter-deployment.yaml b/elasticsearch/templates/monitoring/prometheus/exporter-deployment.yaml index e1bc5c5a0..a95f9375c 100644 --- a/elasticsearch/templates/monitoring/prometheus/exporter-deployment.yaml +++ b/elasticsearch/templates/monitoring/prometheus/exporter-deployment.yaml @@ -17,9 +17,9 @@ limitations under the License. {{- if and .Values.manifests.monitoring.prometheus.deployment_exporter .Values.monitoring.prometheus.enabled }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" (merge .Values.dependencies.prometheus_elasticsearch_exporter .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := set .Values "pod_dependency" (merge .Values.dependencies.static.prometheus_elasticsearch_exporter .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.prometheus_elasticsearch_exporter -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.prometheus_elasticsearch_exporter -}} {{- end -}} {{- $esUserSecret := .Values.secrets.elasticsearch.user }} diff --git a/elasticsearch/templates/statefulset-data.yaml b/elasticsearch/templates/statefulset-data.yaml index 466071962..09222c710 100644 --- a/elasticsearch/templates/statefulset-data.yaml +++ b/elasticsearch/templates/statefulset-data.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.elasticsearch_data .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.elasticsearch_data .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.elasticsearch_data -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.elasticsearch_data -}} {{- end -}} {{- $mounts_elasticsearch := .Values.pod.mounts.elasticsearch.elasticsearch }} diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index 6a3555a69..91f810695 100644 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -39,26 +39,27 @@ labels: node_selector_value: enabled dependencies: - elasticsearch_client: - services: null - elasticsearch_master: - services: null - elasticsearch_data: - services: null - prometheus_elasticsearch_exporter: - services: - - service: elasticsearch - endpoint: internal - curator: - services: null - image_repo_sync: - services: - - service: local_image_registry - endpoint: internal - snapshot_repository: - services: - - service: elasticsearch - endpoint: internal + static: + curator: + services: null + elasticsearch_client: + services: null + elasticsearch_data: + services: null + elasticsearch_master: + services: null + image_repo_sync: + services: + - endpoint: internal + service: local_image_registry + prometheus_elasticsearch_exporter: + services: + - endpoint: internal + service: elasticsearch + snapshot_repository: + services: + - endpoint: internal + service: elasticsearch conditional_dependencies: local_image_registry: diff --git a/flannel/templates/daemonset-kube-flannel-ds.yaml b/flannel/templates/daemonset-kube-flannel-ds.yaml index ae03a0417..e2209a0d7 100644 --- a/flannel/templates/daemonset-kube-flannel-ds.yaml +++ b/flannel/templates/daemonset-kube-flannel-ds.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.flannel .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.flannel .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.flannel -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.flannel -}} {{- end -}} {{- $serviceAccountName := printf "%s-%s" .Release.Name "flannel"}} diff --git a/flannel/templates/job-image-repo-sync.yaml b/flannel/templates/job-image-repo-sync.yaml index 012ec8940..bd86aca01 100644 --- a/flannel/templates/job-image-repo-sync.yaml +++ b/flannel/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "flannel-image-repo-sync"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/flannel/values.yaml b/flannel/values.yaml index b1f5007f7..076b5749b 100644 --- a/flannel/values.yaml +++ b/flannel/values.yaml @@ -47,12 +47,13 @@ networking: podSubnet: 192.168.0.0/16 dependencies: - flannel: - services: null - image_repo_sync: - services: - - service: local_image_registry - endpoint: internal + static: + flannel: + services: null + image_repo_sync: + services: + - endpoint: internal + service: local_image_registry conditional_dependencies: local_image_registry: diff --git a/fluent-logging/templates/daemonset-fluent-bit.yaml b/fluent-logging/templates/daemonset-fluent-bit.yaml index c7ad407e3..07020c19f 100644 --- a/fluent-logging/templates/daemonset-fluent-bit.yaml +++ b/fluent-logging/templates/daemonset-fluent-bit.yaml @@ -16,12 +16,12 @@ limitations under the License. {{- if .Values.manifests.daemonset_fluentbit }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.fluentbit }} +{{- $dependencies := .Values.dependencies.static.fluentbit }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.fluentbit .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.fluentbit .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.fluentbit -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.fluentbit -}} {{- end -}} {{- $mounts_fluentbit := .Values.pod.mounts.fluentbit.fluentbit }} diff --git a/fluent-logging/templates/deployment-fluentd.yaml b/fluent-logging/templates/deployment-fluentd.yaml index a77297d6a..9f4ed7572 100644 --- a/fluent-logging/templates/deployment-fluentd.yaml +++ b/fluent-logging/templates/deployment-fluentd.yaml @@ -19,9 +19,9 @@ limitations under the License. {{- $esUserSecret := .Values.secrets.elasticsearch.user }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.fluentd .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.fluentd .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.fluentd -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.fluentd -}} {{- end -}} {{- $mounts_fluentd := .Values.pod.mounts.fluentd.fluentd }} diff --git a/fluent-logging/templates/job-elasticsearch-template.yaml b/fluent-logging/templates/job-elasticsearch-template.yaml index 415f05d68..ad90cc1c0 100644 --- a/fluent-logging/templates/job-elasticsearch-template.yaml +++ b/fluent-logging/templates/job-elasticsearch-template.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_elasticsearch_template }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.elasticsearch_template }} +{{- $dependencies := .Values.dependencies.static.elasticsearch_template }} {{- $mounts_elasticsearch_template := .Values.pod.mounts.elasticsearch_template.elasticsearch_template }} {{- $mounts_elasticsearch_template_init := .Values.pod.mounts.elasticsearch_template.init_container }} --- diff --git a/fluent-logging/templates/job-image-repo-sync.yaml b/fluent-logging/templates/job-image-repo-sync.yaml index 9c74f366e..41d479408 100644 --- a/fluent-logging/templates/job-image-repo-sync.yaml +++ b/fluent-logging/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "fluent-logging-image-repo-sync"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml b/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml index fb5aea59f..1f9e175be 100644 --- a/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml +++ b/fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if and .Values.manifests.monitoring.prometheus.deployment_exporter .Values.monitoring.prometheus.enabled }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.prometheus_fluentd_exporter }} +{{- $dependencies := .Values.dependencies.static.prometheus_fluentd_exporter }} {{ $fluentd_host := tuple "fluentd" "internal" "metrics" $envAll | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" }} {{ $fluentd_metrics_path := "api/plugins.json" }} diff --git a/fluent-logging/values.yaml b/fluent-logging/values.yaml index 7ec2ecb94..ae125d3a9 100644 --- a/fluent-logging/values.yaml +++ b/fluent-logging/values.yaml @@ -53,40 +53,41 @@ secrets: user: fluentd-elasticsearch-user dependencies: - image_repo_sync: - services: - - service: local_image_registry - endpoint: internal - fluentd: - services: - - service: elasticsearch - endpoint: internal - fluentd_with_kafka: - services: - - service: elasticsearch - endpoint: internal - - service: kafka - endpoint: public - fluentbit: - jobs: - - elasticsearch-template - services: - - service: fluentd - endpoint: internal - elasticsearch-template: - services: - - service: elasticsearch - endpoint: internal - tests: - services: - - service: elasticsearch - endpoint: internal - - service: fluentd - endpoint: internal - prometheus_fluentd_exporter: - services: - - service: fluentd - endpoint: internal + static: + elasticsearch-template: + services: + - endpoint: internal + service: elasticsearch + fluentbit: + jobs: + - elasticsearch-template + services: + - endpoint: internal + service: fluentd + fluentd: + services: + - endpoint: internal + service: elasticsearch + fluentd_with_kafka: + services: + - endpoint: internal + service: elasticsearch + - endpoint: public + service: kafka + image_repo_sync: + services: + - endpoint: internal + service: local_image_registry + prometheus_fluentd_exporter: + services: + - endpoint: internal + service: fluentd + tests: + services: + - endpoint: internal + service: elasticsearch + - endpoint: internal + service: fluentd conditional_dependencies: local_image_registry: diff --git a/grafana/templates/deployment.yaml b/grafana/templates/deployment.yaml index de2a5ac6e..e37bc175d 100644 --- a/grafana/templates/deployment.yaml +++ b/grafana/templates/deployment.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.grafana .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.grafana .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.grafana -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.grafana -}} {{- end -}} {{- $mounts_grafana := .Values.pod.mounts.grafana.grafana }} diff --git a/grafana/templates/job-db-init-session.yaml b/grafana/templates/job-db-init-session.yaml index ee80903a2..d8753c872 100644 --- a/grafana/templates/job-db-init-session.yaml +++ b/grafana/templates/job-db-init-session.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_init_session }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_init_session }} +{{- $dependencies := .Values.dependencies.static.db_init_session }} {{- $serviceAccountName := "grafana-db-init-session" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/grafana/templates/job-db-init.yaml b/grafana/templates/job-db-init.yaml index 06de4c034..d395f60ab 100644 --- a/grafana/templates/job-db-init.yaml +++ b/grafana/templates/job-db-init.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_init }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_init }} +{{- $dependencies := .Values.dependencies.static.db_init }} {{- $serviceAccountName := "grafana-db-init" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/grafana/templates/job-db-session-sync.yaml b/grafana/templates/job-db-session-sync.yaml index 439e7ea32..4cdcfa9aa 100644 --- a/grafana/templates/job-db-session-sync.yaml +++ b/grafana/templates/job-db-session-sync.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_db_session_sync }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.db_session_sync }} +{{- $dependencies := .Values.dependencies.static.db_session_sync }} {{- $serviceAccountName := "grafana-db-session-sync" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/grafana/templates/job-image-repo-sync.yaml b/grafana/templates/job-image-repo-sync.yaml index 55a994c55..9ec1fa8e2 100644 --- a/grafana/templates/job-image-repo-sync.yaml +++ b/grafana/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "grafana-image-repo-sync" }} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/grafana/templates/job-prometheus-datasource.yaml b/grafana/templates/job-prometheus-datasource.yaml index 45b69d99e..9c923f727 100644 --- a/grafana/templates/job-prometheus-datasource.yaml +++ b/grafana/templates/job-prometheus-datasource.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_datasource }} {{- $envAll := . }} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.register_datasource -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.register_datasource -}} {{- $serviceAccountName := "grafana-register-datasource" }} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} --- diff --git a/grafana/values.yaml b/grafana/values.yaml index ab4e95e98..a7f39fb41 100644 --- a/grafana/values.yaml +++ b/grafana/values.yaml @@ -180,35 +180,36 @@ endpoints: public: 80 dependencies: - db_init: - services: - - service: oslo_db - endpoint: internal - db_init_session: - services: - - service: oslo_db - endpoint: internal - db_session_sync: - jobs: - - grafana-db-init-session - services: - - service: oslo_db - endpoint: internal - register_datasource: - services: - - service: grafana - endpoint: internal - grafana: - jobs: - - grafana-db-init - - grafana-db-session-sync - services: - - service: oslo_db - endpoint: internal - image_repo_sync: - services: - - service: local_image_registry - endpoint: internal + static: + db_init: + services: + - endpoint: internal + service: oslo_db + db_init_session: + services: + - endpoint: internal + service: oslo_db + db_session_sync: + jobs: + - grafana-db-init-session + services: + - endpoint: internal + service: oslo_db + grafana: + jobs: + - grafana-db-init + - grafana-db-session-sync + services: + - endpoint: internal + service: oslo_db + image_repo_sync: + services: + - endpoint: internal + service: local_image_registry + register_datasource: + services: + - endpoint: internal + service: grafana conditional_dependencies: local_image_registry: diff --git a/kibana/templates/deployment.yaml b/kibana/templates/deployment.yaml index 482438e4c..a8338ae52 100644 --- a/kibana/templates/deployment.yaml +++ b/kibana/templates/deployment.yaml @@ -19,9 +19,9 @@ limitations under the License. {{- $esUserSecret := .Values.secrets.elasticsearch.user }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.kibana .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.kibana .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.kibana -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.kibana -}} {{- end -}} {{- $serviceAccountName := "kibana" }} diff --git a/kibana/templates/job-image-repo-sync.yaml b/kibana/templates/job-image-repo-sync.yaml index 40b222438..b1e3adeb5 100644 --- a/kibana/templates/job-image-repo-sync.yaml +++ b/kibana/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "kibana-image-repo-sync" }} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/kibana/values.yaml b/kibana/values.yaml index 66ec2380a..2b6589b8c 100644 --- a/kibana/values.yaml +++ b/kibana/values.yaml @@ -72,14 +72,15 @@ secrets: admin: kibana-admin-creds dependencies: - kibana: - services: - - service: elasticsearch - endpoint: internal - image_repo_sync: - services: - - service: local_image_registry - endpoint: internal + static: + image_repo_sync: + services: + - endpoint: internal + service: local_image_registry + kibana: + services: + - endpoint: internal + service: elasticsearch conditional_dependencies: local_image_registry: diff --git a/kube-dns/templates/deployment-kube-dns.yaml b/kube-dns/templates/deployment-kube-dns.yaml index 11afe82b8..9288dbd5f 100644 --- a/kube-dns/templates/deployment-kube-dns.yaml +++ b/kube-dns/templates/deployment-kube-dns.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.kube_dns .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.kube_dns .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.kube_dns -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.kube_dns -}} {{- end -}} --- apiVersion: extensions/v1beta1 diff --git a/kube-dns/templates/job-image-repo-sync.yaml b/kube-dns/templates/job-image-repo-sync.yaml index 18041ca25..27a40e6a0 100644 --- a/kube-dns/templates/job-image-repo-sync.yaml +++ b/kube-dns/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "kube-dns-image-repo-sync"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/kube-dns/values.yaml b/kube-dns/values.yaml index a0307cd34..4917945ff 100644 --- a/kube-dns/values.yaml +++ b/kube-dns/values.yaml @@ -49,12 +49,13 @@ networking: dnsIP: 10.96.0.10 dependencies: - kube_dns: - services: null - image_repo_sync: - services: - - service: local_image_registry - endpoint: internal + static: + image_repo_sync: + services: + - endpoint: internal + service: local_image_registry + kube_dns: + services: null conditional_dependencies: local_image_registry: diff --git a/nfs-provisioner/templates/deployment.yaml b/nfs-provisioner/templates/deployment.yaml index 5d59376f8..2450fd2c1 100644 --- a/nfs-provisioner/templates/deployment.yaml +++ b/nfs-provisioner/templates/deployment.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.nfs .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.nfs .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.nfs -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.nfs -}} {{- end -}} {{- $serviceAccountName := printf "%s-%s" .Release.Name "nfs-provisioner"}} diff --git a/nfs-provisioner/templates/job-image-repo-sync.yaml b/nfs-provisioner/templates/job-image-repo-sync.yaml index 364e8d190..6d3b1b7c3 100644 --- a/nfs-provisioner/templates/job-image-repo-sync.yaml +++ b/nfs-provisioner/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "nfs-image-repo-sync"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/nfs-provisioner/values.yaml b/nfs-provisioner/values.yaml index d28b66fd3..60d08aeb9 100644 --- a/nfs-provisioner/values.yaml +++ b/nfs-provisioner/values.yaml @@ -81,12 +81,13 @@ storageclass: name: null dependencies: - nfs: - services: null - image_repo_sync: - services: - - service: local_image_registry - endpoint: internal + static: + image_repo_sync: + services: + - endpoint: internal + service: local_image_registry + nfs: + services: null conditional_dependencies: local_image_registry: diff --git a/prometheus-alertmanager/templates/job-image-repo-sync.yaml b/prometheus-alertmanager/templates/job-image-repo-sync.yaml index db3cce309..ab9c87021 100644 --- a/prometheus-alertmanager/templates/job-image-repo-sync.yaml +++ b/prometheus-alertmanager/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "alertmanager-image-repo-sync"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/prometheus-alertmanager/templates/statefulset.yaml b/prometheus-alertmanager/templates/statefulset.yaml index 20a69100d..38578a9dd 100644 --- a/prometheus-alertmanager/templates/statefulset.yaml +++ b/prometheus-alertmanager/templates/statefulset.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.alertmanager .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.alertmanager .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.alertmanager -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.alertmanager -}} {{- end -}} {{- $mounts_alertmanager := .Values.pod.mounts.alertmanager.alertmanager }} diff --git a/prometheus-alertmanager/values.yaml b/prometheus-alertmanager/values.yaml index a8ae6f278..5ea08636a 100644 --- a/prometheus-alertmanager/values.yaml +++ b/prometheus-alertmanager/values.yaml @@ -35,11 +35,11 @@ labels: pod: affinity: - anti: - type: - default: preferredDuringSchedulingIgnoredDuringExecution - topologyKey: - default: kubernetes.io/hostname + anti: + type: + default: preferredDuringSchedulingIgnoredDuringExecution + topologyKey: + default: kubernetes.io/hostname mounts: alertmanager: alertmanager: @@ -109,12 +109,13 @@ endpoints: default: 6783 dependencies: - alertmanager: - services: null - image_repo_sync: - services: - - service: local_image_registry - endpoint: internal + static: + alertmanager: + services: null + image_repo_sync: + services: + - endpoint: internal + service: local_image_registry conditional_dependencies: local_image_registry: diff --git a/prometheus-kube-state-metrics/templates/deployment.yaml b/prometheus-kube-state-metrics/templates/deployment.yaml index 3168e242d..b2fcfb7dd 100644 --- a/prometheus-kube-state-metrics/templates/deployment.yaml +++ b/prometheus-kube-state-metrics/templates/deployment.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.kube_state_metrics .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.kube_state_metrics .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.kube_state_metrics -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.kube_state_metrics -}} {{- end -}} {{- $serviceAccountName := printf "%s-%s" .Release.Name "kube-state-metrics"}} diff --git a/prometheus-kube-state-metrics/templates/job-image-repo-sync.yaml b/prometheus-kube-state-metrics/templates/job-image-repo-sync.yaml index f763fe072..06d296077 100644 --- a/prometheus-kube-state-metrics/templates/job-image-repo-sync.yaml +++ b/prometheus-kube-state-metrics/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "kube-metrics-image-repo-sync"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/prometheus-kube-state-metrics/values.yaml b/prometheus-kube-state-metrics/values.yaml index 6e739a73a..dea02616b 100644 --- a/prometheus-kube-state-metrics/values.yaml +++ b/prometheus-kube-state-metrics/values.yaml @@ -34,11 +34,11 @@ labels: pod: affinity: - anti: - type: - default: preferredDuringSchedulingIgnoredDuringExecution - topologyKey: - default: kubernetes.io/hostname + anti: + type: + default: preferredDuringSchedulingIgnoredDuringExecution + topologyKey: + default: kubernetes.io/hostname mounts: kube_state_metrics: kube_state_metrics: @@ -74,10 +74,11 @@ pod: cpu: "2000m" dependencies: - image_repo_sync: - services: - - service: local_image_registry - endpoint: internal + static: + image_repo_sync: + services: + - endpoint: internal + service: local_image_registry conditional_dependencies: local_image_registry: diff --git a/prometheus-node-exporter/templates/daemonset.yaml b/prometheus-node-exporter/templates/daemonset.yaml index 3a12b6191..e9c424993 100644 --- a/prometheus-node-exporter/templates/daemonset.yaml +++ b/prometheus-node-exporter/templates/daemonset.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.node_exporter .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.node_exporter .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.node_exporter -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.node_exporter -}} {{- end -}} {{- $serviceAccountName := printf "%s-%s" .Release.Name "node-exporter"}} diff --git a/prometheus-node-exporter/templates/job-image-repo-sync.yaml b/prometheus-node-exporter/templates/job-image-repo-sync.yaml index 8d3c1d396..7392f4bed 100644 --- a/prometheus-node-exporter/templates/job-image-repo-sync.yaml +++ b/prometheus-node-exporter/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "node-exporter-image-repo-sync"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/prometheus-node-exporter/values.yaml b/prometheus-node-exporter/values.yaml index 8faeb513f..cd41c8138 100644 --- a/prometheus-node-exporter/values.yaml +++ b/prometheus-node-exporter/values.yaml @@ -34,11 +34,11 @@ labels: pod: affinity: - anti: - type: - default: preferredDuringSchedulingIgnoredDuringExecution - topologyKey: - default: kubernetes.io/hostname + anti: + type: + default: preferredDuringSchedulingIgnoredDuringExecution + topologyKey: + default: kubernetes.io/hostname mounts: node_exporter: node_exporter: @@ -77,12 +77,13 @@ pod: cpu: "2000m" dependencies: - node_exporter: - services: null - image_repo_sync: - services: - - service: local_image_registry - endpoint: internal + static: + image_repo_sync: + services: + - endpoint: internal + service: local_image_registry + node_exporter: + services: null conditional_dependencies: local_image_registry: diff --git a/prometheus-openstack-exporter/templates/deployment.yaml b/prometheus-openstack-exporter/templates/deployment.yaml index acc5f17c8..f67213ce0 100644 --- a/prometheus-openstack-exporter/templates/deployment.yaml +++ b/prometheus-openstack-exporter/templates/deployment.yaml @@ -19,9 +19,9 @@ limitations under the License. {{- $ksUserSecret := .Values.secrets.identity.user }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.prometheus_openstack_exporter .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.prometheus_openstack_exporter .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.prometheus_openstack_exporter -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.prometheus_openstack_exporter -}} {{- end -}} {{- $serviceAccountName := "prometheus-openstack-exporter" }} diff --git a/prometheus-openstack-exporter/templates/job-image-repo-sync.yaml b/prometheus-openstack-exporter/templates/job-image-repo-sync.yaml index 589ebb877..ab71d7b63 100644 --- a/prometheus-openstack-exporter/templates/job-image-repo-sync.yaml +++ b/prometheus-openstack-exporter/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "prometheus-openstack-exporter-image-repo-sync"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/prometheus-openstack-exporter/templates/job-ks-user.yaml b/prometheus-openstack-exporter/templates/job-ks-user.yaml index d559b02d9..937f98424 100644 --- a/prometheus-openstack-exporter/templates/job-ks-user.yaml +++ b/prometheus-openstack-exporter/templates/job-ks-user.yaml @@ -16,7 +16,7 @@ limitations under the License. {{- if .Values.manifests.job_ks_user }} {{- $envAll := . }} -{{- $dependencies := .Values.dependencies.ks_user }} +{{- $dependencies := .Values.dependencies.static.ks_user }} {{- $serviceAccountName := "prometheus-openstack-exporter-ks-user" }} {{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/prometheus-openstack-exporter/values.yaml b/prometheus-openstack-exporter/values.yaml index 758a997e0..3f527cd12 100644 --- a/prometheus-openstack-exporter/values.yaml +++ b/prometheus-openstack-exporter/values.yaml @@ -82,20 +82,21 @@ pod: cpu: "2000m" dependencies: - ks_user: - services: - - service: identity - endpoint: internal - prometheus_openstack_exporter: - jobs: - - prometheus-openstack-exporter-ks-user - services: - - service: identity - endpoint: internal - image_repo_sync: - services: - - service: local_image_registry - endpoint: internal + static: + image_repo_sync: + services: + - endpoint: internal + service: local_image_registry + ks_user: + services: + - endpoint: internal + service: identity + prometheus_openstack_exporter: + jobs: + - prometheus-openstack-exporter-ks-user + services: + - endpoint: internal + service: identity conditional_dependencies: local_image_registry: diff --git a/prometheus/templates/job-image-repo-sync.yaml b/prometheus/templates/job-image-repo-sync.yaml index 301622614..b239dfb71 100644 --- a/prometheus/templates/job-image-repo-sync.yaml +++ b/prometheus/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "prometheus-image-repo-sync"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/prometheus/templates/statefulset.yaml b/prometheus/templates/statefulset.yaml index 1d7924341..0fc737376 100644 --- a/prometheus/templates/statefulset.yaml +++ b/prometheus/templates/statefulset.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.prometheus .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.prometheus .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.prometheus -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.prometheus -}} {{- end -}} {{- $mounts_prometheus := .Values.pod.mounts.prometheus.prometheus }} diff --git a/prometheus/values.yaml b/prometheus/values.yaml index 386e18f1c..68283cc10 100644 --- a/prometheus/values.yaml +++ b/prometheus/values.yaml @@ -36,11 +36,11 @@ labels: pod: affinity: - anti: - type: - default: preferredDuringSchedulingIgnoredDuringExecution - topologyKey: - default: kubernetes.io/hostname + anti: + type: + default: preferredDuringSchedulingIgnoredDuringExecution + topologyKey: + default: kubernetes.io/hostname mounts: prometheus: prometheus: @@ -130,12 +130,13 @@ endpoints: public: 80 dependencies: - prometheus: - services: null - image_repo_sync: - services: - - service: local_image_registry - endpoint: internal + static: + image_repo_sync: + services: + - endpoint: internal + service: local_image_registry + prometheus: + services: null conditional_dependencies: local_image_registry: diff --git a/redis/templates/deployment.yaml b/redis/templates/deployment.yaml index 7db88ac8e..7d7a29591 100644 --- a/redis/templates/deployment.yaml +++ b/redis/templates/deployment.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.redis .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.redis .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.redis -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.redis -}} {{- end -}} {{- $serviceAccountName := "redis"}} diff --git a/redis/templates/job-image-repo-sync.yaml b/redis/templates/job-image-repo-sync.yaml index 203f3317c..282b24845 100644 --- a/redis/templates/job-image-repo-sync.yaml +++ b/redis/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "redis-image-repo-sync"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/redis/values.yaml b/redis/values.yaml index 41f33e6f4..0fdea747e 100644 --- a/redis/values.yaml +++ b/redis/values.yaml @@ -72,12 +72,13 @@ network: port: 6379 dependencies: - redis: - services: null - image_repo_sync: - services: - - service: local_image_registry - endpoint: internal + static: + image_repo_sync: + services: + - endpoint: internal + service: local_image_registry + redis: + services: null conditional_dependencies: local_image_registry: diff --git a/registry/templates/daemonset-registry-proxy.yaml b/registry/templates/daemonset-registry-proxy.yaml index 84c982ac9..4e7fd4769 100644 --- a/registry/templates/daemonset-registry-proxy.yaml +++ b/registry/templates/daemonset-registry-proxy.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.registry_proxy .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.registry_proxy .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.registry_proxy -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.registry_proxy -}} {{- end -}} {{- $serviceAccountName := "docker-registry-proxy"}} diff --git a/registry/templates/deployment-registry.yaml b/registry/templates/deployment-registry.yaml index df6cd23f4..0e071dc7a 100644 --- a/registry/templates/deployment-registry.yaml +++ b/registry/templates/deployment-registry.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.registry .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.registry .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.registry -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.registry -}} {{- end -}} {{- $serviceAccountName := "docker-registry"}} diff --git a/registry/templates/job-bootstrap.yaml b/registry/templates/job-bootstrap.yaml index 4407ebf74..1c3a70f22 100644 --- a/registry/templates/job-bootstrap.yaml +++ b/registry/templates/job-bootstrap.yaml @@ -19,9 +19,9 @@ limitations under the License. {{- if .Values.bootstrap.enabled }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.bootstrap .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.bootstrap .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.bootstrap -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.bootstrap -}} {{- end -}} {{- $serviceAccountName := "docker-bootstrap"}} diff --git a/registry/values.yaml b/registry/values.yaml index 158d1b36b..04423c182 100644 --- a/registry/values.yaml +++ b/registry/values.yaml @@ -72,11 +72,11 @@ conf: pod: affinity: - anti: - type: - default: preferredDuringSchedulingIgnoredDuringExecution - topologyKey: - default: kubernetes.io/hostname + anti: + type: + default: preferredDuringSchedulingIgnoredDuringExecution + topologyKey: + default: kubernetes.io/hostname replicas: registry: 1 lifecycle: @@ -120,20 +120,21 @@ bootstrap: - quay.io/stackanetes/kubernetes-entrypoint:v0.2.1 dependencies: - registry: - services: - - service: redis - endpoint: internal - registry_proxy: - services: - - service: docker_registry - endpoint: internal - bootstrap: - daemonset: - - docker-registry-proxy - services: - - service: docker_registry - endpoint: internal + static: + bootstrap: + daemonset: + - docker-registry-proxy + services: + - endpoint: internal + service: docker_registry + registry: + services: + - endpoint: internal + service: redis + registry_proxy: + services: + - endpoint: internal + service: docker_registry endpoints: cluster_domain_suffix: cluster.local diff --git a/tiller/templates/deployment-tiller.yaml b/tiller/templates/deployment-tiller.yaml index 94ed0a251..900262582 100644 --- a/tiller/templates/deployment-tiller.yaml +++ b/tiller/templates/deployment-tiller.yaml @@ -18,9 +18,9 @@ limitations under the License. {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} {{- $_ := set .Values "pod_dependency" dict -}} -{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.tiller .Values.conditional_dependencies.local_image_registry) -}} +{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.tiller .Values.conditional_dependencies.local_image_registry) -}} {{- else -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.tiller -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.tiller -}} {{- end -}} {{- $serviceAccountName := printf "%s-%s" .Release.Name "tiller" }} diff --git a/tiller/templates/job-image-repo-sync.yaml b/tiller/templates/job-image-repo-sync.yaml index 8cadeb587..6f2400fa5 100644 --- a/tiller/templates/job-image-repo-sync.yaml +++ b/tiller/templates/job-image-repo-sync.yaml @@ -17,7 +17,7 @@ limitations under the License. {{- if .Values.manifests.job_image_repo_sync }} {{- $envAll := . }} {{- if .Values.images.local_registry.active -}} -{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}} +{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}} {{- $serviceAccountName := "kube-dns-image-repo-sync"}} {{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} diff --git a/tiller/values.yaml b/tiller/values.yaml index 5785cbcac..f7b4b86f1 100644 --- a/tiller/values.yaml +++ b/tiller/values.yaml @@ -48,12 +48,13 @@ pod: cpu: "2000m" dependencies: - tiller: - services: null - image_repo_sync: - services: - - service: local_image_registry - endpoint: internal + static: + image_repo_sync: + services: + - endpoint: internal + service: local_image_registry + tiller: + services: null conditional_dependencies: local_image_registry: diff --git a/tools/gate/chart-deploys/default.yaml b/tools/gate/chart-deploys/default.yaml index 1551e8104..75edaa183 100644 --- a/tools/gate/chart-deploys/default.yaml +++ b/tools/gate/chart-deploys/default.yaml @@ -151,9 +151,10 @@ charts: manifests: job_ks_user: false dependencies: - prometheus_openstack_exporter: - jobs: null - services: null + static: + prometheus_openstack_exporter: + jobs: null + services: null grafana: chart_name: grafana @@ -165,9 +166,10 @@ charts: output: false values: dependencies: - grafana: - jobs: null - services: null + static: + grafana: + jobs: null + services: null manifests: ingress: false job_db_init: false