Update dependencies to Kubernetes v1.21.1 #361

ash2k · 2021-05-26T12:08:01Z

Mostly to drop old Kustomize and other old dependency versions so that this library plays nicer with downstream consumers that want to use more modern versions.

Edit: Switched all go get to go install because go get modifies go.mod/go.sum files while installing a package and go install does not. We want the later beacuse we're not adding the dependency, just installing something to use for code generation/etc. See https://golang.org/doc/go1.16#go-command

ash2k · 2021-05-26T13:15:08Z

Build is failing because Go 1.13 is used. I've opened kubernetes/test-infra#22350 to update it.

mortent · 2021-05-27T00:33:59Z

/test cli-utils-presubmit-master

ash2k · 2021-05-27T13:45:39Z

Makefile

 	$(GOPATH)/bin/addlicense  -y 2020 -c "The Kubernetes Authors." -f LICENSE_TEMPLATE .

 verify-license:
-	(which $(GOPATH)/bin/addlicense || go get github.com/google/addlicense)
+	(which $(GOPATH)/bin/addlicense || go install github.com/google/addlicense@6d92264d717064f28b32464f0f9693a5b4ef0239) # latest as of 2021-05-27


Pinned dependency versions

Makefile

ash2k · 2021-05-28T03:31:46Z

examples/alphaTestExamples/inventoryNamespace.md

@@ -99,7 +99,7 @@ expectedOutputLine "1"
 invName=$(kubectl get cm -n test-namespace --selector='cli-utils.sigs.k8s.io/inventory-id' --no-headers | awk '{print $1}')

 # There should be one config map that is not the inventory object
-kubectl get cm -n test-namespace --selector='!cli-utils.sigs.k8s.io/inventory-id' --no-headers | wc -l > $OUTPUT/status
+kubectl get cm -n test-namespace --selector='name=test-config-map-label' --no-headers | wc -l > $OUTPUT/status


There is a new ConfigMap kube-root-ca.crt now, so made this more robust.

NAME DATA AGE cm-a 0 2s cm-b 0 2s cm-c 0 2s kube-root-ca.crt 1 7s

Previously kind was creating Kubernetes v1.19.1 and now it creates v1.21.1.

ash2k · 2021-05-28T04:04:35Z

go.mod

+	k8s.io/cli-runtime v0.21.1
+	k8s.io/client-go v0.21.1
+	k8s.io/klog/v2 v2.9.0
+	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect


Otherwise it's resolved to an older version, which is incompatible. This version contains the gnostic bump from kubernetes/kube-openapi#220. Kubernetes master uses gnostic 0.5.1 too.

ash2k · 2021-05-28T04:05:06Z

test/e2e/serverside_apply_test.go

 	fields := d.GetManagedFields()
 	Expect(fields[0].Manager).To(Equal("test"))

-	By("Verify APIService is client-side applied")
+	By("Verify APIService is server-side applied")


1.19.1 didn't support this, 1.21.1 does.

ash2k · 2021-05-28T04:05:35Z

@mortent this is finally ready for review. Cheers.

tamalsaha · 2021-05-30T04:30:35Z

Should klog be also updated to klog/v2?

mortent · 2021-06-02T01:48:29Z

/lgtm
I'll let @seans3 take a look and do the final approval.

seans3 · 2021-06-03T04:21:09Z

Should klog be also updated to klog/v2?

You are right. klog is outdated and we should update it to the more recent klog/v2. In fact, I do not think klog is currently working. If we miss some klog -> klog/v2 updates in this PR, we will update them in another PR.

seans3

Thanks for all the work. One small nitpick. I'll merge this quickly once we've added the comments. Let's be on the lookout for version skew issues.

/lgtm

seans3 · 2021-06-03T04:27:44Z

test/e2e/serverside_apply_test.go

@@ -65,7 +65,7 @@ func serversideApplyTest(c client.Client, invConfig InventoryConfig, inventoryNa
 	}, apiService)
 	Expect(err).NotTo(HaveOccurred())
 	_, found2 := apiService.GetAnnotations()[v1.LastAppliedConfigAnnotation]
-	Expect(found2).To(Equal(true))
+	Expect(found2).To(BeFalse())


Adding a comment that LastAppliedConfigAnnotation is only set for client-side apply, and we've server-side applied here would make this easier for others to follow.

seans3 · 2021-06-03T04:34:44Z

test/e2e/serverside_apply_test.go

@@ -47,11 +47,11 @@ func serversideApplyTest(c client.Client, invConfig InventoryConfig, inventoryNa
 	}, &d)
 	Expect(err).NotTo(HaveOccurred())
 	_, found := d.ObjectMeta.Annotations[v1.LastAppliedConfigAnnotation]
-	Expect(found).To(Equal(false))
+	Expect(found).To(BeFalse())


We didn't add sufficient comments initially, but we might want to comment somewhere about the difference of client-side (sets LastAppliedConfigAnnotation) vs. server-side apply (sets field managers) to help explain the tests.

k8s-ci-robot · 2021-06-03T04:36:15Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ash2k, seans3

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [seans3]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

ash2k · 2021-06-03T05:05:23Z

@seans3 Thanks for the review. Looks like the bot is buggy and merged it anyway. I'll open a followup with extra comments. #363

k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 26, 2021

k8s-ci-robot requested review from pwittrock and seans3 May 26, 2021 12:08

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label May 26, 2021

ash2k mentioned this pull request May 26, 2021

Upgrade controller to Kustomize v4 fluxcd/kustomize-controller#343

Merged

ash2k force-pushed the ash2k/update-deps branch 4 times, most recently from 04f154d to 954c2da Compare May 26, 2021 12:57

ash2k mentioned this pull request May 26, 2021

Bump Go version for cli-utils build kubernetes/test-infra#22350

Merged

ash2k force-pushed the ash2k/update-deps branch from 954c2da to 1828bbe Compare May 27, 2021 00:48

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label May 27, 2021

ash2k force-pushed the ash2k/update-deps branch from 1828bbe to 0c052c2 Compare May 27, 2021 13:03

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 27, 2021

ash2k force-pushed the ash2k/update-deps branch 3 times, most recently from 5ecd241 to f51a170 Compare May 27, 2021 13:42

ash2k commented May 27, 2021

View reviewed changes

Makefile Outdated Show resolved Hide resolved

ash2k force-pushed the ash2k/update-deps branch 4 times, most recently from 0e4873b to becffbd Compare May 28, 2021 02:15

Update dependencies to Kubernetes v1.21.1

d41f250

ash2k force-pushed the ash2k/update-deps branch from becffbd to d41f250 Compare May 28, 2021 02:54

ash2k commented May 28, 2021

View reviewed changes

k8s-ci-robot assigned mortent Jun 2, 2021

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 2, 2021

seans3 suggested changes Jun 3, 2021

View reviewed changes

k8s-ci-robot assigned seans3 Jun 3, 2021

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 3, 2021

k8s-ci-robot merged commit 1553e67 into kubernetes-sigs:master Jun 3, 2021

ash2k deleted the ash2k/update-deps branch June 3, 2021 05:01

ash2k mentioned this pull request Jun 3, 2021

Add comments to e2e test #363

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update dependencies to Kubernetes v1.21.1 #361

Update dependencies to Kubernetes v1.21.1 #361

ash2k commented May 26, 2021 •

edited

Loading

ash2k commented May 26, 2021

mortent commented May 27, 2021

ash2k May 27, 2021

ash2k May 28, 2021

ash2k May 28, 2021

ash2k May 28, 2021

ash2k May 28, 2021

ash2k commented May 28, 2021

tamalsaha commented May 30, 2021

mortent commented Jun 2, 2021

seans3 commented Jun 3, 2021 •

edited

Loading

seans3 left a comment

seans3 Jun 3, 2021

seans3 Jun 3, 2021

k8s-ci-robot commented Jun 3, 2021

ash2k commented Jun 3, 2021 •

edited

Loading

Update dependencies to Kubernetes v1.21.1 #361

Update dependencies to Kubernetes v1.21.1 #361

Conversation

ash2k commented May 26, 2021 • edited Loading

ash2k commented May 26, 2021

mortent commented May 27, 2021

ash2k May 27, 2021

Choose a reason for hiding this comment

ash2k May 28, 2021

Choose a reason for hiding this comment

ash2k May 28, 2021

Choose a reason for hiding this comment

ash2k May 28, 2021

Choose a reason for hiding this comment

ash2k May 28, 2021

Choose a reason for hiding this comment

ash2k commented May 28, 2021

tamalsaha commented May 30, 2021

mortent commented Jun 2, 2021

seans3 commented Jun 3, 2021 • edited Loading

seans3 left a comment

Choose a reason for hiding this comment

seans3 Jun 3, 2021

Choose a reason for hiding this comment

seans3 Jun 3, 2021

Choose a reason for hiding this comment

k8s-ci-robot commented Jun 3, 2021

ash2k commented Jun 3, 2021 • edited Loading

ash2k commented May 26, 2021 •

edited

Loading

seans3 commented Jun 3, 2021 •

edited

Loading

ash2k commented Jun 3, 2021 •

edited

Loading