From 1dc1dad3ef0c78ad343a346aafa27f6a12c7bc4a Mon Sep 17 00:00:00 2001
From: Anders Kvanvig <anders.kvanvig@basefarm-orange.com>
Date: Fri, 21 Feb 2025 14:06:32 +0100
Subject: [PATCH] added option to select the image repository and tag for
 remaining images

Signed-off-by: Anders Kvanvig <anders.kvanvig@basefarm-orange.com>
---
 charts/osbuilder/Chart.yaml                | 2 +-
 charts/osbuilder/templates/deployment.yaml | 4 ++--
 charts/osbuilder/values.yaml               | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/charts/osbuilder/Chart.yaml b/charts/osbuilder/Chart.yaml
index 1575729..821153f 100644
--- a/charts/osbuilder/Chart.yaml
+++ b/charts/osbuilder/Chart.yaml
@@ -8,5 +8,5 @@ maintainers:
 - name: Ettore Di Giacinto
   email: mudler@kairos.io
 
-version: 0.7.0
+version: 0.7.1
 appVersion: "v0.401.0"
diff --git a/charts/osbuilder/templates/deployment.yaml b/charts/osbuilder/templates/deployment.yaml
index ff5f1a8..1137cbb 100644
--- a/charts/osbuilder/templates/deployment.yaml
+++ b/charts/osbuilder/templates/deployment.yaml
@@ -29,7 +29,7 @@ spec:
                   - --upstream=http://127.0.0.1:8080/
                   - --logtostderr=true
                   - --v=0
-                image: gcr.io/kubebuilder/kube-rbac-proxy:v0.11.0
+                image: '{{ .Values.kubeRbacProxyImage.repository }}:{{ .Values.kubeRbacProxyImage.tag }}'
                 name: kube-rbac-proxy
                 ports:
                   - containerPort: 8443
@@ -106,7 +106,7 @@ spec:
                 app.kubernetes.io/name: osbuilder-nginx
         spec:
             containers:
-              - image: nginx
+              - image: '{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}'
                 name: nginx
                 ports:
                   - containerPort: 80
diff --git a/charts/osbuilder/values.yaml b/charts/osbuilder/values.yaml
index 47e39f4..742cbac 100644
--- a/charts/osbuilder/values.yaml
+++ b/charts/osbuilder/values.yaml
@@ -14,7 +14,9 @@ image:
   repository: ""
   # tag of the controller image. Leave empty to use chart's AppVersion
   tag: ""
-
+kubeRbacProxyImage:
+  repository: "gcr.io/kubebuilder/kube-rbac-proxy"
+  tag: "v0.11.0"
 toolsImage:
   repository: "quay.io/kairos/auroraboot"
   tag: "latest"
@@ -38,6 +40,9 @@ tls:
 
 nginx:
   pvcSize: 3Gi
+  image:
+    repository: "nginx"
+    tag: "latest"
 
 ## Resource limits & requests
 ## Ref: https://kubernetes.io/docs/user-guide/compute-resources/