Set additional machine annotations/labels to get pretty machine output #242
Conversation
This file contains 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
openshift-ci-robot
added
the
size/L
4 tasks
Set common machine fields so when a machine provisioned in AWS is listed through `oc get machines`
all additional printer colums are properly populated. E.g. region, zone, instance type.
During the provisioning stage:
NAME STATE TYPE REGION ZONE AGE
master-machine running m4.xlarge us-east-1 us-east-1a 38s
After an instance got provisioned:
NAME STATE TYPE REGION ZONE AGE
master-machine running m4.xlarge us-east-1 us-east-1a 40s
After a machine is requsted to be deleted:
NAME STATE TYPE REGION ZONE AGE
master-machine shutting-down m4.xlarge us-east-1 us-east-1a 24m
In order to properly display values from all the annotations,
one needs to update the machine CRD to have:
spec:
additionalPrinterColumns:
- JSONPath: .metadata.annotations['machine\.openshift\.io/instance-state']
description: State of the AWS instance
name: State
type: string
- JSONPath: .metadata.labels['machine\.openshift\.io/instance-type']
description: Type of instance
name: Type
type: string
- JSONPath: .metadata.labels['machine\.openshift\.io/region']
description: Region associated with machine
name: Region
type: string
- JSONPath: .metadata.labels['machine\.openshift.\.io/zone']
description: Zone associated with machine
name: Zone
type: string
Be aware of all the dots being escaped.
$ oc get machines -n openshift-machine-api
NAME STATE TYPE REGION ZONE AGE
jchaloup-kndjk-master-0 running m4.xlarge us-east-1 us-east-1a 16m
jchaloup-kndjk-master-1 running m4.xlarge us-east-1 us-east-1b 16m
jchaloup-kndjk-master-2 running m4.xlarge us-east-1 us-east-1c 16m
jchaloup-kndjk-worker-us-east-1a-rz7fc running m4.large us-east-1 us-east-1a 15m
jchaloup-kndjk-worker-us-east-1b-skcdp running m4.large us-east-1 us-east-1b 15m
jchaloup-kndjk-worker-us-east-1c-x949n running m4.large us-east-1 us-east-1c 15m
$ oc get machines -n openshift-machine-api -o wide
NAME STATE TYPE REGION ZONE AGE NODE PROVIDERID
jchaloup-kndjk-master-0 running m4.xlarge us-east-1 us-east-1a 16m ip-10-0-137-186.ec2.internal
jchaloup-kndjk-master-1 running m4.xlarge us-east-1 us-east-1b 16m ip-10-0-144-222.ec2.internal
jchaloup-kndjk-master-2 running m4.xlarge us-east-1 us-east-1c 16m ip-10-0-164-95.ec2.internal
jchaloup-kndjk-worker-us-east-1a-rz7fc running m4.large us-east-1 us-east-1a 15m ip-10-0-131-249.ec2.internal aws:///us-east-1a/i-0d61da03d03bc6c51
jchaloup-kndjk-worker-us-east-1b-skcdp running m4.large us-east-1 us-east-1b 15m ip-10-0-149-207.ec2.internal aws:///us-east-1b/i-0dbe5a1764fa55848
jchaloup-kndjk-worker-us-east-1c-x949n running m4.large us-east-1 us-east-1c 15m ip-10-0-160-10.ec2.internal aws:///us-east-1c/i-09380f6badaad266e
michaelgugino
suggested changes
Aug 5, 2019
| return nil, fmt.Errorf("error decoding MachineProviderConfig: %v", err) | ||
| } | ||
|
|
||
| machineCopy.Labels[machinecontroller.MachineRegionLabelName] = machineProviderConfig.Placement.Region |
There was a problem hiding this comment.
These labels should live in the pkg/api section of cluster-api.
michaelgugino
suggested changes
Aug 5, 2019
We already have that info, no need to add anything at the actuators level https://github.com/openshift/machine-api-operator/pull/360/files#diff-ac21ceeaaa254b32670bdb3ced62278cR30 |
|
/retest |
In case a user switches between contexts, it's not so clear. Also, the point is to have that information right way without any additional command run. |
|
/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
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
|
/lgtm |
|
/test e2e-aws-operator |
wking
added a commit
to wking/cluster-api-provider-aws
that referenced
this pull request
Nov 20, 2019
… comment The updateProviderID comment was probably a copy/paste error when setMachineCloudProviderSpecifics landed in 716083f (Set additional machine annotations/labels to get pretty machine output, 2019-07-23, openshift#242). I haven't read through the function carefully enough to be able to propose a comment that adds much beyond the function name, which is fairly clear on its own. But I know the updateProviderID comment is not a good fit ;).
enxebre
pushed a commit
to enxebre/cluster-api-provider-aws-2
that referenced
this pull request
Feb 20, 2020
… comment The updateProviderID comment was probably a copy/paste error when setMachineCloudProviderSpecifics landed in 716083f (Set additional machine annotations/labels to get pretty machine output, 2019-07-23, openshift#242). I haven't read through the function carefully enough to be able to propose a comment that adds much beyond the function name, which is fairly clear on its own. But I know the updateProviderID comment is not a good fit ;).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Set common machine fields so when a machine provisioned in AWS is listed through
oc get machinesall additional printer colums are properly populated. E.g. region, zone, instance type.
During the provisioning stage:
After an instance got provisioned:
After a machine is requsted to be deleted:
In order to properly display values from all the annotations,
one needs to update the machine CRD to have:
Be aware of all the dots being escaped.