UPSTREAM: <carry>: openshift: Read machine additional printer columns from annotations/labels#55
Merged
openshift-merge-robot merged 1 commit intoopenshift:openshift-4.2-cluster-api-0.1.0from Aug 5, 2019
Conversation
openshift-ci-robot
added
the
size/S
4 tasks
Member
|
/approve |
|
[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 DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
Member
Author
|
/hold node and providerID bits are still missing |
openshift-ci-robot
added
the
do-not-merge/hold
… from annotations/labels Given we already support AWS, Azure and GCP instalations of OpenShift, reading values from machine provider config is no longer an option. Instead, let's read all needed values from machine annotations and labels. Each actuator will be then responsible for making sure every machine has all the annotations and labels that are needed to properly display additional machine columns set. Also, print provider ID and linked node only with '-o wide` option since they are secondary to displaying current state of a machine. $ oc get machines -n openshift-machine-api NAME STATE TYPE REGION ZONE AGE jchaloup-x8pdp-master-0 Running Standard_D4s_v3 centralus 3 44m jchaloup-x8pdp-master-1 Running Standard_D4s_v3 centralus 1 44m jchaloup-x8pdp-master-2 Running Standard_D4s_v3 centralus 2 44m jchaloup-x8pdp-worker-centralus1-b97mk Running Standard_D2s_v3 centralus 1 43m jchaloup-x8pdp-worker-centralus2-8tz8d Running Standard_D2s_v3 centralus 2 43m jchaloup-x8pdp-worker-centralus3-22zf5 Running Standard_D2s_v3 centralus 3 43m $ oc get machines -n openshift-machine-api -o wide NAME STATE TYPE REGION ZONE AGE NODE PROVIDERID jchaloup-x8pdp-master-0 Running Standard_D4s_v3 centralus 3 47m jchaloup-x8pdp-master-0 azure:///subscriptions/6648228a-736c-4a4e-9a14-92a7e5190f4a/resourceGroups/jchaloup-x8pdp-rg/providers/Microsoft.Compute/virtualMachines/jchaloup-x8pdp-master-0 jchaloup-x8pdp-master-1 Running Standard_D4s_v3 centralus 1 47m jchaloup-x8pdp-master-1 azure:///subscriptions/6648228a-736c-4a4e-9a14-92a7e5190f4a/resourceGroups/jchaloup-x8pdp-rg/providers/Microsoft.Compute/virtualMachines/jchaloup-x8pdp-master-1 jchaloup-x8pdp-master-2 Running Standard_D4s_v3 centralus 2 47m jchaloup-x8pdp-master-2 azure:///subscriptions/6648228a-736c-4a4e-9a14-92a7e5190f4a/resourceGroups/jchaloup-x8pdp-rg/providers/Microsoft.Compute/virtualMachines/jchaloup-x8pdp-master-2 jchaloup-x8pdp-worker-centralus1-b97mk Running Standard_D2s_v3 centralus 1 46m jchaloup-x8pdp-worker-centralus1-b97mk azure:///subscriptions/6648228a-736c-4a4e-9a14-92a7e5190f4a/resourceGroups/jchaloup-x8pdp-rg/providers/Microsoft.Compute/virtualMachines/jchaloup-x8pdp-worker-centralus1-b97mk jchaloup-x8pdp-worker-centralus2-8tz8d Running Standard_D2s_v3 centralus 2 46m jchaloup-x8pdp-worker-centralus2-8tz8d azure:///subscriptions/6648228a-736c-4a4e-9a14-92a7e5190f4a/resourceGroups/jchaloup-x8pdp-rg/providers/Microsoft.Compute/virtualMachines/jchaloup-x8pdp-worker-centralus2-8tz8d jchaloup-x8pdp-worker-centralus3-22zf5 Running Standard_D2s_v3 centralus 3 46m jchaloup-x8pdp-worker-centralus3-22zf5 azure:///subscriptions/6648228a-736c-4a4e-9a14-92a7e5190f4a/resourceGroups/jchaloup-x8pdp-rg/providers/Microsoft.Compute/virtualMachines/jchaloup-x8pdp-worker-centralus3-22zf5
ingvagabund
force-pushed
the
update-crd-additionalPrinterColumns
branch
from
e2e211b to
fbb0a42
Compare
openshift-ci-robot
added
size/M
ingvagabund
changed the title
Member
Author
|
/hold cancel |
openshift-ci-robot
removed
the
do-not-merge/hold
|
/lgtm |
openshift-merge-robot
merged commit f8de78a
into
openshift:openshift-4.2-cluster-api-0.1.0
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Given we already support AWS, Azure and GCP instalations of OpenShift,
reading values from machine provider config is no longer an option.
Instead, let's read all needed values from machine annotations and labels.
Each actuator will be then responsible for making sure every machine
has all the annotations and labels that are needed to properly display
additional machine columns set.
Also, print provider ID and linked node only with '-o wide` option since they are secondary to displaying current state of a machine.
What this PR does / why we need it:
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Fixes #
Special notes for your reviewer:
Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.
Release note: