-
Notifications
You must be signed in to change notification settings - Fork 462
Dependencies: update to kubernetes-1.17.1 #1393
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
Dependencies: update to kubernetes-1.17.1 #1393
Conversation
Openshift 4.4 will be targeting 1.17. Since we will need api updates for openshift#1377, might as well update all kube items while we're at it. Note that we used to use openshift/kubernetes/* repos, but they haven't been updated for awhile. Targeting upstream directly instead. Signed-off-by: Yu Qi Zhang <[email protected]>
With the updated dependencies, openshift/api feature gates no longer match those in the MCO templates. Update that to fix test errors. Also update GroupVersionResource in API to explicitly include group and version, since that is now checked. Signed-off-by: Yu Qi Zhang <[email protected]>
|
/retest |
|
Let me poke around a little to figure out how this works. |
|
So I think if you want to use openshift's kube you use it from origin, which has already been bumped to 1.17.1 see: https://github.com/openshift/origin/commits/master as opposed to openshift/kubernetes |
|
Found what's happening (thanks @deads2k a lot as well) - it appears we weren't fetching the correct object in units since the early days but that bug was shadowed (kubernetes/kubernetes#82794). Bumping to a new kube have fixed that bug and we're left with our unit failure, applying this patch fixes the units: commit a2c81984c7600c333810e8bc78bd4ae6559a2c12
Author: Antonio Murdaca <[email protected]>
Date: Thu Jan 23 14:53:28 2020 +0100
pkg/operator: fix DeepCopy and unit test
Signed-off-by: Antonio Murdaca <[email protected]>
diff --git a/pkg/operator/status.go b/pkg/operator/status.go
index 1972c74e..35bdf2f5 100644
--- a/pkg/operator/status.go
+++ b/pkg/operator/status.go
@@ -217,7 +217,8 @@ func (optr *Operator) fetchClusterOperator() (*configv1.ClusterOperator, error)
if err != nil {
return nil, err
}
- return co, nil
+ coCopy := co.DeepCopy()
+ return coCopy, nil
}
func (optr *Operator) initializeClusterOperator() (*configv1.ClusterOperator, error) {
diff --git a/pkg/operator/status_test.go b/pkg/operator/status_test.go
index 89198116..fbaf643e 100644
--- a/pkg/operator/status_test.go
+++ b/pkg/operator/status_test.go
@@ -536,6 +536,7 @@ func TestOperatorSyncStatus(t *testing.T) {
cov1helpers.SetStatusCondition(&co.Status.Conditions, configv1.ClusterOperatorStatusCondition{Type: configv1.OperatorDegraded, Status: configv1.ConditionFalse})
cov1helpers.SetStatusCondition(&co.Status.Conditions, configv1.ClusterOperatorStatusCondition{Type: configv1.OperatorUpgradeable, Status: configv1.ConditionUnknown})
co.Status.Versions = append(co.Status.Versions, configv1.OperandVersion{Name: "operator", Version: "test-version"})
+ optr.name = coName
for j, sync := range testCase.syncs {
optr.inClusterBringup = sync.inClusterBringUp
oh no we don't need origin, let's leave them the way they are in this PR 👍 |
Signed-off-by: Antonio Murdaca <[email protected]>
|
ok, I was able to push directly here - let's see |
Signed-off-by: Antonio Murdaca <[email protected]>
|
alrighty, units passed |
|
/retest Thanks for the fix! |
|
@yuqi-zhang: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. 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/test-infra repository. I understand the commands that are listed here. |
|
/test e2e-aws |
|
/skip |
|
oh aws... :( /test e2e-aws |
|
/lgtm Also |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: runcom, yuqi-zhang The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Openshift 4.4 will be targeting 1.17. Since we will need api
updates for #1377,
might as well update all kube items while we're at it.
Note that we used to use openshift/kubernetes/* repos, but they
haven't been updated for awhile. Targeting upstream directly instead.
Signed-off-by: Yu Qi Zhang [email protected]