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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃尡 Set MachineDeployment selector in managed clusters #5492

Conversation

fabriziopandini
Copy link
Member

@fabriziopandini fabriziopandini commented Oct 25, 2021

What this PR does / why we need it:
As of today when we are creating MachineDeployments in managed cluster we are not setting spec.selector field, and thus it gets initialised by web hooks to something like

  selector:
    matchLabels:
      cluster.x-k8s.io/cluster-name: my-cluster1
      cluster.x-k8s.io/deployment-name: my-cluster1-md1-v8hsl

However, given that selector labels are enforced in spec.template.metadata where we are already adding topology specific labels, so we end up with

  template:
    metadata:
      labels:
        cluster.x-k8s.io/cluster-name: my-cluster1
        cluster.x-k8s.io/deployment-name: my-cluster1-md1-v8hsl
        topology.cluster.x-k8s.io/deployment-name: md1
        topology.cluster.x-k8s.io/owned: ""

And the co-existance of both cluster.x-k8s.io/deployment-name and topology.cluster.x-k8s.io/deployment-name might be confusing at first sight (both at MD level and also on MS and Machines down the chain).

This PR is proposing a change in how we generate the generated cluster so the resulting machine deployment object will be:

 selector:
    matchLabels:
      cluster.x-k8s.io/cluster-name: my-cluster1
      topology.cluster.x-k8s.io/deployment-name: md1
      topology.cluster.x-k8s.io/owned: ""
  template:
    metadata:
      labels:
        cluster.x-k8s.io/cluster-name: my-cluster1
        topology.cluster.x-k8s.io/deployment-name: md1
        topology.cluster.x-k8s.io/owned: ""

With a simpler and cleaner label set (both at MD level and also on MS and Machines down the chain).

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 25, 2021
@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 25, 2021
Copy link
Member

@vincepri vincepri left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 25, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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 /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 Oct 25, 2021
@k8s-ci-robot k8s-ci-robot merged commit 8af974e into kubernetes-sigs:main Oct 25, 2021
@k8s-ci-robot k8s-ci-robot added this to the v0.4 milestone Oct 25, 2021
@fabriziopandini fabriziopandini deleted the set-md-selector-in-managed-clusters branch October 27, 2021 09:10
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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants