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

Bug 1809333: ROKS - remove machine related CRDs from cluster #503

Merged
merged 1 commit into from Mar 5, 2020

Conversation

csrwng
Copy link
Contributor

@csrwng csrwng commented Mar 2, 2020

In a ROKS cluster, the console UI should not show machine related views since
machine management is done outside the cluster. The UI will remove the
views as long as the CRDs are not present.

@openshift-ci-robot
Copy link
Contributor

@csrwng: This pull request references Bugzilla bug 1809333, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

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

In response to this:

Bug 1809333: ROKS - remove machine related CRDs from cluster

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 bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 2, 2020
@enxebre
Copy link
Member

enxebre commented Mar 3, 2020

mm @csrwng is unfortunate that this would be overridden every time the CRDs are autogenerated. How are others solving that problem?

@csrwng
Copy link
Contributor Author

csrwng commented Mar 3, 2020

@enxebre machine related CRDs are the only ones we need to omit for ROKS. Can we make it part of the CRD generation script? (https://github.com/openshift/machine-api-operator/blob/master/hack/gen-crd.sh)

@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 3, 2020
@csrwng
Copy link
Contributor Author

csrwng commented Mar 3, 2020

@enxebre I updated the gen-crd script to add the annotation for the hosted control plane. If this is acceptable, I'll do the same for the autoscaler PR.

@enxebre
Copy link
Member

enxebre commented Mar 3, 2020

/approve
PTAL @bison @JoelSpeed

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre

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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 3, 2020
@csrwng
Copy link
Contributor Author

csrwng commented Mar 3, 2020

/retest

Copy link
Contributor

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

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

I'm not a huge fan of the random string encoding differences this Python change introduces, do you know if there's a way to stop it from doing that?

Does any CI run the generation of this code? I ran it locally and had to manually install the yaml dependency, curious as to whether this might break the CI as well?

In a ROKS cluster, the console UI should not show machine related views since
machine management is done outside the cluster. The UI will remove the
views as long as the CRDs are not present.
@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Mar 4, 2020
@csrwng
Copy link
Contributor Author

csrwng commented Mar 4, 2020

Thanks @JoelSpeed. Submitting an alternate implementation that doesn't alter the encoding of the resulting file. It relies on generated CRDs not having any annotations, which I think for now is safe to assume. I don't believe the generate script is used in CI. The checked-in CRD files is what is used everywhere.

Copy link
Contributor

@JoelSpeed JoelSpeed left a comment

Choose a reason for hiding this comment

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

Looks good, I think you're right, I don't think this is checked by CI, @enxebre do you think we should make sure the generated files are checked in correctly at some point right?

I don't think we can add annotations to CRDs via the CRD generator so I think this should be fine for now. Long term it might be better to replace this with some sort of Kustomize script as that would be more robust, but I think that can wait

/lgtm

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

/retest

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@enxebre
Copy link
Member

enxebre commented Mar 5, 2020

We don't validate on CI atm, we should though. I just created OCPCLOUD-809 Jira ticket to track this.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

1 similar comment
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

2 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 782a702 into openshift:master Mar 5, 2020
@openshift-ci-robot
Copy link
Contributor

@csrwng: All pull requests linked via external trackers have merged. Bugzilla bug 1809333 has been moved to the MODIFIED state.

In response to this:

Bug 1809333: ROKS - remove machine related CRDs from cluster

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
Copy link
Contributor

@csrwng: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
ci/prow/e2e-azure-operator ae3ecf0 link /test e2e-azure-operator

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.

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.

@csrwng
Copy link
Contributor Author

csrwng commented Mar 6, 2020

/cherry-pick release-4.4

@openshift-cherrypick-robot

@csrwng: new pull request created: #506

In response to this:

/cherry-pick release-4.4

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.

@csrwng
Copy link
Contributor Author

csrwng commented Mar 17, 2020

/cherry-pick release4.3

@openshift-cherrypick-robot

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

In response to this:

/cherry-pick release4.3

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.

@csrwng
Copy link
Contributor Author

csrwng commented Mar 17, 2020

/cherry-pick release-4.3

@openshift-cherrypick-robot

@csrwng: new pull request created: #518

In response to this:

/cherry-pick release-4.3

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. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants