Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Nov 19, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
38d38b6
bump versions
eaudetcobello Nov 15, 2024
2648d39
update version strings
eaudetcobello Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build-scripts/hack/generate-sbom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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",
],
Expand Down
6 changes: 3 additions & 3 deletions build-scripts/hack/update-metrics-server-chart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
Binary file removed k8s/manifests/charts/metrics-server-3.12.0.tgz
View file
Open in desktop
Binary file not shown.
Binary file added k8s/manifests/charts/metrics-server-3.12.2.tgz
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions src/k8s/pkg/k8sd/features/metrics-server/chart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Loading