openstack
/
openstack-helm-infra
Code Issues Proposed changes

dependencies: move dynamic common deps under a 'dynamic.common' key 

This PS moves existing dynamic common dependencies under a
'dynamic.common' key to simplify the yaml tree.

Change-Id: I4332bcfdf11197488e7bd5d8cf4c25565ea1c7b6
This commit is contained in:
Pete Birley 2018-02-23 10:52:42 -08:00 committed by portdirect
parent e0c688d7ee
commit 3c101a6324
39 changed files with 144 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,7 @@ 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.static.etcd .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.etcd .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.etcd -}}
{{- end -}}

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

@ -35,7 +35,7 @@ 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.static.calico_node .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.calico_node .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.calico_node -}}
{{- end -}}

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

@ -18,7 +18,7 @@ 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.static.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.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.calico_kube_policy_controllers -}}
{{- end -}}

17
calico/values.yaml
View File

@ -117,6 +117,14 @@ pod:
timeout: 5
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- calico-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
calico_kube_policy_controllers:
services:
@ -133,15 +141,6 @@ dependencies:
etcd:
services: null
conditional_dependencies:
local_image_registry:
jobs:
- calico-image-repo-sync
services:
- service: local_image_registry
endpoint: node
endpoints:
cluster_domain_suffix: cluster.local
local_image_registry:

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

@ -19,7 +19,7 @@ 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.static.elasticsearch_client .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.elasticsearch_client .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.elasticsearch_client -}}
{{- end -}}

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

@ -18,7 +18,7 @@ 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.static.elasticsearch_master .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.elasticsearch_master .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.elasticsearch_master -}}
{{- end -}}

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

@ -17,7 +17,7 @@ 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.static.prometheus_elasticsearch_exporter .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := set .Values "pod_dependency" (merge .Values.dependencies.static.prometheus_elasticsearch_exporter .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.prometheus_elasticsearch_exporter -}}
{{- end -}}

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

@ -18,7 +18,7 @@ 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.static.elasticsearch_data .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.elasticsearch_data .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.elasticsearch_data -}}
{{- end -}}

16
elasticsearch/values.yaml
View File

@ -39,6 +39,14 @@ labels:
node_selector_value: enabled
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- elasticsearch-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
curator:
services: null
@ -61,14 +69,6 @@ dependencies:
- endpoint: internal
service: elasticsearch
conditional_dependencies:
local_image_registry:
jobs:
- elasticsearch-image-repo-sync
services:
- service: local_image_registry
endpoint: node
pod:
affinity:
anti:

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

@ -18,7 +18,7 @@ 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.static.flannel .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.flannel .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.flannel -}}
{{- end -}}

16
flannel/values.yaml
View File

@ -47,6 +47,14 @@ networking:
podSubnet: 192.168.0.0/16
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- flannel-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
flannel:
services: null
@ -55,14 +63,6 @@ dependencies:
- endpoint: internal
service: local_image_registry
conditional_dependencies:
local_image_registry:
jobs:
- flannel-image-repo-sync
services:
- service: local_image_registry
endpoint: node
endpoints:
cluster_domain_suffix: cluster.local
local_image_registry:

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

@ -19,7 +19,7 @@ limitations under the License.
{{- $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.static.fluentbit .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.fluentbit .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.fluentbit -}}
{{- end -}}

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

@ -19,7 +19,7 @@ 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.static.fluentd .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.fluentd .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.fluentd -}}
{{- end -}}

20
fluent-logging/values.yaml
View File

@ -53,6 +53,14 @@ secrets:
user: fluentd-elasticsearch-user
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- fluent-logging-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
elasticsearch-template:
services:
@ -89,18 +97,6 @@ dependencies:
- endpoint: internal
service: fluentd
conditional_dependencies:
local_image_registry:
jobs:
- fluent-logging-image-repo-sync
services:
- service: local_image_registry
endpoint: node
fluentd:
services:
- service: kafka
endpoint: public
conf:
fluentbit:
- service:

2
grafana/templates/deployment.yaml
View File

@ -18,7 +18,7 @@ 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.static.grafana .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.grafana .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.grafana -}}
{{- end -}}

16
grafana/values.yaml
View File

@ -180,6 +180,14 @@ endpoints:
public: 80
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- grafana-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
db_init:
services:
@ -211,14 +219,6 @@ dependencies:
- endpoint: internal
service: grafana
conditional_dependencies:
local_image_registry:
jobs:
- grafana-image-repo-sync
services:
- service: local_image_registry
endpoint: node
network:
grafana:
port: 3000

2
kibana/templates/deployment.yaml
View File

@ -19,7 +19,7 @@ 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.static.kibana .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.kibana .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.kibana -}}
{{- end -}}

16
kibana/values.yaml
View File

@ -72,6 +72,14 @@ secrets:
admin: kibana-admin-creds
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- kibana-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
image_repo_sync:
services:
@ -82,14 +90,6 @@ dependencies:
- endpoint: internal
service: elasticsearch
conditional_dependencies:
local_image_registry:
jobs:
- kibana-image-repo-sync
services:
- service: local_image_registry
endpoint: node
conf:
apache:
htpasswd: /usr/local/apache2/conf/.htpasswd

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

@ -18,7 +18,7 @@ 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.static.kube_dns .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.kube_dns .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.kube_dns -}}
{{- end -}}

16
kube-dns/values.yaml
View File

@ -49,6 +49,14 @@ networking:
dnsIP: 10.96.0.10
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- kube-dns-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
image_repo_sync:
services:
@ -57,14 +65,6 @@ dependencies:
kube_dns:
services: null
conditional_dependencies:
local_image_registry:
jobs:
- kube-dns-image-repo-sync
services:
- service: local_image_registry
endpoint: node
endpoints:
cluster_domain_suffix: cluster.local
local_image_registry:

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

@ -18,7 +18,7 @@ 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.static.nfs .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.nfs .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.nfs -}}
{{- end -}}

16
nfs-provisioner/values.yaml
View File

@ -81,6 +81,14 @@ storageclass:
name: null
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- nfs-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
image_repo_sync:
services:
@ -89,14 +97,6 @@ dependencies:
nfs:
services: null
conditional_dependencies:
local_image_registry:
jobs:
- nfs-image-repo-sync
services:
- service: local_image_registry
endpoint: node
endpoints:
cluster_domain_suffix: cluster.local
local_image_registry:

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

@ -18,7 +18,7 @@ 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.static.alertmanager .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.alertmanager .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.alertmanager -}}
{{- end -}}

16
prometheus-alertmanager/values.yaml
View File

@ -109,6 +109,14 @@ endpoints:
default: 6783
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- alertmanager-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
alertmanager:
services: null
@ -117,14 +125,6 @@ dependencies:
- endpoint: internal
service: local_image_registry
conditional_dependencies:
local_image_registry:
jobs:
- alertmanager-image-repo-sync
services:
- service: local_image_registry
endpoint: node
network:
alertmanager:
ingress:

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

@ -18,7 +18,7 @@ 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.static.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.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.kube_state_metrics -}}
{{- end -}}

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

@ -74,20 +74,20 @@ pod:
cpu: "2000m"
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- kube-metrics-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
image_repo_sync:
services:
- endpoint: internal
service: local_image_registry
conditional_dependencies:
local_image_registry:
jobs:
- kube-metrics-image-repo-sync
services:
- service: local_image_registry
endpoint: node
endpoints:
cluster_domain_suffix: cluster.local
local_image_registry:

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

@ -18,7 +18,7 @@ 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.static.node_exporter .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.node_exporter .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.node_exporter -}}
{{- end -}}

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

@ -77,6 +77,14 @@ pod:
cpu: "2000m"
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- node-exporter-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
image_repo_sync:
services:
@ -85,14 +93,6 @@ dependencies:
node_exporter:
services: null
conditional_dependencies:
local_image_registry:
jobs:
- node-exporter-image-repo-sync
services:
- service: local_image_registry
endpoint: node
monitoring:
prometheus:
enabled: true

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

@ -19,7 +19,7 @@ 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.static.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.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.prometheus_openstack_exporter -}}
{{- end -}}

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

@ -82,6 +82,14 @@ pod:
cpu: "2000m"
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- prometheus-openstack-exporter-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
image_repo_sync:
services:
@ -98,14 +106,6 @@ dependencies:
- endpoint: internal
service: identity
conditional_dependencies:
local_image_registry:
jobs:
- prometheus-openstack-exporter-image-repo-sync
services:
- service: local_image_registry
endpoint: node
conf:
prometheus_openstack_exporter:
OS_POLLING_INTERVAL: 30

2
prometheus/templates/statefulset.yaml
View File

@ -18,7 +18,7 @@ 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.static.prometheus .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.prometheus .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.prometheus -}}
{{- end -}}

16
prometheus/values.yaml
View File

@ -130,6 +130,14 @@ endpoints:
public: 80
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- prometheus-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
image_repo_sync:
services:
@ -138,14 +146,6 @@ dependencies:
prometheus:
services: null
conditional_dependencies:
local_image_registry:
jobs:
- prometheus-image-repo-sync
services:
- service: local_image_registry
endpoint: node
monitoring:
prometheus:
enabled: true

2
redis/templates/deployment.yaml
View File

@ -18,7 +18,7 @@ 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.static.redis .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.redis .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.redis -}}
{{- end -}}

16
redis/values.yaml
View File

@ -72,6 +72,14 @@ network:
port: 6379
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- redis-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
image_repo_sync:
services:
@ -80,14 +88,6 @@ dependencies:
redis:
services: null
conditional_dependencies:
local_image_registry:
jobs:
- redis-image-repo-sync
services:
- service: local_image_registry
endpoint: node
endpoints:
cluster_domain_suffix: cluster.local
local_image_registry:

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

@ -18,7 +18,7 @@ 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.static.registry_proxy .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.registry_proxy .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.registry_proxy -}}
{{- end -}}

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

@ -18,7 +18,7 @@ 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.static.registry .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.registry .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.registry -}}
{{- end -}}

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

@ -19,7 +19,7 @@ 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.static.bootstrap .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.bootstrap .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.bootstrap -}}
{{- end -}}

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

@ -18,7 +18,7 @@ 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.static.tiller .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.tiller .Values.dependencies.dynamic.common.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.tiller -}}
{{- end -}}

16
tiller/values.yaml
View File

@ -48,6 +48,14 @@ pod:
cpu: "2000m"
dependencies:
dynamic:
common:
local_image_registry:
jobs:
- tiller-image-repo-sync
services:
- endpoint: node
service: local_image_registry
static:
image_repo_sync:
services:
@ -56,14 +64,6 @@ dependencies:
tiller:
services: null
conditional_dependencies:
local_image_registry:
jobs:
- tiller-image-repo-sync
services:
- service: local_image_registry
endpoint: node
endpoints:
cluster_domain_suffix: cluster.local
local_image_registry: