[ci skip] 2025.01.14-33746

cybozu-go · Jan 14, 2025 · 8ee94ad · 8ee94ad
2 parents 1ff3718 + 6430cae
commit 8ee94ad
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 28 deletions.
diff --git a/Makefile.common b/Makefile.common
@@ -1,14 +1,14 @@
 # tool versions used for both local bin and deb/zip packages
 
 ## These should be updated when Kubernetes is updated
-CKE_VERSION = 1.29.0
-CONTAINERD_VERSION = 1.7.20
-NERDCTL_VERSION = 1.7.6
-CRITOOLS_VERSION = 1.30.0
-RUNC_VERSION = 1.1.13
-K8S_VERSION = 1.29.7
-HELM_VERSION = 3.15.3
-STERN_VERSION = 1.30.0
+CKE_VERSION = 1.30.4
+CONTAINERD_VERSION = 1.7.24
+NERDCTL_VERSION = 2.0.0
+CRITOOLS_VERSION = 1.31.1
+RUNC_VERSION = 1.2.3
+K8S_VERSION = 1.30.5
+HELM_VERSION = 3.16.4
+STERN_VERSION = 1.31.0
 
 
 ## These should be updated regularly

diff --git a/Makefile.tools b/Makefile.tools
@@ -183,9 +183,9 @@ argocd: $(ARGOCD_DOWNLOAD)
 
 $(KUBECTL_DOWNLOAD):
 	mkdir -p $(KUBECTL_DLDIR)
-	$(WGET) -O $(KUBECTL_DLDIR)/kubectl-linux-amd64 https://storage.googleapis.com/kubernetes-release/release/v$(K8S_VERSION)/bin/linux/amd64/kubectl
-	$(WGET) -O $(KUBECTL_DLDIR)/kubectl.exe https://storage.googleapis.com/kubernetes-release/release/v$(K8S_VERSION)/bin/windows/amd64/kubectl.exe
-	$(WGET) -O $(KUBECTL_DLDIR)/kubectl-darwin-amd64 https://storage.googleapis.com/kubernetes-release/release/v$(K8S_VERSION)/bin/darwin/amd64/kubectl
+	$(WGET) -O $(KUBECTL_DLDIR)/kubectl-linux-amd64 https://dl.k8s.io/v$(K8S_VERSION)/bin/linux/amd64/kubectl
+	$(WGET) -O $(KUBECTL_DLDIR)/kubectl.exe https://dl.k8s.io/v$(K8S_VERSION)/bin/windows/amd64/kubectl.exe
+	$(WGET) -O $(KUBECTL_DLDIR)/kubectl-darwin-amd64 https://dl.k8s.io/v$(K8S_VERSION)/bin/darwin/amd64/kubectl
 	$(WGET_GITHUB) -O $(KUBECTL_DLDIR)/LICENSE   https://raw.githubusercontent.com/kubernetes/kubernetes/v$(K8S_VERSION)/LICENSE
 	$(WGET_GITHUB) -O $(KUBECTL_DLDIR)/README.md https://raw.githubusercontent.com/kubernetes/kubernetes/v$(K8S_VERSION)/README.md
 	touch $@

diff --git a/artifacts.go b/artifacts.go
diff --git a/artifacts_ignore.yaml b/artifacts_ignore.yaml
@@ -5,10 +5,5 @@ images:
   versions: ["0.1.15.1"]
 - repository: ghcr.io/cybozu/cilium-operator-generic
   versions: ["1.15.11.1"]
-- repository: ghcr.io/cybozu/etcd
-  versions: ["3.5.15.1"]
 - repository: ghcr.io/cybozu/hubble-relay
   versions: ["1.15.12.1"]
-osImage:
-- channel: stable
-  versions: ["4081.2.0","4081.2.1"]
diff --git a/etc/cke-template.yml b/etc/cke-template.yml
@@ -137,7 +137,7 @@ options:
             - system:kube-scheduler
         - level: RequestResponse
     extra_args:
-      - "--feature-gates=ValidatingAdmissionPolicy=true"
+      - "--feature-gates=ValidatingAdmissionPolicy=true,StrictCostEnforcementForVAP=true,StrictCostEnforcementForWebhooks=true"
       - "--audit-log-maxage=1"
       - "--audit-log-maxsize=10"
       - "--audit-log-maxbackup=10"

diff --git a/etc/squid-pre.yaml b/etc/squid-pre.yaml
@@ -162,7 +162,7 @@ spec:
       - args:
         - -c
         - /etc/unbound/unbound.conf
-        image: ghcr.io/cybozu/unbound:1.20.0.2
+        image: ghcr.io/cybozu/unbound:1.21.1.1
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/etc/squid.yaml b/etc/squid.yaml
@@ -155,7 +155,7 @@ spec:
       - args:
         - -c
         - /etc/unbound/unbound.conf
-        image: ghcr.io/cybozu/unbound:1.20.0.2
+        image: ghcr.io/cybozu/unbound:1.21.1.1
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/etc/unbound-pre.yaml b/etc/unbound-pre.yaml
@@ -114,7 +114,7 @@ spec:
       - args:
         - -c
         - /etc/unbound/unbound.conf
-        image: ghcr.io/cybozu/unbound:1.20.0.2
+        image: ghcr.io/cybozu/unbound:1.21.1.1
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/etc/unbound.yaml b/etc/unbound.yaml
@@ -114,7 +114,7 @@ spec:
       - args:
         - -c
         - /etc/unbound/unbound.conf
-        image: ghcr.io/cybozu/unbound:1.20.0.2
+        image: ghcr.io/cybozu/unbound:1.21.1.1
         imagePullPolicy: IfNotPresent
         lifecycle:
           preStop:

diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ go 1.23.3
 replace github.com/armon/go-metrics v0.5.3 => github.com/hashicorp/go-metrics v0.5.3
 
 require (
-	github.com/cybozu-go/cke v1.29.0
+	github.com/cybozu-go/cke v1.30.0
 	github.com/cybozu-go/etcdutil v1.6.9
 	github.com/cybozu-go/log v1.7.0
 	github.com/cybozu-go/netutil v1.4.9

diff --git a/go.sum b/go.sum
@@ -54,8 +54,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
 github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/cybozu-go/cke v1.29.0 h1:TC6G8qDKpBBnlZf8j3uPryVA1KgBLjfBU5zyJD0Mbzg=
-github.com/cybozu-go/cke v1.29.0/go.mod h1:QowZUhOu2ULS8I6Gfn6D7BT1Hh6DSUfD/p9k7xSLoX0=
+github.com/cybozu-go/cke v1.30.0 h1:K2x++xboeW75vxy7z1/4Zd2il61cPC+ilubJ27Iq/CM=
+github.com/cybozu-go/cke v1.30.0/go.mod h1:kI1KcZIvZwDMHKIUNhcM6El+Tns7ORSkzYWmvxKK444=
 github.com/cybozu-go/etcdutil v1.6.9 h1:3ZlKlZYrb8MfWRlx1q94yM4+SaFerRKyOGBccIleB2I=
 github.com/cybozu-go/etcdutil v1.6.9/go.mod h1:SxL0EuLnC3F06vXaJAHkfws45cburXFOeLEATtUE/Fs=
 github.com/cybozu-go/log v1.7.0 h1:wPTkNDWcnSLLAv1ejFSn07qvYG8ng6U6Gygv04dYW1w=

diff --git a/squid/base/kustomization.yaml b/squid/base/kustomization.yaml
@@ -11,6 +11,6 @@ images:
   - name: ghcr.io/cybozu/squid-exporter
     newTag: 1.0.7
   - name: ghcr.io/cybozu/unbound
-    newTag: 1.20.0.2
+    newTag: 1.21.1.1
   - name: ghcr.io/cybozu/unbound_exporter
     newTag: 0.4.6.2
diff --git a/unbound/base/kustomization.yaml b/unbound/base/kustomization.yaml
@@ -8,6 +8,6 @@ resources:
   - service.yaml
 images:
   - name: ghcr.io/cybozu/unbound
-    newTag: 1.20.0.2
+    newTag: 1.21.1.1
   - name: ghcr.io/cybozu/unbound_exporter
     newTag: 0.4.6.2