Update metrics-server to 0.7.2 and chart to 3.12.2 (#804)

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

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/build-scripts/hack/generate-sbom.py b/build-scripts/hack/generate-sbom.py
@@ -234,9 +234,9 @@ def rock_metrics_server(manifest, extra_files):
     with util.git_repo(METRICS_SERVER_ROCK_REPO, METRICS_SERVER_ROCK_TAG) as d:
         rock_repo_commit = util.parse_output(["git", "rev-parse", "HEAD"], cwd=d)
         # TODO(ben): This should not be hard coded.
-        rockcraft = (d / "0.7.0/rockcraft.yaml").read_text()
+        rockcraft = (d / "0.7.2/rockcraft.yaml").read_text()
 
-        extra_files["metrics-server/0.7.0/rockcraft.yaml"] = rockcraft
+        extra_files["metrics-server/0.7.2/rockcraft.yaml"] = rockcraft
 
         rockcraft_yaml = yaml.safe_load(rockcraft)
         repo_url = rockcraft_yaml["parts"]["metrics-server"]["source"]
@@ -256,7 +256,7 @@ def rock_metrics_server(manifest, extra_files):
         },
         "language": "go",
         "details": [
-            "metrics-server/0.7.0/rockcraft.yaml",
+            "metrics-server/0.7.2/rockcraft.yaml",
             "metrics-server/go.mod",
             "metrics-server/go.sum",
         ],

diff --git a/build-scripts/hack/update-metrics-server-chart.sh b/build-scripts/hack/update-metrics-server-chart.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-VERSION="3.12.0"
-DIR=`realpath $(dirname "${0}")`
+VERSION="3.12.2"
+DIR=$(realpath $(dirname "${0}"))
 
-CHARTS_PATH="$DIR/../../k8s/components/charts"
+CHARTS_PATH="$DIR/../../k8s/manifests/charts"
 
 cd "$CHARTS_PATH"
 

diff --git a/k8s/manifests/charts/metrics-server-3.12.0.tgz b/k8s/manifests/charts/metrics-server-3.12.0.tgz
diff --git a/k8s/manifests/charts/metrics-server-3.12.2.tgz b/k8s/manifests/charts/metrics-server-3.12.2.tgz
diff --git a/src/k8s/pkg/k8sd/features/metrics-server/chart.go b/src/k8s/pkg/k8sd/features/metrics-server/chart.go
@@ -11,12 +11,12 @@ var (
 	chart = helm.InstallableChart{
 		Name:         "metrics-server",
 		Namespace:    "kube-system",
-		ManifestPath: filepath.Join("charts", "metrics-server-3.12.0.tgz"),
+		ManifestPath: filepath.Join("charts", "metrics-server-3.12.2.tgz"),
 	}
 
 	// imageRepo is the image to use for metrics-server.
 	imageRepo = "ghcr.io/canonical/metrics-server"
 
 	// imageTag is the image tag to use for metrics-server.
-	imageTag = "0.7.0-ck2"
+	imageTag = "0.7.2-ck0"
 )