Update metallb version to 0.14.8 (#805)

canonical · Nov 19, 2024 · db581ac · db581ac
1 parent c17d3cf
commit db581ac
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 10 deletions.
diff --git a/build-scripts/hack/update-component-versions.py b/build-scripts/hack/update-component-versions.py
@@ -48,7 +48,7 @@
 
 # MetalLB Helm repository and chart version
 METALLB_REPO = "https://metallb.github.io/metallb"
-METALLB_CHART_VERSION = "0.14.5"
+METALLB_CHART_VERSION = "0.14.8"
 
 
 def get_kubernetes_version() -> str:

diff --git a/build-scripts/hack/update-metallb-chart.sh b/build-scripts/hack/update-metallb-chart.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+VERSION="0.14.8"
+DIR=$(realpath $(dirname "${0}"))
+
+CHARTS_PATH="$DIR/../../k8s/manifests/charts"
+
+cd "$CHARTS_PATH"
+
+helm pull --repo https://metallb.github.io/metallb metallb --version $VERSION
diff --git a/build-scripts/hack/upstream-images.yaml b/build-scripts/hack/upstream-images.yaml
@@ -49,11 +49,11 @@ sync:
   - source: quay.io/tigera/operator:v1.34.0
     target: ghcr.io/canonical/k8s-snap/tigera/operator:v1.34.0
     type: image
-  - source: quay.io/metallb/controller:v0.14.5
-    target: ghcr.io/canonical/k8s-snap/metallb/controller:v0.14.5
+  - source: quay.io/metallb/controller:v0.14.8
+    target: ghcr.io/canonical/k8s-snap/metallb/controller:v0.14.8
     type: image
-  - source: quay.io/metallb/speaker:v0.14.5
-    target: ghcr.io/canonical/k8s-snap/metallb/speaker:v0.14.5
+  - source: quay.io/metallb/speaker:v0.14.8
+    target: ghcr.io/canonical/k8s-snap/metallb/speaker:v0.14.8
     type: image
   - source: quay.io/frrouting/frr:9.0.2
     target: ghcr.io/canonical/k8s-snap/frrouting/frr:9.0.2

diff --git a/k8s/manifests/charts/metallb-0.14.5.tgz b/k8s/manifests/charts/metallb-0.14.5.tgz
diff --git a/k8s/manifests/charts/metallb-0.14.8.tgz b/k8s/manifests/charts/metallb-0.14.8.tgz
diff --git a/src/k8s/pkg/k8sd/features/metallb/chart.go b/src/k8s/pkg/k8sd/features/metallb/chart.go
@@ -11,7 +11,7 @@ var (
 	ChartMetalLB = helm.InstallableChart{
 		Name:         "metallb",
 		Namespace:    "metallb-system",
-		ManifestPath: filepath.Join("charts", "metallb-0.14.5.tgz"),
+		ManifestPath: filepath.Join("charts", "metallb-0.14.8.tgz"),
 	}
 
 	// ChartMetalLBLoadBalancer represents manifests to deploy MetalLB L2 or BGP resources.
@@ -22,16 +22,16 @@ var (
 	}
 
 	// controllerImageRepo is the image to use for metallb-controller.
-	controllerImageRepo = "ghcr.io/canonical/k8s-snap/metallb/controller"
+	controllerImageRepo = "ghcr.io/canonical/metallb-controller"
 
 	// ControllerImageTag is the tag to use for metallb-controller.
-	ControllerImageTag = "v0.14.5"
+	ControllerImageTag = "v0.14.8-ck0"
 
 	// speakerImageRepo is the image to use for metallb-speaker.
-	speakerImageRepo = "ghcr.io/canonical/k8s-snap/metallb/speaker"
+	speakerImageRepo = "ghcr.io/canonical/metallb-speaker"
 
 	// speakerImageTag is the tag to use for metallb-speaker.
-	speakerImageTag = "v0.14.5"
+	speakerImageTag = "v0.14.8-ck0"
 
 	// frrImageRepo is the image to use for frrouting.
 	frrImageRepo = "ghcr.io/canonical/k8s-snap/frrouting/frr"

diff --git a/src/k8s/pkg/k8sd/features/metallb/loadbalancer.go b/src/k8s/pkg/k8sd/features/metallb/loadbalancer.go
@@ -91,12 +91,14 @@ func enableLoadBalancer(ctx context.Context, snap snap.Snap, loadbalancer types.
 				"repository": controllerImageRepo,
 				"tag":        ControllerImageTag,
 			},
+			"command": "/controller",
 		},
 		"speaker": map[string]any{
 			"image": map[string]any{
 				"repository": speakerImageRepo,
 				"tag":        speakerImageTag,
 			},
+			"command": "/speaker",
 			// TODO(neoaggelos): make frr enable/disable configurable through an annotation
 			// We keep it disabled by default
 			"frr": map[string]any{