diff --git a/chart/templates/monitoring/values.yaml b/chart/templates/monitoring/values.yaml index e541de5ea4b292da58fdc5b4ab3967799b9441b0..d165130fc96def211c5165e4055af7e7fbce4d88 100644 --- a/chart/templates/monitoring/values.yaml +++ b/chart/templates/monitoring/values.yaml @@ -48,22 +48,38 @@ istio: - istio-system/{{ default "public" .Values.monitoring.ingress.gateway }} injection: {{ dig "istio" "injection" "enabled" .Values.monitoring }} -{{- if .Values.monitoring.sso.enabled }} alertmanager: alertmanagerSpec: + # The operator performs a strategic merge to add our imagePullPolicy definition to the default containers + # NOTE: This functionality is not actively maintained upstream and may not work in a future monitoring upgrade + containers: + - name: "alertmanager" + imagePullPolicy: {{ .Values.imagePullPolicy }} + - name: "config-reloader" + imagePullPolicy: {{ .Values.imagePullPolicy }} + {{- if .Values.monitoring.sso.enabled }} {{- $alertmanagerAuthserviceKey := (dig "selector" "key" "protect" .Values.addons.authservice.values) }} {{- $alertmanagerAuthserviceValue := (dig "selector" "value" "keycloak" .Values.addons.authservice.values) }} podMetadata: labels: {{ $alertmanagerAuthserviceKey }}: {{ $alertmanagerAuthserviceValue }} + {{- end }} prometheus: prometheusSpec: + # The operator performs a strategic merge to add our imagePullPolicy definition to the default containers + # NOTE: This functionality is not actively maintained upstream and may not work in a future monitoring upgrade + containers: + - name: "prometheus" + imagePullPolicy: {{ .Values.imagePullPolicy }} + - name: "config-reloader" + imagePullPolicy: {{ .Values.imagePullPolicy }} + {{- if .Values.monitoring.sso.enabled }} {{- $prometheusAuthserviceKey := (dig "selector" "key" "protect" .Values.addons.authservice.values) }} {{- $prometheusAuthserviceValue := (dig "selector" "value" "keycloak" .Values.addons.authservice.values) }} podMetadata: labels: {{ $prometheusAuthserviceKey }}: {{ $prometheusAuthserviceValue }} -{{- end }} + {{- end }} anchore: enabled: {{ .Values.addons.anchore.enabled }} @@ -86,6 +102,8 @@ grafana: pullPolicy: {{ .Values.imagePullPolicy }} pullSecrets: - private-registry + sidecar: + imagePullPolicy: {{ .Values.imagePullPolicy }} {{- if .Values.loki.enabled }} additionalDataSources: diff --git a/docs/guides/using_bigbang/image_pull_policy.md b/docs/guides/using_bigbang/image_pull_policy.md index 55de23dbb008c6e478900b57b8dafb81d2c1e711..007f91fbadb627a5d8a4f16237b8a80f0cb41882 100644 --- a/docs/guides/using_bigbang/image_pull_policy.md +++ b/docs/guides/using_bigbang/image_pull_policy.md @@ -21,7 +21,7 @@ We have also documented the package overrides required if you want to set a sing | Elasticsearch / Kibana | `IfNotPresent` | <pre lang="yaml">logging:<br> values:<br> imagePullPolicy: IfNotPresent</pre> | | ECK Operator | `IfNotPresent` | <pre lang="yaml">eckoperator:<br> values:<br> image:<br> pullPolicy: IfNotPresent</pre> | | Fluentbit | `Always` | <pre lang="yaml">fluentbit:<br> values:<br> image:<br> pullPolicy: IfNotPresent</pre> | -| Monitoring | Varies | <pre lang="yaml">monitoring:<br> values: <br> kube-state-metrics:<br> image:<br> pullPolicy: IfNotPresent<br> grafana:<br> image:<br> pullPolicy: IfNotPresent<br> prometheus-node-exporter:<br> image:<br> pullPolicy: IfNotPresent<br> prometheusOperator:<br> image:<br> pullPolicy: IfNotPresent<br> admissionWebhooks:<br> cleanupProxy:<br> image:<br> pullPolicy: IfNotPresent<br> patch: <br> image:<br> pullPolicy: IfNotPresent</pre> | +| Monitoring | Varies | <pre lang="yaml">monitoring:<br> values: <br> kube-state-metrics:<br> image:<br> pullPolicy: IfNotPresent<br> grafana:<br> image:<br> pullPolicy: IfNotPresent<br> sidecar:<br> imagePullPolicy: IfNotPresent<br> prometheus-node-exporter:<br> image:<br> pullPolicy: IfNotPresent<br> prometheusOperator:<br> image:<br> pullPolicy: IfNotPresent<br> admissionWebhooks:<br> cleanupProxy:<br> image:<br> pullPolicy: IfNotPresent<br> patch: <br> image:<br> pullPolicy: IfNotPresent<br> prometheus:<br> prometheusSpec:<br> containers:<br> - name: "prometheus"<br> imagePullPolicy: IfNotPresent<br> - name: "config-reloader"<br> imagePullPolicy: IfNotPresent<br> alertmanager:<br> alertmanagerSpec:<br> containers:<br> - name: "alertmanager"<br> imagePullPolicy: IfNotPresent<br> - name: "config-reloader"<br> imagePullPolicy: IfNotPresent</pre> | | Twistlock | `IfNotPresent` | <pre lang="yaml">twistlock:<br> values:<br> console:<br> image:<br> imagePullPolicy: IfNotPresent</pre> | | ArgoCD | Varies | <pre lang="yaml">addons:<br> argocd:<br> values:<br> global:<br> image:<br> imagePullPolicy: IfNotPresent<br> controller:<br> image:<br> imagePullPolicy: IfNotPresent<br> dex:<br> image:<br> imagePullPolicy: IfNotPresent<br> redis-bb:<br> image:<br> pullPolicy: IfNotPresent<br> server:<br> image:<br> imagePullPolicy: IfNotPresent<br> repoServer:<br> image:<br> imagePullPolicy: IfNotPresent</pre> | | Authservice | `IfNotPresent` | <pre lang="yaml">addons:<br> authservice:<br> values:<br> image:<br> pullPolicy: IfNotPresent</pre> |