Merge branch 'main' into ingester-annotations

Author: Sheikh-Abubaker

charts/rollout-operator/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: rollout-operator
 description: "Grafana rollout-operator"
 type: application
-version: 0.35.1
+version: 0.36.0
 appVersion: v0.31.1
 home: https://github.com/grafana/rollout-operator
 kubeVersion: ^1.10.0-0

charts/rollout-operator/README.md

@@ -4,7 +4,7 @@ Helm chart for deploying [Grafana rollout-operator](https://github.com/grafana/r
 
 # rollout-operator
 
-![Version: 0.35.1](https://img.shields.io/badge/Version-0.35.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.31.1](https://img.shields.io/badge/AppVersion-v0.31.1-informational?style=flat-square)
+![Version: 0.36.0](https://img.shields.io/badge/Version-0.36.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.31.1](https://img.shields.io/badge/AppVersion-v0.31.1-informational?style=flat-square)
 
 Grafana rollout-operator
 
@@ -55,6 +55,7 @@ Manually applying these CRDs is only required if upgrading from a chart <= v0.32
 | global.commonLabels | object | `{}` | Common labels for all object directly managed by this chart. |
 | hostAliases | list | `[]` | hostAliases to add |
 | image.pullPolicy | string | `"IfNotPresent"` |  |
+| image.registry | string | `""` |  |
 | image.repository | string | `"grafana/rollout-operator"` |  |
 | image.tag | string | `""` | Overrides the image tag whose default is the chart appVersion. |
 | imagePullSecrets | list | `[]` |  |

charts/rollout-operator/templates/_helpers.tpl

@@ -80,3 +80,15 @@ Create the name of the service account to use
 {{- end -}}
 {{ join "," $list }}
 {{- end -}}
+
+{{/*
+Create the image name
+*/}}
+{{- define "rollout-operator.imageName" -}}
+{{- $imageTag := (.Values.image.tag | default .Chart.AppVersion) }}
+{{- if .Values.image.registry }}
+{{- (printf "%s/%s:%s" .Values.image.registry .Values.image.repository $imageTag) }}
+{{- else }}
+{{- (printf "%s:%s" .Values.image.repository $imageTag) }}
+{{- end -}}
+{{- end -}}

charts/rollout-operator/templates/deployment.yaml

@@ -47,7 +47,7 @@ spec:
         - name: rollout-operator
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          image: {{ include "rollout-operator.imageName" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           args:
           - -kubernetes.namespace={{ .Release.Namespace }}

charts/rollout-operator/values.yaml

@@ -12,6 +12,7 @@ revisionHistoryLimit: 10
 
 image:
   repository: grafana/rollout-operator
+  registry: ""
   pullPolicy: IfNotPresent
   # -- Overrides the image tag whose default is the chart appVersion.
   tag: ""