openstack
/
openstack-helm-infra
Code Issues Proposed changes

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
This commit is contained in:
Pete Birley 2018-02-23 10:35:23 -08:00 committed by portdirect
parent b84fd4da05
commit e0c688d7ee
66 changed files with 308 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calico/templates/daemonset-calico-etcd.yaml
View File

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

4
calico/templates/daemonset-calico-node.yaml
View File

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

4
calico/templates/deployment-calico-kube-controllers.yaml
View File

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

2
calico/templates/job-calico-settings.yaml
View File

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

2
calico/templates/job-image-repo-sync.yaml
View File

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

29
calico/values.yaml
View File

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

2
elasticsearch/templates/cron-job-curator.yaml
View File

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

4
elasticsearch/templates/deployment-client.yaml
View File

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

4
elasticsearch/templates/deployment-master.yaml
View File

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

2
elasticsearch/templates/job-image-repo-sync.yaml
View File

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

2
elasticsearch/templates/job-register-snapshot-repository.yaml
View File

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

4
elasticsearch/templates/monitoring/prometheus/exporter-deployment.yaml
View File

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

4
elasticsearch/templates/statefulset-data.yaml
View File

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

41
elasticsearch/values.yaml
View File

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

4
flannel/templates/daemonset-kube-flannel-ds.yaml
View File

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

2
flannel/templates/job-image-repo-sync.yaml
View File

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

13
flannel/values.yaml
View File

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

6
fluent-logging/templates/daemonset-fluent-bit.yaml
View File

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

4
fluent-logging/templates/deployment-fluentd.yaml
View File

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

2
fluent-logging/templates/job-elasticsearch-template.yaml
View File

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

2
fluent-logging/templates/job-image-repo-sync.yaml
View File

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

2
fluent-logging/templates/monitoring/prometheus/exporter-deployment.yaml
View File

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

69
fluent-logging/values.yaml
View File

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

4
grafana/templates/deployment.yaml
View File

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

2
grafana/templates/job-db-init-session.yaml
View File

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

2
grafana/templates/job-db-init.yaml
View File

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

2
grafana/templates/job-db-session-sync.yaml
View File

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

2
grafana/templates/job-image-repo-sync.yaml
View File

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

2
grafana/templates/job-prometheus-datasource.yaml
View File

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

59
grafana/values.yaml
View File

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

4
kibana/templates/deployment.yaml
View File

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

2
kibana/templates/job-image-repo-sync.yaml
View File

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

17
kibana/values.yaml
View File

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

4
kube-dns/templates/deployment-kube-dns.yaml
View File

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

2
kube-dns/templates/job-image-repo-sync.yaml
View File

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

13
kube-dns/values.yaml
View File

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

4
nfs-provisioner/templates/deployment.yaml
View File

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

2
nfs-provisioner/templates/job-image-repo-sync.yaml
View File

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

13
nfs-provisioner/values.yaml
View File

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

2
prometheus-alertmanager/templates/job-image-repo-sync.yaml
View File

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

4
prometheus-alertmanager/templates/statefulset.yaml
View File

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

23
prometheus-alertmanager/values.yaml
View File

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

4
prometheus-kube-state-metrics/templates/deployment.yaml
View File

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

2
prometheus-kube-state-metrics/templates/job-image-repo-sync.yaml
View File

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

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

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

4
prometheus-node-exporter/templates/daemonset.yaml
View File

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

2
prometheus-node-exporter/templates/job-image-repo-sync.yaml
View File

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

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

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

4
prometheus-openstack-exporter/templates/deployment.yaml
View File

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

2
prometheus-openstack-exporter/templates/job-image-repo-sync.yaml
View File

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

2
prometheus-openstack-exporter/templates/job-ks-user.yaml
View File

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

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

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

2
prometheus/templates/job-image-repo-sync.yaml
View File

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

4
prometheus/templates/statefulset.yaml
View File

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

23
prometheus/values.yaml
View File

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

4
redis/templates/deployment.yaml
View File

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

2
redis/templates/job-image-repo-sync.yaml
View File

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

13
redis/values.yaml
View File

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

4
registry/templates/daemonset-registry-proxy.yaml
View File

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

4
registry/templates/deployment-registry.yaml
View File

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

4
registry/templates/job-bootstrap.yaml
View File

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

39
registry/values.yaml
View File

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

4
tiller/templates/deployment-tiller.yaml
View File

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

2
tiller/templates/job-image-repo-sync.yaml
View File

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

13
tiller/values.yaml
View File

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

14
tools/gate/chart-deploys/default.yaml
View File

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