Add env to Helm Chart deploy

grafana · Sep 13, 2023 · ae0c085 · ae0c085
1 parent 721dfe2
commit ae0c085
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -331,7 +331,7 @@ ifeq (,$(shell which opm 2>/dev/null))
 	set -e ;\
 	mkdir -p $(dir $(OPM)) ;\
 	OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
-	curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.15.1/$${OS}-$${ARCH}-opm ;\
+	curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.23.2/$${OS}-$${ARCH}-opm ;\
 	chmod +x $(OPM) ;\
 	}
 else

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -1,3 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 resources:
 - manager.yaml
 
@@ -8,8 +11,7 @@ configMapGenerator:
 - files:
   - controller_manager_config.yaml
   name: manager-config
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
+
 images:
 - name: controller
   newName: ghcr.io/grafana-operator/grafana-operator

diff --git a/deploy/helm/grafana-operator/templates/deployment.yaml b/deploy/helm/grafana-operator/templates/deployment.yaml
@@ -42,6 +42,10 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
+            {{- if .Values.env.grafanaImage }}
+            - name: RELATED_IMAGE_GRAFANA
+              value: {{ .Values.env.grafanaImage }}
+            {{- end }}
             - name: WATCH_NAMESPACE
               {{- if and .Values.namespaceScope (eq .Values.watchNamespaces "") }}
               value: {{ .Release.Namespace }}

diff --git a/deploy/helm/grafana-operator/values.yaml b/deploy/helm/grafana-operator/values.yaml
@@ -21,6 +21,10 @@ image:
 # -- image pull secrets
 imagePullSecrets: []
 
+env:
+  # -- grafana image, e.g. docker.io/grafana/grafana:9.1.6
+  grafanaImage: ""
+
 nameOverride: ""
 fullnameOverride: ""