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 1886168: Hide Terminal tab from the NodeDetailsPage if Windows on the Node #6876

Merged
merged 1 commit into from Oct 14, 2020

Conversation

jhadvig
Copy link
Member

@jhadvig jhadvig commented Oct 8, 2020

/assign @spadgett

@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. label Oct 8, 2020
@openshift-ci-robot
Copy link
Contributor

@jhadvig: This pull request references Bugzilla bug 1886168, 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.7.0) matches configured target release for branch (4.7.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1886168: Hide Terminal tab from the NodeDetailsPage if Windows on the Node

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. component/core Related to console core functionality labels Oct 8, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 8, 2020
<PodsPage showTitle={false} fieldSelector={`spec.nodeName=${obj.metadata.name}`} />
)),
events(ResourceEventStream),
node?.metadata?.labels?.['node.openshift.io/os_id'] !== 'Windows'
Copy link
Member

Choose a reason for hiding this comment

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

Hi, @openshift/openshift-team-windows-containers is this the best label to check?

Copy link
Member Author

Choose a reason for hiding this comment

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

@spadgett it was recommended in the BZ

Choose a reason for hiding this comment

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

Correct...
We have node.openshift.io/os_id=Windows label attached to all the windows nodes that have joined the cluster

Copy link

Choose a reason for hiding this comment

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

Hi @jhadvig @spadgett sorry to offer conflicting information but other components have been using corev1.LabelOSStable to differentiate between Linux and Windows nodes. I think it is better to use this upstream label, rather than the OpenShift label.

Copy link

@sebsoto sebsoto Oct 12, 2020

Choose a reason for hiding this comment

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

The expected value of LabelOSStable for Windows nodes is windows

Copy link
Member Author

Choose a reason for hiding this comment

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

@sebsoto @PratikMahajan would it be safe to check both labels?

Copy link

@sebsoto sebsoto Oct 13, 2020

Choose a reason for hiding this comment

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

The corev1 label should cover all cases as its applied by the kubelet, but I dont see any current harm by checking for either label with an or

);
const pagesFor = React.useCallback(
(node: NodeKind) =>
_.compact([
Copy link
Member

@spadgett spadgett Oct 8, 2020

Choose a reason for hiding this comment

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

Instead of _.compact, we usually use this idiom:

[
  foo,
  bar,
  ...(showBaz ? [baz] : []),
]

@jhadvig
Copy link
Member Author

jhadvig commented Oct 8, 2020

@spadgett comment addressed :)

@jhadvig
Copy link
Member Author

jhadvig commented Oct 14, 2020

@sebsoto @PratikMahajan added check for both labels per our conversation
@spadgett PTAL

@jhadvig
Copy link
Member Author

jhadvig commented Oct 14, 2020

/test e2e-gcp-console

Copy link
Member

@spadgett spadgett 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-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 14, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jhadvig, spadgett

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-merge-robot openshift-merge-robot merged commit 3c36f93 into openshift:master Oct 14, 2020
@openshift-ci-robot
Copy link
Contributor

@jhadvig: All pull requests linked via external trackers have merged:

Bugzilla bug 1886168 has been moved to the MODIFIED state.

In response to this:

Bug 1886168: Hide Terminal tab from the NodeDetailsPage if Windows on the Node

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/severity-high Referenced Bugzilla bug's severity is high for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/core Related to console core functionality 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

6 participants