Fix Cluster labels in OOT cloud provider templates #2462
Conversation
Co-Authored-By: Mark Rossetti <[email protected]>
k8s-ci-robot
added
release-note
| @@ -2,8 +2,7 @@ apiVersion: cluster.x-k8s.io/v1beta1 | |||
| kind: Cluster | |||
| metadata: | |||
| labels: | |||
| ccm: external | |||
| cni: calico | |||
| cni: ${CLUSTER_NAME}-calico | |||
There was a problem hiding this comment.
this is what fixes #2341
There was a problem hiding this comment.
So the path above was overriding these values?
I search the for the label cmm: external and don't see it used anywhere. Are we sure the cloud-provider test code doesn't use it?
There was a problem hiding this comment.
Usage was removed in #2209. cc @jackfrancis to confirm.
So the path above was overriding these values?
yes, the external cloud provider patch was modifying the labels and overwriting the cni one.
|
/assign @jsturtevant @jackfrancis |
|
/test ? |
|
@marosset: The following commands are available to trigger required jobs:
The following commands are available to trigger optional jobs:
Use
In response to this:
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. |
|
/test pull-cluster-api-provider-azure-windows-containerd-upstream-with-ci-artifacts |
|
I don't know that we have a test that uses the out of tree template + CI version specifically outside of https://testgrid.k8s.io/provider-azure-cloud-provider-azure#cloud-provider-azure-conformance-windows-capz, will run a local validation |
|
Not sure why cloud-provider failed to install (maybe it was a transient failure? @lzhecheng @jackfrancis) but in any case calico install was successful: |
|
New flake, CSI driver deployment failed: /retest |
Yes, it seems to be transient. |
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jackfrancis 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
|
/cherrypick release-1.3 |
|
@lzhecheng: new pull request created: #2464 In response to this:
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. |
|
/cherrypick release-1.4 this merged after we cut the tag for v1.4.0 |
|
/cherry-pick release-1.4 |
|
@CecileRobertMichon: new pull request created: #2465 In response to this:
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. |
|
@CecileRobertMichon: new pull request could not be created: failed to create pull request against kubernetes-sigs/cluster-api-provider-azure#release-1.4 from head k8s-infra-cherrypick-robot:cherry-pick-2462-to-release-1.4: status code 422 not one of [201], body: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"A pull request already exists for k8s-infra-cherrypick-robot:cherry-pick-2462-to-release-1.4."}],"documentation_url":"https://docs.github.com/rest/reference/pulls#create-a-pull-request"} In response to this:
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. |
Co-Authored-By: Mark Rossetti [email protected]
What type of PR is this?
/kind failing-test
What this PR does / why we need it: The ClusterResourceSets for external cloud-provider (CCM) were removed as part of #2209. This PR removes the leftover cluster labels that are no longer needed to match Clusters. It also fixes a bug where the calico CNI label was being overwritten by the external cloud provider patch, causing Calico not to get installed, on the external cloud provider CI version template.
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 #2341
Special notes for your reviewer:
Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.
TODOs:
Release note: