Update k8s to v1.29.10 (#9504)

* Update k8s to v1.29.10 * Fix "dubious ownership" issue in OpenStack testing Cloning into '/opt/stack/calico'... fatal: detected dubious ownership in repository at '/home/semaphore/calico/.git' To add an exception for this directory, call: git config --global --add safe.directory /home/semaphore/calico/.git --------- Co-authored-by: Nell Jerram <[email protected]>
projectcalico · Nov 20, 2024 · 55e1e54 · 55e1e54
1 parent 41f5fdc
commit 55e1e54
Show file tree

Hide file tree

Showing 8 changed files with 131 additions and 128 deletions.
diff --git a/.semaphore/semaphore-scheduled-builds.yml b/.semaphore/semaphore-scheduled-builds.yml
diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
diff --git a/.semaphore/semaphore.yml.d/blocks/40-openstack.yml b/.semaphore/semaphore.yml.d/blocks/40-openstack.yml
@@ -27,6 +27,7 @@
           - export UPPER_CONSTRAINTS_FILE=https://releases.openstack.org/constraints/upper/yoga
           - export NC_PLUGIN_REPO=$(dirname $(pwd))
           - export NC_PLUGIN_REF=$(git rev-parse --abbrev-ref HEAD)
+          - sudo git config --system --add safe.directory ${NC_PLUGIN_REPO}/.git
           - TEMPEST=true DEVSTACK_BRANCH=unmaintained/yoga ./devstack/bootstrap.sh
     epilogue:
       on_fail:

diff --git a/api/go.mod b/api/go.mod
@@ -5,9 +5,9 @@ go 1.22.3
 require (
 	github.com/onsi/ginkgo v1.16.5
 	github.com/onsi/gomega v1.31.1
-	k8s.io/api v0.29.9
-	k8s.io/apimachinery v0.29.9
-	k8s.io/client-go v0.29.9
+	k8s.io/api v0.29.10
+	k8s.io/apimachinery v0.29.10
+	k8s.io/client-go v0.29.10
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
 )
 
@@ -56,30 +56,30 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.29.9
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.9
-	k8s.io/apimachinery => k8s.io/apimachinery v0.29.9
-	k8s.io/apiserver => k8s.io/apiserver v0.29.9
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.9
-	k8s.io/client-go => k8s.io/client-go v0.29.9
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.9
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.9
-	k8s.io/code-generator => k8s.io/code-generator v0.29.9
-	k8s.io/component-base => k8s.io/component-base v0.29.9
-	k8s.io/component-helpers => k8s.io/component-helpers v0.29.9
-	k8s.io/controller-manager => k8s.io/controller-manager v0.29.9
-	k8s.io/cri-api => k8s.io/cri-api v0.29.9
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.9
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.9
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.9
+	k8s.io/api => k8s.io/api v0.29.10
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.10
+	k8s.io/apimachinery => k8s.io/apimachinery v0.29.10
+	k8s.io/apiserver => k8s.io/apiserver v0.29.10
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.10
+	k8s.io/client-go => k8s.io/client-go v0.29.10
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.10
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.10
+	k8s.io/code-generator => k8s.io/code-generator v0.29.10
+	k8s.io/component-base => k8s.io/component-base v0.29.10
+	k8s.io/component-helpers => k8s.io/component-helpers v0.29.10
+	k8s.io/controller-manager => k8s.io/controller-manager v0.29.10
+	k8s.io/cri-api => k8s.io/cri-api v0.29.10
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.10
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.10
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.10
 	k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.9
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.9
-	k8s.io/kubectl => k8s.io/kubectl v0.29.9
-	k8s.io/kubelet => k8s.io/kubelet v0.29.9
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.9
-	k8s.io/metrics => k8s.io/metrics v0.29.9
-	k8s.io/mount-utils => k8s.io/mount-utils v0.29.9
-	k8s.io/node-api => k8s.io/node-api v0.29.9
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.9
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.10
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.10
+	k8s.io/kubectl => k8s.io/kubectl v0.29.10
+	k8s.io/kubelet => k8s.io/kubelet v0.29.10
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.10
+	k8s.io/metrics => k8s.io/metrics v0.29.10
+	k8s.io/mount-utils => k8s.io/mount-utils v0.29.10
+	k8s.io/node-api => k8s.io/node-api v0.29.10
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.10
 )
diff --git a/api/go.sum b/api/go.sum
@@ -236,12 +236,12 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-k8s.io/api v0.29.9 h1:FwdflpNsfMUYUOblMZNWJ4K/q0OSL5A4jGa0iOgcJco=
-k8s.io/api v0.29.9/go.mod h1:fNhmzRfKaSEHCmczA/jRx6CiDKhYOnFLJBERMJAXEk8=
-k8s.io/apimachinery v0.29.9 h1:YZ8HUid1TzQVz94cnNlsQjLdH0VoAhWSqz7t0q6B12A=
-k8s.io/apimachinery v0.29.9/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
-k8s.io/client-go v0.29.9 h1:4f/Wz6li3rEyIPFj32XAQMtOGMM1tg7KQi1oeS6ibPg=
-k8s.io/client-go v0.29.9/go.mod h1:2N1drQEZ5yiYrWVaE2Un8JiISUhl47D8pyZlYLszke4=
+k8s.io/api v0.29.10 h1:Fao3HOxccbGRC1HZtXD+Y41xJhP0tEToVo5W7EEUBm0=
+k8s.io/api v0.29.10/go.mod h1:rF0sRh64w1hMNAVGh4YYniSxODyHye3GLmymAbWBDvY=
+k8s.io/apimachinery v0.29.10 h1:57OLNqOJUgp5KlRRY3JOBFOTTa5Rt/LVkmKiiN2cvaQ=
+k8s.io/apimachinery v0.29.10/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
+k8s.io/client-go v0.29.10 h1:hPmG1pmKslRhmCIzVd90sA58B0sJwNwduNgXFWsFqhI=
+k8s.io/client-go v0.29.10/go.mod h1:gnMCQiRXGL9K0VtlW8gTkhzptGrHm2BJ4qBbujNemc4=
 k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
 k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
 k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=

diff --git a/go.mod b/go.mod
@@ -26,6 +26,7 @@ require (
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/go-ini/ini v1.67.0
 	github.com/gofrs/flock v0.8.1
+	github.com/gogo/googleapis v1.4.1
 	github.com/gogo/protobuf v1.3.2
 	github.com/golang-collections/collections v0.0.0-20130729185459-604e922904d3
 	github.com/golang/protobuf v1.5.4
@@ -95,17 +96,17 @@ require (
 	gopkg.in/go-playground/validator.v9 v9.30.2
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.29.9
-	k8s.io/apiextensions-apiserver v0.29.9
-	k8s.io/apimachinery v0.29.9
-	k8s.io/apiserver v0.29.9
-	k8s.io/client-go v0.29.9
-	k8s.io/code-generator v0.29.9
-	k8s.io/component-base v0.29.9
+	k8s.io/api v0.29.10
+	k8s.io/apiextensions-apiserver v0.29.10
+	k8s.io/apimachinery v0.29.10
+	k8s.io/apiserver v0.29.10
+	k8s.io/client-go v0.29.10
+	k8s.io/code-generator v0.29.10
+	k8s.io/component-base v0.29.10
 	k8s.io/klog/v2 v2.120.1
-	k8s.io/kube-aggregator v0.29.9
+	k8s.io/kube-aggregator v0.29.10
 	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
-	k8s.io/kubernetes v1.29.9
+	k8s.io/kubernetes v1.29.10
 	k8s.io/utils v0.0.0-20240310230437-4693a0247e57
 	modernc.org/memory v1.7.2
 	sigs.k8s.io/controller-runtime v0.17.0
@@ -188,7 +189,6 @@ require (
 	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/gofrs/uuid v4.4.0+incompatible // indirect
-	github.com/gogo/googleapis v1.4.1 // indirect
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/mock v1.6.0 // indirect
@@ -293,14 +293,14 @@ require (
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/cloud-provider v0.29.9 // indirect
-	k8s.io/component-helpers v0.29.9 // indirect
-	k8s.io/controller-manager v0.29.9 // indirect
-	k8s.io/cri-api v0.29.9 // indirect
+	k8s.io/cloud-provider v0.29.10 // indirect
+	k8s.io/component-helpers v0.29.10 // indirect
+	k8s.io/controller-manager v0.29.10 // indirect
+	k8s.io/cri-api v0.29.10 // indirect
 	k8s.io/csi-translation-lib v0.28.9 // indirect
 	k8s.io/dynamic-resource-allocation v0.28.9 // indirect
 	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
-	k8s.io/kms v0.29.9 // indirect
+	k8s.io/kms v0.29.10 // indirect
 	k8s.io/kube-scheduler v0.0.0 // indirect
 	k8s.io/kubectl v0.26.0 // indirect
 	k8s.io/kubelet v0.28.9 // indirect
@@ -315,37 +315,37 @@ require (
 replace (
 	github.com/projectcalico/api => ./api
 
-	k8s.io/api => k8s.io/api v0.29.9
-	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.9
-	k8s.io/apimachinery => k8s.io/apimachinery v0.29.9
-	k8s.io/apiserver => k8s.io/apiserver v0.29.9
-	k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.9
-	k8s.io/client-go => k8s.io/client-go v0.29.9
-	k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.9
-	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.9
-	k8s.io/code-generator => k8s.io/code-generator v0.29.9
-	k8s.io/component-base => k8s.io/component-base v0.29.9
-	k8s.io/component-helpers => k8s.io/component-helpers v0.29.9
-	k8s.io/controller-manager => k8s.io/controller-manager v0.29.9
-	k8s.io/cri-api => k8s.io/cri-api v0.29.9
-	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.9
-	k8s.io/endpointslice => k8s.io/endpointslice v0.29.9
-	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.9
-	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.9
-	k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.9
-	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.9
-	k8s.io/kubectl => k8s.io/kubectl v0.29.9
-	k8s.io/kubelet => k8s.io/kubelet v0.29.9
+	k8s.io/api => k8s.io/api v0.29.10
+	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.10
+	k8s.io/apimachinery => k8s.io/apimachinery v0.29.10
+	k8s.io/apiserver => k8s.io/apiserver v0.29.10
+	k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.10
+	k8s.io/client-go => k8s.io/client-go v0.29.10
+	k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.10
+	k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.10
+	k8s.io/code-generator => k8s.io/code-generator v0.29.10
+	k8s.io/component-base => k8s.io/component-base v0.29.10
+	k8s.io/component-helpers => k8s.io/component-helpers v0.29.10
+	k8s.io/controller-manager => k8s.io/controller-manager v0.29.10
+	k8s.io/cri-api => k8s.io/cri-api v0.29.10
+	k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.10
+	k8s.io/endpointslice => k8s.io/endpointslice v0.29.10
+	k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.10
+	k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.10
+	k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.10
+	k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.10
+	k8s.io/kubectl => k8s.io/kubectl v0.29.10
+	k8s.io/kubelet => k8s.io/kubelet v0.29.10
 
 	// Need replacements for all the k8s subsidiary projects that are pulled in indirectly because
 	// the kubernets repo pulls them in via a replacement to its own vendored copies, which doesn't work for
 	// transient imports.
-	k8s.io/kubernetes => k8s.io/kubernetes v1.29.9
-	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.9
-	k8s.io/metrics => k8s.io/metrics v0.29.9
-	k8s.io/mount-utils => k8s.io/mount-utils v0.29.9
-	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.9
-	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.9
+	k8s.io/kubernetes => k8s.io/kubernetes v1.29.10
+	k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.10
+	k8s.io/metrics => k8s.io/metrics v0.29.10
+	k8s.io/mount-utils => k8s.io/mount-utils v0.29.10
+	k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.10
+	k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.10
 
 	// Use an untagged knftables version that has changes we need.
 	sigs.k8s.io/knftables => sigs.k8s.io/knftables v0.0.17-0.20240627140917-8d2660d78107