Skip to content

Commit

Permalink
Update coredns to 1.11.3 and coredns chart to 1.36.0 (#806)
Browse files Browse the repository at this point in the history
---------

Co-authored-by: Benjamin Schimke <benjamin.schimke@canonical.com>
  • Loading branch information
eaudetcobello and bschimke95 authored Nov 20, 2024
1 parent 83c1ffb commit 8d20f34
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 7 deletions.
6 changes: 3 additions & 3 deletions build-scripts/hack/generate-sbom.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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",
],
Expand Down
4 changes: 2 additions & 2 deletions build-scripts/hack/sync-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ sync:
- source: ghcr.io/canonical/cilium:1.16.3-ck0
target: '{{ env "MIRROR" }}/canonical/cilium:1.16.3-ck0'
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-ck0'
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'
Expand Down
10 changes: 10 additions & 0 deletions build-scripts/hack/update-coredns-chart.sh
Original file line number Diff line number Diff line change
@@ -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
Binary file removed k8s/manifests/charts/coredns-1.29.0.tgz
Binary file not shown.
Binary file added k8s/manifests/charts/coredns-1.36.0.tgz
Binary file not shown.
4 changes: 2 additions & 2 deletions src/k8s/pkg/k8sd/features/coredns/chart.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ 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.
imageRepo = "ghcr.io/canonical/coredns"

// ImageTag is the tag to use for the CoreDNS image.
ImageTag = "1.11.1-ck4"
ImageTag = "1.11.3-ck0"
)

0 comments on commit 8d20f34

Please sign in to comment.