diff --git a/monitoring/openshift/grafana_container_image.template b/monitoring/openshift/grafana_container_image.template index c319fbe1..ebdb76dc 100644 --- a/monitoring/openshift/grafana_container_image.template +++ b/monitoring/openshift/grafana_container_image.template @@ -7,8 +7,16 @@ image: repository: __IMAGE_REPO_2LEVEL__ tag: __IMAGE_TAG__ pullPolicy: __IMAGE_PULL_POLICY__ -#### pullSecrets: __IMAGE_PULL_SECRETS__ +# pullSecrets: __IMAGE_PULL_SECRETS__ #overridden by global setting +sidecar: + image: +# registry: __SIDECAR_IMAGE_REGISTRY__ #overridden by global setting + repository: __SIDECAR_IMAGE_REPO_2LEVEL__ + tag: __SIDECAR_IMAGE_TAG__ + imagePullPolicy: __SIDECAR_IMAGE_PULL_POLICY__ + +## We do NOT deploy the initChownData container #initChownData: # image: # registry: __INITCHOWN_IMAGE_REGISTRY__ @@ -18,12 +26,4 @@ image: # pullSecrets: # -name: __INITCHOWN_IMAGE_PULL_SECRETS__ -#sidecar: -# image: -# registry: __SIDECAR_IMAGE_REGISTRY__ -# repository: __SIDECAR_IMAGE_REPO_2LEVEL__ -# tag: __SIDECAR_IMAGE_TAG__ -# pullPolicy: __SIDECAR_IMAGE_PULL_POLICY__ -# #pullSecrets: #NOT present in Helm chart but should it be? -# #- name:__SIDECAR_IMAGE_PULL_SECRETS__ #NOT present in Helm chart but should it be? diff --git a/monitoring/prom-operator_container_image.template b/monitoring/prom-operator_container_image.template index 45dbd713..ab48f65f 100644 --- a/monitoring/prom-operator_container_image.template +++ b/monitoring/prom-operator_container_image.template @@ -67,12 +67,13 @@ grafana: image: repository: __GRAFANA_IMAGE_REPO_2LEVEL__ tag: __GRAFANA_IMAGE_TAG__ - ### TO DO: use tag: key here to peg - ### to a specific version?? + pullPolicy: __GRAFANA_IMAGE_PULL_POLICY__ sidecar: image: repository: __SIDECAR_IMAGE_REPO_2LEVEL__ tag: __SIDECAR_IMAGE_TAG__ + imagePullPolicy: __SIDECAR_IMAGE_PULL_POLICY__ + ## Kube-State-Metrics kube-state-metrics: