Skip to content

Conversation

@yuqi-zhang
Copy link
Contributor

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]

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]>
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jan 21, 2020
@yuqi-zhang
Copy link
Contributor Author

This is a superset of #1377, not quite sure if I got this right though cc @runcom

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 21, 2020
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]>
@runcom
Copy link
Member

runcom commented Jan 22, 2020

/retest

@kikisdeliveryservice
Copy link
Contributor

Let me poke around a little to figure out how this works.

@kikisdeliveryservice
Copy link
Contributor

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

@runcom
Copy link
Member

runcom commented Jan 23, 2020

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

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

oh no we don't need origin, let's leave them the way they are in this PR 👍

@runcom
Copy link
Member

runcom commented Jan 23, 2020

ok, I was able to push directly here - let's see

@runcom
Copy link
Member

runcom commented Jan 23, 2020

alrighty, units passed

@yuqi-zhang
Copy link
Contributor Author

/retest

Thanks for the fix!

@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Jan 23, 2020

@yuqi-zhang: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-aws-scaleup-rhel7 500296c link /test e2e-aws-scaleup-rhel7

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.

Details

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/test-infra repository. I understand the commands that are listed here.

@yuqi-zhang
Copy link
Contributor Author

yuqi-zhang commented Jan 23, 2020

/test e2e-aws
throttling

@runcom
Copy link
Member

runcom commented Jan 23, 2020

/skip

@kikisdeliveryservice
Copy link
Contributor

oh aws... :(

/test e2e-aws

@kikisdeliveryservice kikisdeliveryservice self-assigned this Jan 23, 2020
@runcom
Copy link
Member

runcom commented Jan 23, 2020

/lgtm

Also

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 23, 2020
@openshift-ci-robot
Copy link
Contributor

[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

Details Needs approval from an approver in each of these files:

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

@jcpowermac jcpowermac mentioned this pull request Jan 23, 2020
@openshift-merge-robot openshift-merge-robot merged commit 55d3996 into openshift:master Jan 23, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants