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.

Sign up for GitHub

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

Jump to bottom

WIP: Add support for OpenShift console on native Kubernetes #2996

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

WIP: Add support for OpenShift console on native Kubernetes #2996

wants to merge 1 commit into from
+87 −51

Conversation

AaronDewes
Copy link
Contributor

What this PR does / why we need it:

OpenShift's console can be run on standard Kubernetes. This adds support for the console integration in such scenarios.

Reviewer Checklist

Reviewers are supposed to review the PR for every aspect below one by one. To check an item means the PR is either "OK" or "Not Applicable" in terms of that item. All items are supposed to be checked before merging a PR.

  • PR Message
  • Commit Messages
  • How to test
  • Unit Tests
  • Functional Tests
  • User Documentation
  • Developer Documentation
  • Upgrade Scenario
  • Uninstallation Scenario
  • Backward Compatibility
  • Troubleshooting Friendly

Jira Ticket:

NONE

Release note:

Integrate with the OpenShift console for regular Kubernetes systems.

@kubevirt-bot kubevirt-bot added dco-signoff: no Indicates the PR's author has not DCO signed all their commits. release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jun 11, 2024
@kubevirt-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign assafad for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@kubevirt-bot
Copy link
Contributor

Hi @AaronDewes. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

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.

@openshift-ci openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 11, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jun 11, 2024

Hi @AaronDewes. Thanks for your PR.

I'm waiting for a kubevirt member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@AaronDewes
WIP: Add support for OpenShift console on native Kubernetes
63bebed 
Signed-off-by: Aaron Dewes <aaron.dewes@protonmail.com>
@kubevirt-bot kubevirt-bot added dco-signoff: yes Indicates the PR's author has DCO signed all their commits. and removed dco-signoff: no Indicates the PR's author has not DCO signed all their commits. labels Jun 14, 2024
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Jun 14, 2024

Quality Gate Passed Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

@kubevirt-bot kubevirt-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 14, 2024
@kubevirt-bot
Copy link
Contributor

PR needs rebase.

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.

nunnatsa
nunnatsa reviewed Jun 16, 2024
View reviewed changes
Copy link
Collaborator

@nunnatsa nunnatsa left a comment

Choose a reason for hiding this comment

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

Thanks for the PR @AaronDewes. It makes a lot of sense to me.

Added a few inline comments.

pkg/util/cluster.go
c.logger.Info("Cluster type = kubernetes")
c.runningWithOpenshiftConsole = isCRDExists(ctx, cl, OpenShiftConsolePluginCRDName)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is that enough? Shouldn't we also check that the CR also exists?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The OpenShiftConsolePlugin custom resource allows us to register a console plugin. I don't think we need to check if any CR exists as long as the CRD exists.

pkg/util/cluster.go Show resolved Hide resolved
pkg/util/cluster.go
@@ -43,7 +44,8 @@ type ClusterInfo interface {
}

type ClusterInfoImp struct {
runningInOpenshift bool
runningInNativeOpenshift bool
Copy link
Collaborator

Choose a reason for hiding this comment

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

I wouldn't change the name of this field. We want to know if HCO is running in an openshift cluster or not, and this the old name is accurate. Also, I don't know what "native openshift" means.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes, I'll revert the name change 👍

pkg/util/cluster.go
@@ -43,7 +44,8 @@ type ClusterInfo interface {
}

type ClusterInfoImp struct {
runningInOpenshift bool
runningInNativeOpenshift bool
runningWithOpenshiftConsole bool
Copy link
Collaborator

Choose a reason for hiding this comment

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

HCO and the openshift console are not actually related. so it's not like HCO is running with the console. What do you think about something like openshiftConsoleInstalled?

pkg/util/cluster.go
return c.runningInNativeOpenshift
}

func (c *ClusterInfoImp) HasOpenshiftConsole() bool {
Copy link
Collaborator

Choose a reason for hiding this comment

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

same: How do you feel about something like IsOpenshifConsoleInstalled()?

controllers/operands/operandHandler.go
@@ -59,16 +59,19 @@ func NewOperandHandler(client client.Client, scheme *runtime.Scheme, ci hcoutil.
newAAQHandler(client, scheme),
}

if ci.IsOpenshift() {
if ci.HasOpenshiftConsole() {
Copy link
Collaborator

Choose a reason for hiding this comment

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

not sure about this whole logic. @tiraboschi - WDYT?

Copy link
Member

Choose a reason for hiding this comment

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

I don't think that the SSP operator (line 64) will work on vanially k8s just because the Openshift Console has been deployed there.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tiraboschi tiraboschi tiraboschi left review comments

@nunnatsa nunnatsa nunnatsa left review comments

@avlitman avlitman Awaiting requested review from avlitman

@machadovilaca machadovilaca Awaiting requested review from machadovilaca

Assignees
No one assigned
Labels
dco-signoff: yes Indicates the PR's author has DCO signed all their commits. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@AaronDewes @kubevirt-bot @tiraboschi @nunnatsa