From 32c218ef60dfa4593794b77b38eba5fbde781242 Mon Sep 17 00:00:00 2001 From: Etienne Audet-Cobello Date: Fri, 15 Nov 2024 14:17:26 -0500 Subject: [PATCH 1/2] bump versions coredns to 1.11.3 coredns chart to 1.36.0 --- build-scripts/hack/generate-sbom.py | 6 +++--- build-scripts/hack/sync-images.yaml | 4 ++-- build-scripts/hack/update-coredns-chart.sh | 10 ++++++++++ k8s/manifests/charts/coredns-1.29.0.tgz | Bin 15271 -> 0 bytes k8s/manifests/charts/coredns-1.36.0.tgz | Bin 0 -> 15787 bytes src/k8s/pkg/k8sd/features/coredns/chart.go | 2 +- 6 files changed, 16 insertions(+), 6 deletions(-) create mode 100755 build-scripts/hack/update-coredns-chart.sh delete mode 100644 k8s/manifests/charts/coredns-1.29.0.tgz create mode 100644 k8s/manifests/charts/coredns-1.36.0.tgz diff --git a/build-scripts/hack/generate-sbom.py b/build-scripts/hack/generate-sbom.py index c9cd22a27..175159e02 100755 --- a/build-scripts/hack/generate-sbom.py +++ b/build-scripts/hack/generate-sbom.py @@ -193,9 +193,9 @@ def rock_coredns(manifest, extra_files): with util.git_repo(COREDNS_ROCK_REPO, COREDNS_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 / "1.11.1/rockcraft.yaml").read_text() + rockcraft = (d / "1.11.3/rockcraft.yaml").read_text() - extra_files["coredns/1.11.1/rockcraft.yaml"] = rockcraft + extra_files["coredns/1.11.3/rockcraft.yaml"] = rockcraft rockcraft_yaml = yaml.safe_load(rockcraft) repo_url = rockcraft_yaml["parts"]["coredns"]["source"] @@ -215,7 +215,7 @@ def rock_coredns(manifest, extra_files): }, "language": "go", "details": [ - "coredns/1.11.1/rockcraft.yaml", + "coredns/1.11.3/rockcraft.yaml", "coredns/go.mod", "coredns/go.sum", ], diff --git a/build-scripts/hack/sync-images.yaml b/build-scripts/hack/sync-images.yaml index 55bbba9d9..a4f715ddc 100644 --- a/build-scripts/hack/sync-images.yaml +++ b/build-scripts/hack/sync-images.yaml @@ -8,8 +8,8 @@ sync: - source: ghcr.io/canonical/cilium:1.15.2-ck2 target: '{{ env "MIRROR" }}/canonical/cilium:1.15.2-ck2' type: image - - source: ghcr.io/canonical/coredns:1.11.1-ck4 - target: '{{ env "MIRROR" }}/canonical/coredns:1.11.1-ck4' + - source: ghcr.io/canonical/coredns:1.11.3 + target: '{{ env "MIRROR" }}/canonical/coredns:1.11.3 type: image - source: ghcr.io/canonical/k8s-snap/sig-storage/csi-node-driver-registrar:v2.10.1 target: '{{ env "MIRROR" }}/canonical/k8s-snap/sig-storage/csi-node-driver-registrar:v2.10.1' diff --git a/build-scripts/hack/update-coredns-chart.sh b/build-scripts/hack/update-coredns-chart.sh new file mode 100755 index 000000000..04e4550f9 --- /dev/null +++ b/build-scripts/hack/update-coredns-chart.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +VERSION="1.36.0" +DIR=$(realpath $(dirname "${0}")) + +CHARTS_PATH="$DIR/../../k8s/manifests/charts" + +cd "$CHARTS_PATH" + +helm pull --repo https://coredns.github.io/helm coredns --version $VERSION diff --git a/k8s/manifests/charts/coredns-1.29.0.tgz b/k8s/manifests/charts/coredns-1.29.0.tgz deleted file mode 100644 index 47b44f4423c9dae64122ee509c5ff904c8227f07..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15271 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 literal 0 HcmV?d00001 diff --git a/src/k8s/pkg/k8sd/features/coredns/chart.go b/src/k8s/pkg/k8sd/features/coredns/chart.go index 08d37d60e..2fda5ae51 100644 --- a/src/k8s/pkg/k8sd/features/coredns/chart.go +++ b/src/k8s/pkg/k8sd/features/coredns/chart.go @@ -18,5 +18,5 @@ var ( imageRepo = "ghcr.io/canonical/coredns" // ImageTag is the tag to use for the CoreDNS image. - ImageTag = "1.11.1-ck4" + ImageTag = "1.11.3" ) From fa520e1425af111b4790325ad1ef2b8fe806a9f8 Mon Sep 17 00:00:00 2001 From: Etienne Audet-Cobello Date: Fri, 15 Nov 2024 14:23:58 -0500 Subject: [PATCH 2/2] update manifest path in chart.go --- src/k8s/pkg/k8sd/features/coredns/chart.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/k8s/pkg/k8sd/features/coredns/chart.go b/src/k8s/pkg/k8sd/features/coredns/chart.go index 2fda5ae51..fa9d8ce0d 100644 --- a/src/k8s/pkg/k8sd/features/coredns/chart.go +++ b/src/k8s/pkg/k8sd/features/coredns/chart.go @@ -11,7 +11,7 @@ var ( Chart = helm.InstallableChart{ Name: "ck-dns", Namespace: "kube-system", - ManifestPath: filepath.Join("charts", "coredns-1.29.0.tgz"), + ManifestPath: filepath.Join("charts", "coredns-1.36.0.tgz"), } // imageRepo is the image to use for CoreDNS.