Skip to content

Commit

Permalink
Merge pull request #9335 from hjiawei/k8s-1.30
Browse files Browse the repository at this point in the history 
Bump k8s to v1.30 release train
  • Loading branch information
@hjiawei
hjiawei authored Oct 29, 2024
2 parents 65824bc + dc73609 commit f9ad3d8
Show file tree
Hide file tree
Showing 33 changed files with 1,381 additions and 395 deletions.
22 changes: 15 additions & 7 deletions api/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ gen-files .generate_files: lint-cache-dir clean-generated
sh -c '$(GIT_CONFIG_SSH) defaulter-gen \
--v 1 --logtostderr \
--go-header-file "/go/src/$(PACKAGE_NAME)/hack/boilerplate/boilerplate.go.txt" \
--input-dirs "$(PACKAGE_NAME)/pkg/apis/projectcalico/v3" \
--extra-peer-dirs "$(PACKAGE_NAME)/pkg/apis/projectcalico/v3" \
--output-file-base "zz_generated.defaults"'
--output-file zz_generated.defaults.go \
"$(PACKAGE_NAME)/pkg/apis/projectcalico/v3"'
# Generate deep copies
$(DOCKER_RUN) $(CALICO_BUILD) \
sh -c '$(GIT_CONFIG_SSH) deepcopy-gen \
--v 1 --logtostderr \
--go-header-file "/go/src/$(PACKAGE_NAME)/hack/boilerplate/boilerplate.go.txt" \
--input-dirs "$(PACKAGE_NAME)/pkg/apis/projectcalico/v3" \
--bounding-dirs $(PACKAGE_NAME) \
--output-file-base zz_generated.deepcopy'
--output-file zz_generated.deepcopy.go \
"$(PACKAGE_NAME)/pkg/apis/projectcalico/v3"'

# generate all pkg/client contents
$(DOCKER_RUN) $(CALICO_BUILD) \
Expand All @@ -78,8 +78,16 @@ gen-files .generate_files: lint-cache-dir clean-generated
sh -c '$(GIT_CONFIG_SSH) openapi-gen \
--v 1 --logtostderr \
--go-header-file "/go/src/$(PACKAGE_NAME)/hack/boilerplate/boilerplate.go.txt" \
--input-dirs "$(PACKAGE_NAME)/pkg/apis/projectcalico/v3,k8s.io/api/core/v1,k8s.io/api/networking/v1,k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/version,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/util/intstr,$(PACKAGE_NAME)/pkg/lib/numorstring" \
--output-package "$(PACKAGE_NAME)/pkg/openapi"'
--output-dir "/go/src/$(PACKAGE_NAME)/pkg/openapi" \
--output-pkg "$(PACKAGE_NAME)/pkg/openapi" \
"$(PACKAGE_NAME)/pkg/apis/projectcalico/v3" \
"k8s.io/api/core/v1" \
"k8s.io/api/networking/v1" \
"k8s.io/apimachinery/pkg/apis/meta/v1" \
"k8s.io/apimachinery/pkg/runtime" \
"k8s.io/apimachinery/pkg/util/intstr" \
"k8s.io/apimachinery/pkg/version" \
"$(PACKAGE_NAME)/pkg/lib/numorstring"'

touch .generate_files
$(MAKE) fix
Expand All @@ -101,7 +109,7 @@ clean-generated:
find $(TOP_SRC_DIRS) -name zz_generated* -exec rm {} \;
# rollback changes to the generated clientset directories
# find $(TOP_SRC_DIRS) -type d -name *_generated -exec rm -rf {} \;
rm -rf pkg/client/clientset_generated pkg/client/informers_generated pkg/client/listers_generated pkg/openapi pkg/lib/numorstring/openapi_generated.go
rm -rf pkg/client/clientset_generated pkg/client/informers_generated pkg/client/listers_generated pkg/openapi

clean-bin:
rm -rf $(BINDIR) \
Expand Down
11 changes: 7 additions & 4 deletions api/build/update-client-gen.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,20 @@ client-gen "$@" \
--go-header-file "${REPO_ROOT}/hack/boilerplate/boilerplate.go.txt" \
--input-base "github.com/projectcalico/api/pkg/apis/" \
--input "projectcalico/v3" \
--output-dir "${REPO_ROOT}/pkg/client/clientset_generated" \
--clientset-path "github.com/projectcalico/api/pkg/client/clientset_generated/" \
--clientset-name "clientset"
# generate lister
lister-gen "$@" \
--go-header-file "${REPO_ROOT}/hack/boilerplate/boilerplate.go.txt" \
--input-dirs="github.com/projectcalico/api/pkg/apis/projectcalico/v3" \
--output-package "github.com/projectcalico/api/pkg/client/listers_generated"
--output-dir "${REPO_ROOT}/pkg/client/listers_generated" \
--output-pkg "github.com/projectcalico/api/pkg/client/listers_generated" \
"github.com/projectcalico/api/pkg/apis/projectcalico/v3"
# generate informer
informer-gen "$@" \
--go-header-file "${REPO_ROOT}/hack/boilerplate/boilerplate.go.txt" \
--input-dirs "github.com/projectcalico/api/pkg/apis/projectcalico/v3" \
--versioned-clientset-package "github.com/projectcalico/api/pkg/client/clientset_generated/clientset" \
--listers-package "github.com/projectcalico/api/pkg/client/listers_generated" \
--output-package "github.com/projectcalico/api/pkg/client/informers_generated"
--output-dir "${REPO_ROOT}/pkg/client/informers_generated" \
--output-pkg "github.com/projectcalico/api/pkg/client/informers_generated" \
"github.com/projectcalico/api/pkg/apis/projectcalico/v3"
62 changes: 31 additions & 31 deletions api/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ 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/kube-openapi v0.0.0-20231010175941-2dd684a91f00
k8s.io/api v0.30.5
k8s.io/apimachinery v0.30.5
k8s.io/client-go v0.30.5
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
Expand Down Expand Up @@ -48,38 +48,38 @@ require (
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.110.1 // indirect
k8s.io/klog/v2 v2.120.1 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)

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.30.5
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.5
k8s.io/apimachinery => k8s.io/apimachinery v0.30.5
k8s.io/apiserver => k8s.io/apiserver v0.30.5
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.5
k8s.io/client-go => k8s.io/client-go v0.30.5
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.5
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.5
k8s.io/code-generator => k8s.io/code-generator v0.30.5
k8s.io/component-base => k8s.io/component-base v0.30.5
k8s.io/component-helpers => k8s.io/component-helpers v0.30.5
k8s.io/controller-manager => k8s.io/controller-manager v0.30.5
k8s.io/cri-api => k8s.io/cri-api v0.30.5
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.5
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.5
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.5
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.30.5
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.5
k8s.io/kubectl => k8s.io/kubectl v0.30.5
k8s.io/kubelet => k8s.io/kubelet v0.30.5
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.5
k8s.io/metrics => k8s.io/metrics v0.30.5
k8s.io/mount-utils => k8s.io/mount-utils v0.30.5
k8s.io/node-api => k8s.io/node-api v0.30.5
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.5
)
24 changes: 12 additions & 12 deletions api/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQL
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
Expand Down Expand Up @@ -185,8 +185,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down Expand Up @@ -236,14 +236,14 @@ 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/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
k8s.io/api v0.30.5 h1:Coz05sfEVywzGcA96AJPUfs2B8LBMnh+IIsM+HCfaz8=
k8s.io/api v0.30.5/go.mod h1:HfNBGFvq9iNK8dmTKjYIdAtMxu8BXTb9c1SJyO6QjKs=
k8s.io/apimachinery v0.30.5 h1:CQZO19GFgw4zcOjY2H+mJ3k1u1o7zFACTNCB7nu4O18=
k8s.io/apimachinery v0.30.5/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
k8s.io/client-go v0.30.5 h1:vEDSzfTz0F8TXcWVdXl+aqV7NAV8M3UvC2qnGTTCoKw=
k8s.io/client-go v0.30.5/go.mod h1:/q5fHHBmhAUesOOFJACpD7VJ4e57rVtTPDOsvXrPpMk=
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d h1:VcFq5n7wCJB2FQMCIHfC+f+jNcGgNMar1uKd6rVlifU=
k8s.io/kube-openapi v0.0.0-20230303024457-afdc3dddf62d/go.mod h1:y5VtZWM9sHHc2ZodIH/6SHzXj+TPU5USoA8lcIeKEKY=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
Expand Down
Loading

0 comments on commit f9ad3d8

Please sign in to comment.