Merge pull request #16345 from hakman/automated-cherry-pick-of-#16344…

…-upstream-release-1.28

Cherry pick of #16344: validation: Allow overlap of pod/node CIDR and service CIDR

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
         with:
-          go-version: '1.21.6'
+          go-version: '1.22.0'
 
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
         with:
@@ -36,7 +36,7 @@ jobs:
     - name: Set up go
       uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
       with:
-        go-version: '1.21.6'
+        go-version: '1.22.0'
 
     - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
       with:
@@ -53,7 +53,7 @@ jobs:
     - name: Set up go
       uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
       with:
-        go-version: '1.21.6'
+        go-version: '1.22.0'
 
     - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
       with:
@@ -70,7 +70,7 @@ jobs:
       - name: Set up go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe
         with:
-          go-version: '1.21.6'
+          go-version: '1.22.0'
 
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
         with:

.github/workflows/update-deps.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
         with:
-          go-version: '1.21.6'
+          go-version: '1.22.0'
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
       - name: Update Dependencies
         id: update_deps

Makefile

@@ -40,7 +40,7 @@ GOBIN := $(shell go env GOPATH)/bin
 endif
 
 # CODEGEN_VERSION is the version of k8s.io/code-generator to use
-CODEGEN_VERSION=v0.24.0
+CODEGEN_VERSION=v0.28.6
 
 KO=go run github.com/google/ko@v0.14.1
 
@@ -752,7 +752,7 @@ dev-upload: dev-upload-linux-amd64 dev-upload-linux-arm64
 .PHONY: crds
 crds:
 	cd "${KOPS_ROOT}/hack" && go build -o "${KOPS_ROOT}/_output/bin/controller-gen" sigs.k8s.io/controller-tools/cmd/controller-gen
-	"${KOPS_ROOT}/_output/bin/controller-gen" crd paths=k8s.io/kops/pkg/apis/kops/v1alpha2 output:dir=k8s/crds/ crd:crdVersions=v1
+	"${KOPS_ROOT}/_output/bin/controller-gen" crd paths=k8s.io/kops/pkg/apis/kops/v1alpha2 output:dir=k8s/crds/
 
 #------------------------------------------------------
 # kops-controller

cloudbuild.yaml

@@ -5,7 +5,7 @@ options:
   machineType: 'N1_HIGHCPU_8'
 steps:
 # Push the images
-- name: 'docker.io/library/golang:1.21.6-bookworm'
+- name: 'docker.io/library/golang:1.22.0-bookworm'
   id: images
   entrypoint: make
   env:
@@ -21,7 +21,7 @@ steps:
   - dns-controller-push
   - kube-apiserver-healthcheck-push
 # Push the artifacts
-- name: 'docker.io/library/golang:1.21.6-bookworm'
+- name: 'docker.io/library/golang:1.22.0-bookworm'
   id: artifacts
   entrypoint: make
   env:
@@ -36,7 +36,7 @@ steps:
   args:
   - gcs-upload-and-tag
 # Build cloudbuild artifacts (for attestation)
-- name: 'docker.io/library/golang:1.21.6-bookworm'
+- name: 'docker.io/library/golang:1.22.0-bookworm'
   id: cloudbuild-artifacts
   entrypoint: make
   env:

go.mod

@@ -1,6 +1,6 @@
 module k8s.io/kops
 
-go 1.20
+go 1.22
 
 require (
 	cloud.google.com/go/compute/metadata v0.2.3
@@ -42,31 +42,31 @@ require (
 	github.com/stretchr/testify v1.8.4
 	github.com/weaveworks/mesh v0.0.0-20191105120815-58dbcc3e8e63
 	go.uber.org/multierr v1.11.0
-	golang.org/x/crypto v0.14.0
+	golang.org/x/crypto v0.19.0
 	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
-	golang.org/x/net v0.17.0
+	golang.org/x/net v0.19.0
 	golang.org/x/oauth2 v0.11.0
-	golang.org/x/sync v0.3.0
-	golang.org/x/sys v0.13.0
+	golang.org/x/sync v0.5.0
+	golang.org/x/sys v0.17.0
 	google.golang.org/api v0.138.0
 	google.golang.org/grpc v1.57.0
 	google.golang.org/protobuf v1.31.0
 	gopkg.in/gcfg.v1 v1.2.3
 	gopkg.in/inf.v0 v0.9.1
 	gopkg.in/square/go-jose.v2 v2.6.0
 	helm.sh/helm/v3 v3.12.3
-	k8s.io/api v0.28.1
-	k8s.io/apimachinery v0.28.1
-	k8s.io/cli-runtime v0.28.1
-	k8s.io/client-go v0.28.1
+	k8s.io/api v0.28.6
+	k8s.io/apimachinery v0.28.6
+	k8s.io/cli-runtime v0.28.6
+	k8s.io/client-go v0.28.6
 	k8s.io/cloud-provider-aws v1.28.1
 	k8s.io/cloud-provider-gcp/providers v0.27.1
-	k8s.io/component-base v0.28.1
+	k8s.io/component-base v0.28.6
 	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01
 	k8s.io/klog/v2 v2.100.1
-	k8s.io/kubectl v0.28.1
-	k8s.io/kubelet v0.28.1
-	k8s.io/mount-utils v0.28.1
+	k8s.io/kubectl v0.28.6
+	k8s.io/kubelet v0.28.6
+	k8s.io/mount-utils v0.28.6
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b
 	sigs.k8s.io/controller-runtime v0.16.1
 	sigs.k8s.io/structured-merge-diff/v4 v4.3.0
@@ -208,11 +208,11 @@ require (
 	go.opentelemetry.io/otel v1.15.0 // indirect
 	go.opentelemetry.io/otel/trace v1.15.0 // indirect
 	go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/term v0.13.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/term v0.17.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
+	golang.org/x/tools v0.16.1 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577 // indirect
@@ -222,7 +222,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.28.0 // indirect
 	k8s.io/cloud-provider v0.28.0 // indirect
-	k8s.io/component-helpers v0.28.1 // indirect
+	k8s.io/component-helpers v0.28.6 // indirect
 	k8s.io/csi-translation-lib v0.28.0 // indirect
 	k8s.io/klog v1.0.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect