✨clusterctl: fix labels #2152
Merged
✨clusterctl: fix labels #2152
Conversation
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
k8s-ci-robot
added
area/clusterctl
|
/hold |
k8s-ci-robot
added
the
do-not-merge/hold
62 tasks
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: fabriziopandini, vincepri 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 |
k8s-ci-robot
added
the
approved
|
2070 is in. unhold? |
|
yep /hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
wfernandes
reviewed
Jan 27, 2020
|
|
||
| labels := o.GetLabels() | ||
| if labels == nil { | ||
| labels = map[string]string{} |
There was a problem hiding this comment.
Suggested change
| labels = map[string]string{} | |
| labels = make(map[string]string) |
| @@ -227,7 +227,7 @@ for the inventory of the providers currently installed in the management cluster | |||
|
|
|||
| <h1>Warning</h1> | |||
|
|
|||
| The `clusterctl.cluster.x-k8s.io` labels and the `Provider` objects MUST NOT altered. | |||
| The `clusterctl.cluster.x-k8s.io` labels, the `cluster.x-k8s.io/provider` labels and the `Provider` objects MUST NOT altered. | |||
There was a problem hiding this comment.
nit:
Suggested change
| The `clusterctl.cluster.x-k8s.io` labels, the `cluster.x-k8s.io/provider` labels and the `Provider` objects MUST NOT altered. | |
| The `clusterctl.cluster.x-k8s.io` labels, the `cluster.x-k8s.io/provider` labels and the `Provider` objects MUST NOT be altered. |
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.
What this PR does / why we need it:
#2070 introduces a new Cluster API label
cluster.x-k8s.io/providerThis PR adapt clusterctl to use the above label, and drops the
clusterctl.cluster.x-k8s.io/providerlabel that now is a duplicate of the Cluster API one.Additionally, a new clusterctl label
clusterctl.cluster.x-k8s.io/coreis added and applied to the core component installed by clusterctl, the inventory CRDs and the cert-manager, so it will be possible to implement proper lifecycle for those components as wellWhich issue(s) this PR fixes:
rif #1729
/area clusterctl
/assign @ncdc
/assign @vincepri