Update MetalLB and all other packages around it

metallb-chart/Chart.yaml

@@ -5,7 +5,8 @@ dependencies:
   name: crds
   repository: file://./charts/crds
   version: 0.14.9
-- condition: frrk8s.enabled
+- alias: metallb-frr-k8s
+  condition: frrk8s.enabled
   name: frr-k8s
   repository: file://./charts/frr-k8s
   version: 0.0.16

metallb-chart/_service

@@ -7,13 +7,6 @@
     <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
     <param name="var">IMG_REPO</param>
   </service>
-  <service name="replace_using_env" mode="buildtime">
-    <param name="file">charts/frr-k8s/values.yaml</param>
-    <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
-    <param name="var">IMG_PREFIX</param>
-    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
-    <param name="var">IMG_REPO</param>
-  </service>
   <service name="replace_using_env" mode="buildtime">
     <param name="file">Chart.yaml</param>
     <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>

metallb-chart/charts/frr-k8s/values.yaml

@@ -52,7 +52,7 @@ prometheus:
 
   # the image to be used for the kuberbacproxy container
   rbacProxy:
-    repository: "%%IMG_REPO%%/%%IMG_PREFIX%%kube-rbac-proxy"
+    repository: "registry.opensuse.org/isv/suse/edge/metallb/images/kube-rbac-proxy"
     tag: "v0.18.1"
     pullPolicy: IfNotPresent
 
@@ -97,7 +97,7 @@ frrk8s:
   logLevel: info
   tolerateMaster: true
   image:
-    repository: "%%IMG_REPO%%/%%IMG_PREFIX%%frr-k8s"
+    repository: "registry.opensuse.org/isv/suse/edge/metallb/images/frr-k8s"
     tag: "v0.0.16"
     pullPolicy: IfNotPresent
   ## @param controller.updateStrategy.type FRR-K8s controller daemonset strategy type
@@ -160,7 +160,7 @@ frrk8s:
   # frr contains configuration specific to the FRR container,
   frr:
     image:
-      repository: "%%IMG_REPO%%/%%IMG_PREFIX%%frr"
+      repository: "registry.opensuse.org/isv/suse/edge/metallb/images/frr"
       tag: "8.5.6"
       pullPolicy: IfNotPresent
     metricsBindAddress: 127.0.0.1

metallb-chart/values.yaml

@@ -378,3 +378,15 @@ frrk8s:
   enabled: false
   external: false
   namespace: ""
+
+# Override any settings for the metallb frr-k8s service here
+metallb-frr-k8s:
+  prometheus:
+    rbacProxy:
+      repository: "%%IMG_REPO%%/%%IMG_PREFIX%%kube-rbac-proxy"
+  frrk8s:
+    image:
+      repository: "%%IMG_REPO%%/%%IMG_PREFIX%%frr-k8s"
+    frr:
+      image:
+        repository: "%%IMG_REPO%%/%%IMG_PREFIX%%frr"