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

HOSTEDCP-1232: Add clusterName label to CAPI kubeconfig secret #3087

Merged
merged 1 commit into from Oct 10, 2023

Conversation

muraee
Copy link
Contributor

@muraee muraee commented Oct 10, 2023

What this PR does / why we need it:

Starting from v1.5, CAPI uses a cached client to retrieve the kubeconfig secret. However, only secrets with the clusterName label cluster.x-k8s.io/cluster-name are cached, see:
https://github.com/kubernetes-sigs/cluster-api/pull/8940/files#diff-8bdee7925f4d1adc50383754391472636156a2a857a7c76290f6073c8d83f5cdR216

This PR ensures we can consume CAPI v1.5+, by adding the required label to the kubeconfig secret generated for CAPI.

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #HOSTEDCP-1232

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 10, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 10, 2023

@muraee: This pull request references HOSTEDCP-1232 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.15.0" version, but no target version was set.

In response to this:

What this PR does / why we need it:

Starting from v1.5, CAPI uses a cached client to retrieve the kubeconfig secret. However, only secrets with the clusterName label cluster.x-k8s.io/cluster-name are cached, see:
https://github.com/kubernetes-sigs/cluster-api/pull/8940/files#diff-8bdee7925f4d1adc50383754391472636156a2a857a7c76290f6073c8d83f5cdR216

This PR ensures we can consume CAPI v1.5+, by adding the required label to the kubeconfig secret generated for CAPI.

Which issue(s) this PR fixes (optional, use fixes #<issue_number>(, fixes #<issue_number>, ...) format, where issue_number might be a GitHub issue, or a Jira story:
Fixes #HOSTEDCP-1232

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

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 openshift-ci bot added area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release and removed do-not-merge/needs-area labels Oct 10, 2023
Copy link
Member

@damdo damdo left a comment

Choose a reason for hiding this comment

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

/lgtm
Thanks

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 10, 2023
@muraee
Copy link
Contributor Author

muraee commented Oct 10, 2023

/test e2e-aws

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 10, 2023
@enxebre
Copy link
Member

enxebre commented Oct 10, 2023

/approve
/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 10, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 10, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: enxebre, muraee

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 10, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 10, 2023

@muraee: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-ci openshift-ci bot merged commit 111b136 into openshift:main Oct 10, 2023
11 checks passed
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. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. 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

4 participants