SDN 4923: rebase k8s v1.30.2#2423
Closed
jluhrsen wants to merge 4 commits intoopenshift:masterfrom
Closed
Conversation
Contributor
Author
|
/hold this is broken. It looks like we do a bunch of this kind of thing: but there was a refactor in controller-runtime that I am struggling to figure out what to do. Supposed to be a backward compatible refactor if we used the builder , but since we directly call controller.Watch() we need to change. |
openshift-ci
Bot
added
the
do-not-merge/hold
Contributor
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: jluhrsen The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
Contributor
Author
|
/retest |
3 similar comments
Contributor
Author
|
/retest |
Contributor
Author
|
/retest |
Contributor
Author
|
/retest |
❯ rg '0\.29|/openshift' go.mod | awk '{print "go get -u",$1}' | sort --uniq
go get -u github.com/openshift/api
go get -u github.com/openshift/build-machinery-go
go get -u github.com/openshift/client-go
go get -u github.com/openshift/library-go
go get -u github.com/openshift/machine-config-operator
go get -u k8s.io/api
go get -u k8s.io/apiextensions-apiserver
go get -u k8s.io/apimachinery
go get -u k8s.io/apiserver
go get -u k8s.io/client-go
go get -u k8s.io/code-generator
go get -u k8s.io/component-base
go get -u k8s.io/kms
go get -u k8s.io/kube-proxy
go get -u module
go mod tidy; go mod vendor
Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
- implement GetOperatorStateWithQuorum() for v1helpers.OperatorClient interface which was added in openshift/library-go here [0] - applyconfigv1.NetworkStatus().WithConditions() now requires metav1.ConditionApplyConfiguration instead of metav1.Condition, which came in with the client-go 1.30 rebase here [1] - using new lib location for feature gates "openshift/api/features" - refactor controller-runtime Watch() calls to handle new generics support [2] - moved RotatedSigningCASecret.JiraComponent to RotatedSigningCASecret.AdditionalAnnotations.JiraComponent from here [3] - added dummy path to apimachinery validation.IsValidIP() as it was added as an argument here [4]. not relevant to the the call in this case. - bumped k8s.io/component-base to v0.31.0-alpha.2 to get past a breaking issue with prometheus using a breaking type from 0.30.2 - the version of googleapis/api/expr/v1alpha1 that is brought in with github.com/google/cel-go with anything newer than v0.17.8 no longer includes GetConstExpr() so pinning that lib to v0.17.8 [0] openshift/library-go@bd5e34c [1] openshift/client-go@792100e#diff-233949a4a2a7ca43d091c935b04748464200784e5377366d574945d3fd06ed89R76 [2] kubernetes-sigs/controller-runtime#2783 [3] openshift/library-go@df7ff42 [4] openshift/kubernetes-apimachinery@89b9414 Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
- component-base log types added a text option in FormatOptions [0] that was not there in 1.29 [1] [0] https://github.com/kubernetes/component-base/blob/244709c58c3669b71514f38c03d08501c690423f/logs/api/v1/types.go#L99 [1] https://github.com/kubernetes/component-base/blob/3c9d29fd4504755d1a42e59053488081604186f4/logs/api/v1/types.go Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
there was an update [0] to the controller-runtime fake client to zero out all fields when serializing a target this was causing the UpdatedReplicas value to be overwritten with 0 and causing the UT to fail. the test case portion affected by this was only interested in Status changes so updating to use setStatus() should make sense here. [0] kubernetes-sigs/controller-runtime@e368149 Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
Contributor
Author
|
/hold this got messed up after I rebased on new work that has come in |
Contributor
|
@jluhrsen: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
Contributor
|
PR needs rebase. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
openshift-merge-robot
added
the
needs-rebase
Contributor
|
/close in favor of #2429 |
Contributor
|
@jcaamano: Closed this PR. DetailsIn response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.