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

salt: Add some default topology labels on nodes #3897

Merged
merged 2 commits into from
Oct 11, 2022
Merged

salt: Add some default topology labels on nodes #3897

merged 2 commits into from
Oct 11, 2022

Conversation

TeddyAndrieux
Copy link
Collaborator

NOTE: We revert changes from #3889 as we will handle the default label setting
directly in salt so that it's transparent for the user, they do not need
to explicitly set those labels from the node object

@TeddyAndrieux
Revert "docs,salt,ui: Add some defaults topology labels on nodes"
d5fd2db 
This reverts commit 04e37b2.

We revert this commit has we will handle the default labels setting
directly in salt so that it's transparent for the user, they do not need
to explicitly set those labels from the node object
@TeddyAndrieux TeddyAndrieux requested a review from a team as a code owner October 11, 2022 08:45
@bert-e
Copy link
Contributor

bert-e commented Oct 11, 2022

Hello teddyandrieux,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Oct 11, 2022

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@TeddyAndrieux TeddyAndrieux force-pushed the improvement/set-default-topology-labels-automatically branch from 1057b22 to 9bfae40 Compare October 11, 2022 08:48
gdemonet
gdemonet reviewed Oct 11, 2022
View reviewed changes
Copy link
Contributor

@gdemonet gdemonet left a comment

Choose a reason for hiding this comment

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

(sorry, had to nitpick the grammar 😬 so, "exists" is only used for singular third person, otherwise there is no trailing s 😉)

WDYT about making the node_labels_exist method generic? Since we just offload the logic to metalk8s_kubernetes.update_object, we can pass the apiVersion/kind through, and all K8s objects (should) have metadata.labels.

salt/_states/metalk8s_kubernetes.py Outdated Show resolved Hide resolved
salt/_states/metalk8s_kubernetes.py Outdated Show resolved Hide resolved
salt/_states/metalk8s_kubernetes.py Outdated Show resolved Hide resolved
salt/_states/metalk8s_kubernetes.py Outdated Show resolved Hide resolved
salt/_states/metalk8s_kubernetes.py Outdated Show resolved Hide resolved
salt/_states/metalk8s_kubernetes.py Outdated Show resolved Hide resolved
salt/metalk8s/kubernetes/mark-control-plane/deployed.sls Outdated Show resolved Hide resolved
salt/metalk8s/kubernetes/mark-control-plane/deployed.sls Outdated Show resolved Hide resolved
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/set-default-topology-labels-automatically branch from 9bfae40 to cb1ef05 Compare October 11, 2022 09:00
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/set-default-topology-labels-automatically branch from cb1ef05 to 64c6a92 Compare October 11, 2022 09:01
@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Oct 11, 2022

Build failed

The build for commit did not succeed in branch improvement/set-default-topology-labels-automatically.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 11, 2022

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/124.0

The following branches will NOT be impacted:

  • development/123.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Oct 11, 2022

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/124.0

The following branches have NOT changed:

  • development/123.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 64c6a92 into development/124.0 Oct 11, 2022
@bert-e bert-e deleted the improvement/set-default-topology-labels-automatically branch October 11, 2022 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gdemonet gdemonet gdemonet approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TeddyAndrieux @bert-e @gdemonet