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.

Sign up for GitHub

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

Jump to bottom

Remove .metadata.clusterName usage #3322

Merged
merged 1 commit into from
Mar 17, 2022
Merged

Remove .metadata.clusterName usage #3322

merged 1 commit into from
Mar 17, 2022

Conversation

pydctw
Copy link
Contributor

@pydctw pydctw commented Mar 16, 2022

What type of PR is this?
/kind bug

What this PR does / why we need it:
k8s upstream plans to drop ObjectMeta.ClusterName field as it has always been force cleared by the API server.
See kubernetes/kubernetes#108717.

Searched CAPA codebase and there is only one occasion where ObjectMeta.ClusterName is used.

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 #3321

Special notes for your reviewer:

Checklist:

  • squashed commits
  • includes documentation
  • adds unit tests
  • adds or updates e2e tests

Release note:

Remove .metadata.clusterName usage

Remove .metadata.clusterName usage
3c03d59 
Upstream plans to drop ObjectMeta.ClusterName field as it has always been force cleared by the API server.
See kubernetes/kubernetes#108717.
@pydctw
Copy link
Contributor Author

pydctw commented Mar 16, 2022 •
edited
Loading

/test?

@pydctw
Copy link
Contributor Author

pydctw commented Mar 16, 2022

/test pull-cluster-api-provider-aws-e2e-eks

sedefsavas
sedefsavas reviewed Mar 16, 2022
View reviewed changes
pkg/cloud/services/eks/addons.go
@@ -196,7 +196,7 @@ func (s *Service) translateAPIToAddon(addons []ekscontrolplanev1.Addon) []*eksad
convertedAddon := &eksaddons.EKSAddon{
Name: &addon.Name,
Version: &addon.Version,
Tags: ngTags(s.scope.Cluster.ClusterName, s.scope.AdditionalTags()),
Tags: ngTags(s.scope.Cluster.Name, s.scope.AdditionalTags()),
Copy link
Contributor

Choose a reason for hiding this comment

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

I feel like this name should be the Kubernetes cluster name instead of CAPI cluster name, since they are different in EKS.
Not sure though.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You mean EKS cluster name? I don't know why the original code is using CAPI cluster name but that is a great point.
Let's ask @richardcase.

Copy link
Member

Choose a reason for hiding this comment

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

I'd be tempted to use s.scope.Cluster.Name and not the eks cluster name. An addon is always a child of a EKS cluster (and so you have the name).

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. needs-priority needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Mar 16, 2022
@k8s-ci-robot
Copy link
Contributor

@pydctw: This issue is currently awaiting triage.

If CAPA/CAPI contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Mar 16, 2022
@k8s-ci-robot
Copy link
Contributor

@pydctw: The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-aws-build
  • /test pull-cluster-api-provider-aws-test
  • /test pull-cluster-api-provider-aws-verify

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-aws-apidiff-main
  • /test pull-cluster-api-provider-aws-e2e
  • /test pull-cluster-api-provider-aws-e2e-blocking
  • /test pull-cluster-api-provider-aws-e2e-conformance
  • /test pull-cluster-api-provider-aws-e2e-conformance-with-ci-artifacts
  • /test pull-cluster-api-provider-aws-e2e-eks

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-aws-apidiff-main
  • pull-cluster-api-provider-aws-build
  • pull-cluster-api-provider-aws-test
  • pull-cluster-api-provider-aws-verify

In response to this:

/test?

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.

@pydctw
Copy link
Contributor Author

pydctw commented Mar 16, 2022

Bad CI day
/retest

@Ankitasw
Copy link
Member

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 17, 2022
@richardcase
Copy link
Member

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: richardcase

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 17, 2022
@k8s-ci-robot k8s-ci-robot merged commit 5d4cd12 into kubernetes-sigs:main Mar 17, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.x milestone Mar 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sedefsavas sedefsavas sedefsavas left review comments

@richardcase richardcase richardcase left review comments

@Ankitasw Ankitasw Awaiting requested review from Ankitasw

@dlipovetsky dlipovetsky Awaiting requested review from dlipovetsky

Assignees

@Ankitasw Ankitasw

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

CAPA should not use ObjectMeta.ClusterName
5 participants
@pydctw @k8s-ci-robot @Ankitasw @richardcase @sedefsavas