Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump k8s dependencies to 1.21+ #5057

Merged

Conversation

varshaprasad96
Copy link
Member

Description of the change:
Bump k8s dependencies to 1.21+

Motivation for the change:

Checklist

If the pull request includes user-facing changes, extra documentation is required:

@openshift-ci openshift-ci bot requested review from jmccormick2001 and jmrodri July 12, 2021 22:09
Signed-off-by: varshaprasad96 <[email protected]>
@varshaprasad96 varshaprasad96 changed the title bump dependencies Bump k8s dependencies to 1.21+ Jul 12, 2021
@@ -409,34 +409,6 @@ func TestReconcile(t *testing.T) {
Namespace: "default",
},
},
ExpectedObject: &unstructured.Unstructured{
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is because of kubernetes-sigs/controller-runtime#1399. When the finalizer is successfully run and is removed, the fake client updates the object and immediately sends it for deletion.

@@ -175,15 +175,8 @@ var _ = Describe("LoggingEnqueueRequestForObject", func() {
))

// verify workqueue
Expect(q.Len()).To(Equal(2))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is because of the deduplication of events before being sent into work queue.
ref: kubernetes-sigs/controller-runtime#1390

@varshaprasad96 varshaprasad96 force-pushed the bump/k8s-1.21 branch 2 times, most recently from f2208a3 to 2ee0204 Compare July 13, 2021 17:07
Signed-off-by: varshaprasad96 <[email protected]>
Signed-off-by: varshaprasad96 <[email protected]>
@@ -9,6 +9,7 @@ export IMAGE_VERSION = v1.9.0
export SIMPLE_VERSION = $(shell (test "$(shell git describe)" = "$(shell git describe --abbrev=0)" && echo $(shell git describe)) || echo $(shell git describe --abbrev=0)+git)
export GIT_VERSION = $(shell git describe --dirty --tags --always)
export GIT_COMMIT = $(shell git rev-parse HEAD)
# TODO: bump this to 1.21, after kubectl `--generator` flag is removed from e2e tests.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

leaving this for now, since --generator flag is deprecated here and the test needs to be re-written, in sdk and kubebuilder. Will do this in a follow up PR, as I didn't want to block updating of k8s in projects because of this.


if urlPath != nil && urlPath.Path != "" {
log.Error(fmt.Errorf("api endpoint '%s' contains a path component, which the proxy server is currently unable to handle properly. Work on this issue is being tracked here: https://github.com/operator-framework/operator-sdk/issues/4925", cfg.Host), "")
if err := verifyCfgURL(cfg.Host); err != nil {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

refactoring to reduce cyclomatic complexity and make linter happy.

Signed-off-by: varshaprasad96 <[email protected]>
Copy link
Member

@estroz estroz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just one change then LGTM

Signed-off-by: varshaprasad96 <[email protected]>
Copy link
Member

@estroz estroz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 15, 2021
@varshaprasad96 varshaprasad96 merged commit fb2a657 into operator-framework:master Jul 15, 2021
@varshaprasad96 varshaprasad96 mentioned this pull request Jul 19, 2021
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants