Skip to content

Commit 5a50501

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17645 from hakman/bump-codegen
Update codegen to v0.34.1
2 parents f658041 + 513bcb9 commit 5a50501

File tree

86 files changed

+1230
-6938
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

86 files changed

+1230
-6938
lines changed

‎Makefile‎

Lines changed: 43 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ GOBIN := $(shell go env GOPATH)/bin
4040
endif
4141

4242
# CODEGEN_VERSION is the version of k8s.io/code-generator to use
43-
CODEGEN_VERSION=v0.29.0
43+
CODEGEN_VERSION=v0.34.1
4444

4545
KO=go run github.com/google/ko@v0.18.0
4646

@@ -155,17 +155,17 @@ clean:
155155
codegen:
156156
go build -o ${KOPS_ROOT}/_output/bin/ k8s.io/kops/upup/tools/generators/...
157157
${KOPS_ROOT}/_output/bin/fitask \
158-
--input-dirs k8s.io/kops/upup/pkg/fi/... \
159158
--go-header-file hack/boilerplate/boilerplate.generatego.txt \
160-
--output-base ${KOPS_ROOT}
159+
--output-base ${KOPS_ROOT} \
160+
k8s.io/kops/upup/pkg/fi/...
161161

162162
.PHONY: verify-codegen
163163
verify-codegen:
164164
go build -o ${KOPS_ROOT}/_output/bin/ k8s.io/kops/upup/tools/generators/...
165165
${KOPS_ROOT}/_output/bin/fitask --verify-only \
166-
--input-dirs k8s.io/kops/upup/pkg/fi/... \
167166
--go-header-file hack/boilerplate/boilerplate.generatego.txt \
168-
--output-base ${KOPS_ROOT}
167+
--output-base ${KOPS_ROOT} \
168+
k8s.io/kops/upup/pkg/fi/...
169169

170170
.PHONY: protobuf
171171
protobuf:
@@ -435,54 +435,58 @@ apimachinery: apimachinery-codegen goimports
435435
apimachinery-codegen: apimachinery-codegen-conversion apimachinery-codegen-deepcopy apimachinery-codegen-defaulter apimachinery-codegen-client
436436

437437
.PHONY: apimachinery-codegen-conversion
438-
apimachinery-codegen-conversion: export GOPATH=
439438
apimachinery-codegen-conversion:
440-
go run k8s.io/code-generator/cmd/conversion-gen@${CODEGEN_VERSION} --skip-unsafe=true --v=0 --input-dirs ./pkg/apis/kops/v1alpha2 \
441-
--output-base=./ --output-file-base=zz_generated.conversion \
442-
--go-header-file "hack/boilerplate/boilerplate.generatego.txt"
439+
go run k8s.io/code-generator/cmd/conversion-gen@${CODEGEN_VERSION} --skip-unsafe=true --v=0 \
440+
--output-file=zz_generated.conversion.go \
441+
--go-header-file "hack/boilerplate/boilerplate.generatego.txt" \
442+
./pkg/apis/kops/v1alpha2
443443
grep 'requires manual conversion' ${KOPS_ROOT}/pkg/apis/kops/v1alpha2/zz_generated.conversion.go ; [ $$? -eq 1 ]
444-
go run k8s.io/code-generator/cmd/conversion-gen@${CODEGEN_VERSION} --skip-unsafe=true --v=0 --input-dirs ./pkg/apis/kops/v1alpha3 \
445-
--output-base=./ --output-file-base=zz_generated.conversion \
446-
--go-header-file "hack/boilerplate/boilerplate.generatego.txt"
444+
go run k8s.io/code-generator/cmd/conversion-gen@${CODEGEN_VERSION} --skip-unsafe=true --v=0 \
445+
--output-file=zz_generated.conversion.go \
446+
--go-header-file "hack/boilerplate/boilerplate.generatego.txt" \
447+
./pkg/apis/kops/v1alpha3
447448
grep 'requires manual conversion' ${KOPS_ROOT}/pkg/apis/kops/v1alpha3/zz_generated.conversion.go ; [ $$? -eq 1 ]
448449

449450
.PHONY: apimachinery-codegen-deepcopy
450-
apimachinery-codegen-deepcopy: export GOPATH=
451451
apimachinery-codegen-deepcopy:
452-
go run k8s.io/code-generator/cmd/deepcopy-gen@${CODEGEN_VERSION} --v=0 --input-dirs ./pkg/apis/kops \
453-
--output-base=./ --output-file-base=zz_generated.deepcopy \
454-
--go-header-file "hack/boilerplate/boilerplate.generatego.txt"
455-
go run k8s.io/code-generator/cmd/deepcopy-gen@${CODEGEN_VERSION} --v=0 --input-dirs ./pkg/apis/kops/v1alpha2 \
456-
--output-base=./ --output-file-base=zz_generated.deepcopy \
457-
--go-header-file "hack/boilerplate/boilerplate.generatego.txt"
458-
go run k8s.io/code-generator/cmd/deepcopy-gen@${CODEGEN_VERSION} --v=0 --input-dirs ./pkg/apis/kops/v1alpha3 \
459-
--output-base=./ --output-file-base=zz_generated.deepcopy \
460-
--go-header-file "hack/boilerplate/boilerplate.generatego.txt"
452+
go run k8s.io/code-generator/cmd/deepcopy-gen@${CODEGEN_VERSION} --v=0 \
453+
--output-file=zz_generated.deepcopy.go \
454+
--go-header-file "hack/boilerplate/boilerplate.generatego.txt" \
455+
./pkg/apis/kops
456+
go run k8s.io/code-generator/cmd/deepcopy-gen@${CODEGEN_VERSION} --v=0 \
457+
--output-file=zz_generated.deepcopy.go \
458+
--go-header-file "hack/boilerplate/boilerplate.generatego.txt" \
459+
./pkg/apis/kops/v1alpha2
460+
go run k8s.io/code-generator/cmd/deepcopy-gen@${CODEGEN_VERSION} --v=0 \
461+
--output-file=zz_generated.deepcopy.go \
462+
--go-header-file "hack/boilerplate/boilerplate.generatego.txt" \
463+
./pkg/apis/kops/v1alpha3
461464

462465
.PHONY: apimachinery-codegen-defaulter
463-
apimachinery-codegen-defaulter: export GOPATH=
464466
apimachinery-codegen-defaulter:
465-
go run k8s.io/code-generator/cmd/defaulter-gen@${CODEGEN_VERSION} --v=0 --input-dirs ./pkg/apis/kops/v1alpha2 \
466-
--output-base=./ --output-file-base=zz_generated.defaults \
467-
--go-header-file "hack/boilerplate/boilerplate.generatego.txt"
468-
go run k8s.io/code-generator/cmd/defaulter-gen@${CODEGEN_VERSION} --v=0 --input-dirs ./pkg/apis/kops/v1alpha3 \
469-
--output-base=./ --output-file-base=zz_generated.defaults \
470-
--go-header-file "hack/boilerplate/boilerplate.generatego.txt"
467+
go run k8s.io/code-generator/cmd/defaulter-gen@${CODEGEN_VERSION} --v=0 \
468+
--output-file=zz_generated.defaults.go \
469+
--go-header-file "hack/boilerplate/boilerplate.generatego.txt" \
470+
./pkg/apis/kops/v1alpha2
471+
go run k8s.io/code-generator/cmd/defaulter-gen@${CODEGEN_VERSION} --v=0 \
472+
--output-file=zz_generated.defaults.go \
473+
--go-header-file "hack/boilerplate/boilerplate.generatego.txt" \
474+
./pkg/apis/kops/v1alpha3
471475

472476
.PHONY: apimachinery-codegen-client
473-
apimachinery-codegen-client: export GOPATH=
474-
apimachinery-codegen-client: TMPDIR := $(shell mktemp -d)
475477
apimachinery-codegen-client:
476478
go run k8s.io/code-generator/cmd/client-gen@${CODEGEN_VERSION} --v=0 \
477-
--input-base=k8s.io/kops/pkg/apis --input-dirs=. --input="kops/,kops/v1alpha2,kops/v1alpha3" \
478-
--output-package=k8s.io/kops/pkg/client/clientset_generated/ --output-base=$(TMPDIR) \
479-
--go-header-file "hack/boilerplate/boilerplate.generatego.txt"
479+
--input-base=k8s.io/kops/pkg/apis --input="kops/,kops/v1alpha2,kops/v1alpha3" \
480+
--output-dir=pkg/client/clientset_generated/ \
481+
--output-pkg=k8s.io/kops/pkg/client/clientset_generated/ \
482+
--go-header-file "hack/boilerplate/boilerplate.generatego.txt" \
483+
.
480484
go run k8s.io/code-generator/cmd/client-gen@${CODEGEN_VERSION} --v=0 --clientset-name="clientset" \
481-
--input-base=k8s.io/kops/pkg/apis --input-dirs=. --input="kops/,kops/v1alpha2,kops/v1alpha3" \
482-
--output-package=k8s.io/kops/pkg/client/clientset_generated/ --output-base=$(TMPDIR) \
483-
--go-header-file "hack/boilerplate/boilerplate.generatego.txt"
484-
cp -r $(TMPDIR)/k8s.io/kops/pkg .
485-
rm -rf $(TMPDIR)
485+
--input-base=k8s.io/kops/pkg/apis --input="kops/,kops/v1alpha2,kops/v1alpha3" \
486+
--output-dir=pkg/client/clientset_generated/ \
487+
--output-pkg=k8s.io/kops/pkg/client/clientset_generated/ \
488+
--go-header-file "hack/boilerplate/boilerplate.generatego.txt" \
489+
.
486490

487491
.PHONY: verify-apimachinery
488492
verify-apimachinery:

‎channels/pkg/channels/addons_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func Test_GetRequiredUpdates(t *testing.T) {
140140
Name: "kube-system",
141141
},
142142
}
143-
fakek8s := fakekubernetes.NewSimpleClientset(kubeSystem)
143+
fakek8s := fakekubernetes.NewClientset(kubeSystem)
144144
fakecm := fakecertmanager.NewSimpleClientset()
145145
addon := &Addon{
146146
Name: "test",
@@ -271,7 +271,7 @@ func Test_NeedsRollingUpdate(t *testing.T) {
271271

272272
existingChannels := FindChannelVersions(kubeSystem)
273273

274-
fakek8s := fakekubernetes.NewSimpleClientset(objects...)
274+
fakek8s := fakekubernetes.NewClientset(objects...)
275275
fakecm := fakecertmanager.NewSimpleClientset()
276276

277277
addon := g.newAddon
@@ -333,7 +333,7 @@ func Test_InstallPKI(t *testing.T) {
333333
Name: "kube-system",
334334
},
335335
}
336-
fakek8s := fakekubernetes.NewSimpleClientset(kubeSystem)
336+
fakek8s := fakekubernetes.NewClientset(kubeSystem)
337337
fakecm := fakecertmanager.NewSimpleClientset()
338338
addon := &Addon{
339339
Name: "test",

‎channels/pkg/channels/channel_version_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929

3030
func Test_IsPKIInstalled(t *testing.T) {
3131
ctx := context.Background()
32-
fakek8s := fakekubernetes.NewSimpleClientset(&corev1.Namespace{
32+
fakek8s := fakekubernetes.NewClientset(&corev1.Namespace{
3333
ObjectMeta: metav1.ObjectMeta{
3434
Name: "kube-sysetem",
3535
},
@@ -47,7 +47,7 @@ func Test_IsPKIInstalled(t *testing.T) {
4747
t.Error("claims PKI installed when it is not")
4848
}
4949

50-
fakek8s = fakekubernetes.NewSimpleClientset(
50+
fakek8s = fakekubernetes.NewClientset(
5151
&corev1.Namespace{
5252
ObjectMeta: metav1.ObjectMeta{
5353
Name: "kube-sysetem",

‎channels/pkg/cmd/apply_channel_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func TestGetUpdates(t *testing.T) {
4646
},
4747
},
4848
}
49-
k8sClient := fakek8s.NewSimpleClientset(&kubeSystemNS, &defaultNS)
49+
k8sClient := fakek8s.NewClientset(&kubeSystemNS, &defaultNS)
5050
ctx := context.Background()
5151

5252
channelVersions, err := getChannelVersions(ctx, k8sClient)

‎dns-controller/pkg/watchers/pod_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func TestPodController(t *testing.T) {
5252
},
5353
}
5454

55-
client := fake.NewSimpleClientset()
55+
client := fake.NewClientset()
5656
pods := client.CoreV1().Pods("kube-system")
5757

5858
_, err := pods.Create(ctx, pspec, metav1.CreateOptions{})

‎pkg/apis/kops/v1alpha2/zz_generated.defaults.go‎

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/apis/kops/v1alpha3/zz_generated.defaults.go‎

Lines changed: 0 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset_generated/clientset/clientset.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pkg/client/clientset_generated/clientset/fake/clientset_generated.go‎

Lines changed: 11 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)