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

OCPBUGS-14425: Alibaba platforms should not be upgreadable #257

Merged

Conversation

JoelSpeed
Copy link
Contributor

Alibaba clusters are TechPreviewNoUpgrade and should not be upgradeable.
This introduces an upgrade blocker via CCMO to prevent alibaba clusters upgrading.

The condition management in this operator sucks and needs refactoring, for now, I've made an overrides concept so that the top level operator can pass these overrides down. We should come up with a better way of doing this.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 1, 2023
@openshift-ci-robot
Copy link

@JoelSpeed: This pull request references Jira Issue OCPBUGS-14425, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @sunzhaohua2

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Alibaba clusters are TechPreviewNoUpgrade and should not be upgradeable.
This introduces an upgrade blocker via CCMO to prevent alibaba clusters upgrading.

The condition management in this operator sucks and needs refactoring, for now, I've made an overrides concept so that the top level operator can pass these overrides down. We should come up with a better way of doing 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/test-infra repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. label Jun 1, 2023
@openshift-ci openshift-ci bot requested a review from sunzhaohua2 June 1, 2023 13:49
@JoelSpeed
Copy link
Contributor Author

/cherry-pick release 4.13

@openshift-cherrypick-robot

@JoelSpeed: once the present PR merges, I will cherry-pick it on top of release 4.13 in a new PR and assign it to you.

In response to this:

/cherry-pick release 4.13

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.

@JoelSpeed
Copy link
Contributor Author

/test ?

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 1, 2023

@JoelSpeed: The following commands are available to trigger required jobs:

  • /test e2e-aws-ovn
  • /test e2e-aws-ovn-upgrade
  • /test fmt
  • /test images
  • /test lint
  • /test unit
  • /test vendor
  • /test vet

The following commands are available to trigger optional jobs:

  • /test e2e-azure-ovn
  • /test e2e-azure-ovn-ccm
  • /test e2e-azure-ovn-techpreview
  • /test e2e-azure-ovn-upgrade
  • /test e2e-gcp-ovn-ccm
  • /test e2e-gcp-ovn-techpreview
  • /test e2e-nutanix-ovn
  • /test e2e-openstack-ovn
  • /test e2e-vsphere-ovn

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-e2e-aws-ovn
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-e2e-aws-ovn-upgrade
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-e2e-azure-ovn
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-e2e-azure-ovn-ccm
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-e2e-azure-ovn-techpreview
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-e2e-azure-ovn-upgrade
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-e2e-gcp-ovn-ccm
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-e2e-gcp-ovn-techpreview
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-e2e-openstack-ovn
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-e2e-vsphere-ovn
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-fmt
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-images
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-lint
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-unit
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-vendor
  • pull-ci-openshift-cluster-cloud-controller-manager-operator-master-vet

In response to this:

/test ?

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.

@deads2k
Copy link
Contributor

deads2k commented Jun 1, 2023

It looks like it would work. Perhaps it would be easier to handle with a separate control loop setting that one condition? https://github.com/openshift/cluster-kube-apiserver-operator/blob/master/pkg/operator/featureupgradablecontroller/feature_upgradeable_controller.go#L27-L73

Just a thought, not required if the team accepts it until 4.14 (needed in 4.13 to prevent upgrades).

@JoelSpeed
Copy link
Contributor Author

It looks like it would work. Perhaps it would be easier to handle with a separate control loop setting that one condition? https://github.com/openshift/cluster-kube-apiserver-operator/blob/master/pkg/operator/featureupgradablecontroller/feature_upgradeable_controller.go#L27-L73

Just a thought, not required if the team accepts it until 4.14 (needed in 4.13 to prevent upgrades).

IMO it would be good if the team could sit down and review how we are setting conditions in this operator, there's 3 controllers at the moment and the code is a mess, we don't really have time to do that immediately IMO but we do have a card on the backlog that @elmiko created to review how these work and improve them in the long run

@JoelSpeed
Copy link
Contributor Author

/payload-job periodic-ci-openshift-release-master-nightly-4.14-e2e-alibaba-ovn

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 1, 2023

@JoelSpeed: trigger 1 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-release-master-nightly-4.14-e2e-alibaba-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/befca4b0-0086-11ee-95cc-ad5c15bf7319-0

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 1, 2023

@JoelSpeed: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-azure-ovn-upgrade 13d7ebb link false /test e2e-azure-ovn-upgrade
ci/prow/e2e-azure-ovn 13d7ebb link false /test e2e-azure-ovn
ci/prow/e2e-gcp-ovn-ccm 13d7ebb link false /test e2e-gcp-ovn-ccm

Full PR test history. Your PR dashboard.

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.

@JoelSpeed
Copy link
Contributor Author

Can see in the Alibaba payload that it added the condition correctly, however, the test suite is failing because the upgradable condition is set to false, looks like we will need to add an exception to origin to allow for this

@elmiko
Copy link
Contributor

elmiko commented Jun 8, 2023

IMO it would be good if the team could sit down and review how we are setting conditions in this operator, there's 3 controllers at the moment and the code is a mess, we don't really have time to do that immediately IMO but we do have a card on the backlog that @elmiko created to review how these work and improve them in the long run

+1, i have thoughts about this. basically, i think we just need to have separate conditions for each controller and then let the primary controller set the canonical operator conditions that are used by the wider openshift mechanisms. at the least, that will allow us to untangle the interwoven nature of what is happening currently.

@JoelSpeed
Copy link
Contributor Author

/payload-job periodic-ci-openshift-release-master-nightly-4.14-e2e-alibaba-ovn

The test should be fixed now

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 4, 2023

@JoelSpeed: trigger 1 job(s) for the /payload-(job|aggregate) command

  • periodic-ci-openshift-release-master-nightly-4.14-e2e-alibaba-ovn

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/98454550-1a4b-11ee-8dbb-678890f018a3-0

@JoelSpeed
Copy link
Contributor Author

Start all core operators failure is fixed, other issues in the failure seem to be unrelated

Copy link
Member

@damdo damdo 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 4, 2023
Copy link
Contributor

@elmiko elmiko left a comment

Choose a reason for hiding this comment

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

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 5, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: elmiko

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:

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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 5, 2023
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 785ce67 and 2 for PR HEAD 13d7ebb in total

@openshift-merge-robot openshift-merge-robot merged commit ceabea8 into openshift:master Jul 5, 2023
14 of 17 checks passed
@openshift-ci-robot
Copy link

@JoelSpeed: Jira Issue OCPBUGS-14425: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-14425 has been moved to the MODIFIED state.

In response to this:

Alibaba clusters are TechPreviewNoUpgrade and should not be upgradeable.
This introduces an upgrade blocker via CCMO to prevent alibaba clusters upgrading.

The condition management in this operator sucks and needs refactoring, for now, I've made an overrides concept so that the top level operator can pass these overrides down. We should come up with a better way of doing 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/test-infra repository.

@openshift-cherrypick-robot

@JoelSpeed: cannot checkout release 4.13: error checking out release 4.13: exit status 1. output: error: pathspec 'release 4.13' did not match any file(s) known to git

In response to this:

/cherry-pick release 4.13

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.

@JoelSpeed
Copy link
Contributor Author

/cherry-pick release-4.13

@JoelSpeed JoelSpeed deleted the block-baba-upgrades branch July 6, 2023 10:38
@openshift-cherrypick-robot

@JoelSpeed: #257 failed to apply on top of branch "release-4.13":

Applying: Alibaba platforms should not be upgradeable
Using index info to reconstruct a base tree...
M	pkg/controllers/clusteroperator_controller.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/controllers/clusteroperator_controller.go
CONFLICT (content): Merge conflict in pkg/controllers/clusteroperator_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Alibaba platforms should not be upgradeable
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.13

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.

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. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants