Enable support for Fully Qualified Repository URL without combining registry and repository (#37)

tonur · mblaschke · web-flow · commit 67eb64a6b71c · 2024-09-15T17:29:39.000+02:00
* Check if registry is empty in image _helper.tpl to allow FQDN

* Version bumps

---------

Co-authored-by: Markus Blaschke &lt;mblaschke82@gmail.com&gt;
diff --git a/charts/azure-janitor/Chart.yaml b/charts/azure-janitor/Chart.yaml
@@ -3,7 +3,7 @@ name: azure-janitor
 type: application
 description: A Helm chart for azure-janitor
 home: https://github.com/webdevops/azure-janitor
-version: 1.0.10
+version: 1.0.11
 # renovate: image=webdevops/azure-janitor
 appVersion: 24.9.0
 keywords:
diff --git a/charts/azure-janitor/templates/_helpers.tpl b/charts/azure-janitor/templates/_helpers.tpl
@@ -67,10 +67,15 @@ app.kubernetes.io/name: {{ template "azure-janitor.name" . }}
 The image to use
 */}}
 {{- define "azure-janitor.image" -}}
+{{- if .Values.image.registry -}}
+{{- $imageQualifier := (printf "%s/%s" .Values.image.registry .Values.image.repository) -}}
+{{- else -}}
+{{- $imageQualifier := .Values.image.repository -}}
+{{- end }}
 {{- if .Values.image.sha -}}
-{{- printf "%s/%s:%s@%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
+{{- printf "%s:%s@%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
+{{- printf "%s:%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
 {{- end }}
 {{- end }}
 
diff --git a/charts/azure-keyvault-exporter/Chart.yaml b/charts/azure-keyvault-exporter/Chart.yaml
@@ -3,7 +3,7 @@ name: azure-keyvault-exporter
 type: application
 description: A Helm chart for azure-keyvault-exporter
 home: https://github.com/webdevops/azure-keyvault-exporter
-version: 1.0.9
+version: 1.0.10
 # renovate: image=webdevops/azure-keyvault-exporter
 appVersion: 24.9.1
 keywords:
diff --git a/charts/azure-keyvault-exporter/templates/_helpers.tpl b/charts/azure-keyvault-exporter/templates/_helpers.tpl
@@ -67,10 +67,15 @@ app.kubernetes.io/name: {{ template "azure-keyvault-exporter.name" . }}
 The image to use
 */}}
 {{- define "azure-keyvault-exporter.image" -}}
+{{- if .Values.image.registry -}}
+{{- $imageQualifier := (printf "%s/%s" .Values.image.registry .Values.image.repository) -}}
+{{- else -}}
+{{- $imageQualifier := .Values.image.repository -}}
+{{- end }}
 {{- if .Values.image.sha -}}
-{{- printf "%s/%s:%s@%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
+{{- printf "%s:%s@%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
+{{- printf "%s:%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
 {{- end }}
 {{- end }}
 
diff --git a/charts/azure-loganalytics-exporter/Chart.yaml b/charts/azure-loganalytics-exporter/Chart.yaml
@@ -3,7 +3,7 @@ name: azure-loganalytics-exporter
 type: application
 description: A Helm chart for azure-loganalytics-exporter
 home: https://github.com/webdevops/azure-loganalytics-exporter
-version: 1.0.8
+version: 1.0.9
 # renovate: image=webdevops/azure-loganalytics-exporter
 appVersion: 24.9.0
 keywords:
diff --git a/charts/azure-loganalytics-exporter/templates/_helpers.tpl b/charts/azure-loganalytics-exporter/templates/_helpers.tpl
@@ -66,10 +66,15 @@ app.kubernetes.io/name: {{ template "azure-loganalytics-exporter.name" . }}
 The image to use
 */}}
 {{- define "azure-loganalytics-exporter.image" -}}
+{{- if .Values.image.registry -}}
+{{- $imageQualifier := (printf "%s/%s" .Values.image.registry .Values.image.repository) -}}
+{{- else -}}
+{{- $imageQualifier := .Values.image.repository -}}
+{{- end }}
 {{- if .Values.image.sha -}}
-{{- printf "%s/%s:%s@%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
+{{- printf "%s:%s@%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
+{{- printf "%s:%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
 {{- end }}
 {{- end }}
 
diff --git a/charts/azure-metrics-exporter/Chart.yaml b/charts/azure-metrics-exporter/Chart.yaml
@@ -3,7 +3,7 @@ name: azure-metrics-exporter
 type: application
 description: A Helm chart for azure-metrics-exporter
 home: https://github.com/webdevops/azure-metrics-exporter
-version: 1.2.2
+version: 1.2.3
 # renovate: image=webdevops/azure-metrics-exporter
 appVersion: 24.9.0
 keywords:
diff --git a/charts/azure-metrics-exporter/templates/_helpers.tpl b/charts/azure-metrics-exporter/templates/_helpers.tpl
@@ -67,10 +67,15 @@ app.kubernetes.io/name: {{ template "azure-metrics-exporter.name" . }}
 The image to use
 */}}
 {{- define "azure-metrics-exporter.image" -}}
+{{- if .Values.image.registry -}}
+{{- $imageQualifier := (printf "%s/%s" .Values.image.registry .Values.image.repository) -}}
+{{- else -}}
+{{- $imageQualifier := .Values.image.repository -}}
+{{- end }}
 {{- if .Values.image.sha -}}
-{{- printf "%s/%s:%s@%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
+{{- printf "%s:%s@%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
+{{- printf "%s:%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
 {{- end }}
 {{- end }}
 
diff --git a/charts/azure-resourcegraph-exporter/Chart.yaml b/charts/azure-resourcegraph-exporter/Chart.yaml
@@ -3,7 +3,7 @@ name: azure-resourcegraph-exporter
 type: application
 description: A Helm chart for azure-resourcegraph-exporter
 home: https://github.com/webdevops/azure-resourcegraph-exporter
-version: 1.1.1
+version: 1.1.2
 # renovate: image=webdevops/azure-resourcegraph-exporter
 appVersion: 24.9.0
 keywords:
diff --git a/charts/azure-resourcegraph-exporter/templates/_helpers.tpl b/charts/azure-resourcegraph-exporter/templates/_helpers.tpl
@@ -66,10 +66,15 @@ app.kubernetes.io/name: {{ template "azure-resourcegraph-exporter.name" . }}
 The image to use
 */}}
 {{- define "azure-resourcegraph-exporter.image" -}}
+{{- if .Values.image.registry -}}
+{{- $imageQualifier := (printf "%s/%s" .Values.image.registry .Values.image.repository) -}}
+{{- else -}}
+{{- $imageQualifier := .Values.image.repository -}}
+{{- end }}
 {{- if .Values.image.sha -}}
-{{- printf "%s/%s:%s@%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
+{{- printf "%s:%s@%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
+{{- printf "%s:%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
 {{- end }}
 {{- end }}
 
diff --git a/charts/azure-resourcemanager-exporter/Chart.yaml b/charts/azure-resourcemanager-exporter/Chart.yaml
@@ -3,7 +3,7 @@ name: azure-resourcemanager-exporter
 type: application
 description: A Helm chart for azure-resourcemanager-exporter
 home: https://github.com/webdevops/azure-resourcemanager-exporter
-version: 1.3.2
+version: 1.3.3
 # renovate: image=webdevops/azure-resourcemanager-exporter
 appVersion: 24.9.0
 keywords:
diff --git a/charts/azure-resourcemanager-exporter/templates/_helpers.tpl b/charts/azure-resourcemanager-exporter/templates/_helpers.tpl
@@ -67,10 +67,15 @@ app.kubernetes.io/name: {{ template "azure-resourcemanager-exporter.name" . }}
 The image to use
 */}}
 {{- define "azure-resourcemanager-exporter.image" -}}
+{{- if .Values.image.registry -}}
+{{- $imageQualifier := (printf "%s/%s" .Values.image.registry .Values.image.repository) -}}
+{{- else -}}
+{{- $imageQualifier := .Values.image.repository -}}
+{{- end }}
 {{- if .Values.image.sha -}}
-{{- printf "%s/%s:%s@%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
+{{- printf "%s:%s@%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
+{{- printf "%s:%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
 {{- end }}
 {{- end }}
 
diff --git a/charts/azure-scheduledevents-manager/Chart.yaml b/charts/azure-scheduledevents-manager/Chart.yaml
@@ -3,7 +3,7 @@ name: azure-scheduledevents-manager
 type: application
 description: A Helm chart for azure-scheduledevents-manager
 home: https://github.com/webdevops/azure-scheduledevents-manager
-version: 1.0.14
+version: 1.0.15
 # renovate: image=webdevops/azure-scheduledevents-exporter
 appVersion: 24.9.0
 keywords:
diff --git a/charts/azure-scheduledevents-manager/templates/_helpers.tpl b/charts/azure-scheduledevents-manager/templates/_helpers.tpl
@@ -67,10 +67,15 @@ app.kubernetes.io/name: {{ template "azure-scheduledevents-manager.name" . }}
 The image to use
 */}}
 {{- define "azure-scheduledevents-manager.image" -}}
+{{- if .Values.image.registry -}}
+{{- $imageQualifier := (printf "%s/%s" .Values.image.registry .Values.image.repository) -}}
+{{- else -}}
+{{- $imageQualifier := .Values.image.repository -}}
+{{- end }}
 {{- if .Values.image.sha -}}
-{{- printf "%s/%s:%s%s@%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag .Values.image.tagFlavor) .Values.image.sha }}
+{{- printf "%s:%s%s@%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag .Values.image.tagFlavor) .Values.image.sha }}
 {{- else -}}
-{{- printf "%s/%s:%s%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.tagFlavor }}
+{{- printf "%s:%s%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.tagFlavor }}
 {{- end }}
 {{- end }}
 
diff --git a/charts/kube-pool-manager/Chart.yaml b/charts/kube-pool-manager/Chart.yaml
@@ -3,7 +3,7 @@ name: kube-pool-manager
 type: application
 description: A Helm chart for kube-pool-manager
 home: https://github.com/webdevops/kube-pool-manager
-version: 1.0.13
+version: 1.0.14
 # renovate: image=webdevops/kube-pool-manager
 appVersion: 24.9.0
 keywords:
diff --git a/charts/kube-pool-manager/templates/_helpers.tpl b/charts/kube-pool-manager/templates/_helpers.tpl
@@ -67,10 +67,15 @@ app.kubernetes.io/name: {{ template "kube-pool-manager.name" . }}
 The image to use
 */}}
 {{- define "kube-pool-manager.image" -}}
+{{- if .Values.image.registry -}}
+{{- $imageQualifier := (printf "%s/%s" .Values.image.registry .Values.image.repository) -}}
+{{- else -}}
+{{- $imageQualifier := .Values.image.repository -}}
+{{- end }}
 {{- if .Values.image.sha -}}
-{{- printf "%s/%s:%s@%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
+{{- printf "%s:%s@%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
+{{- printf "%s:%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
 {{- end }}
 {{- end }}
 
diff --git a/charts/pagerduty-exporter/Chart.yaml b/charts/pagerduty-exporter/Chart.yaml
@@ -3,7 +3,7 @@ name: pagerduty-exporter
 type: application
 description: A Helm chart for pagerduty-exporter
 home: https://github.com/webdevops/pagerduty-exporter
-version: 1.1.4
+version: 1.1.5
 # renovate: image=webdevops/pagerduty-exporter
 appVersion: 24.9.0
 keywords:
diff --git a/charts/pagerduty-exporter/templates/_helpers.tpl b/charts/pagerduty-exporter/templates/_helpers.tpl
@@ -67,10 +67,15 @@ app.kubernetes.io/name: {{ template "pagerduty-exporter.name" . }}
 The image to use
 */}}
 {{- define "pagerduty-exporter.image" -}}
+{{- if .Values.image.registry -}}
+{{- $imageQualifier := (printf "%s/%s" .Values.image.registry .Values.image.repository) -}}
+{{- else -}}
+{{- $imageQualifier := .Values.image.repository -}}
+{{- end }}
 {{- if .Values.image.sha -}}
-{{- printf "%s/%s:%s@%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
+{{- printf "%s:%s@%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }}
 {{- else -}}
-{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
+{{- printf "%s:%s" $imageQualifier (default (printf "%s" .Chart.AppVersion) .Values.image.tag) }}
 {{- end }}
 {{- end }}
 
