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

Add support for node taints and labels for tinkerbell provider #2480

Merged
merged 1 commit into from
Jun 23, 2022

Conversation

abhinavmpandey08
Copy link
Member

@abhinavmpandey08 abhinavmpandey08 commented Jun 21, 2022

Description of changes:
Add support for node taints and node labels for tinkerbell provider.
This feature already exists for the other providers. Here's some links from vsphere provider for reference

Testing (if applicable):
Created ubuntu and bottlerocket nodes with different control plane and worker labels and verified they were added properly

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

@eks-distro-bot eks-distro-bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Jun 21, 2022
@codecov
Copy link

codecov bot commented Jun 21, 2022

Codecov Report

Merging #2480 (b2612ae) into main (35e2daa) will increase coverage by 0.06%.
The diff coverage is 100.00%.

❗ Current head b2612ae differs from pull request most recent head 773e9a3. Consider uploading reports for the commit 773e9a3 to get more accurate results

@@            Coverage Diff             @@
##             main    #2480      +/-   ##
==========================================
+ Coverage   57.17%   57.23%   +0.06%     
==========================================
  Files         310      310              
  Lines       25334    25320      -14     
==========================================
+ Hits        14484    14493       +9     
+ Misses       9524     9505      -19     
+ Partials     1326     1322       -4     
Impacted Files Coverage Δ
pkg/providers/tinkerbell/template.go 30.79% <100.00%> (+1.80%) ⬆️
pkg/providers/tinkerbell/stack/stack.go 83.14% <0.00%> (-0.19%) ⬇️
pkg/curatedpackages/reader.go 0.00% <0.00%> (ø)
pkg/dependencies/factory.go 54.92% <0.00%> (+0.34%) ⬆️
pkg/providers/tinkerbell/tinkerbell.go 34.69% <0.00%> (+2.66%) ⬆️
...roviders/tinkerbell/hardware/catalogue_hardware.go 97.29% <0.00%> (+4.98%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 35e2daa...773e9a3. Read the comment docs.

@abhinavmpandey08 abhinavmpandey08 force-pushed the tinkerbell-labels-support branch from 85d5c05 to 773e9a3 Compare June 22, 2022 21:22
@ptrivedi
Copy link
Contributor

/approve

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ptrivedi

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

@ptrivedi
Copy link
Contributor

/lgtm

@abhinavmpandey08
Copy link
Member Author

/cherry-pick release-0.10

@eks-distro-pr-bot
Copy link
Contributor

@abhinavmpandey08: once the present PR merges, I will cherry-pick it on top of release-0.10 in a new PR and assign it to you.

In response to this:

/cherry-pick release-0.10

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.

@abhinavmpandey08
Copy link
Member Author

/test eks-anywhere-e2e-presubmit

@abhinavmpandey08
Copy link
Member Author

/retest

@eks-distro-bot eks-distro-bot merged commit f8ae200 into aws:main Jun 23, 2022
@eks-distro-pr-bot
Copy link
Contributor

@abhinavmpandey08: #2480 failed to apply on top of branch "release-0.10":

Applying: Add support for node taints and labels for tinkerbell provider
.git/rebase-apply/patch:769: trailing whitespace.
            matchLabels: 
.git/rebase-apply/patch:868: trailing whitespace.
        
.git/rebase-apply/patch:1041: trailing whitespace.
            matchLabels: 
.git/rebase-apply/patch:1140: trailing whitespace.
        
.git/rebase-apply/patch:1238: trailing whitespace.
            matchLabels: 
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	pkg/providers/tinkerbell/config/template-cp.yaml
M	pkg/providers/tinkerbell/template.go
M	pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_external_etcd.yaml
A	pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_full_oidc.yaml
A	pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_oidc.yaml
M	pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_stacked_etcd.yaml
M	pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_missing_ssh_keys.yaml
M	pkg/providers/tinkerbell/tinkerbell_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/providers/tinkerbell/tinkerbell_test.go
Auto-merging pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_missing_ssh_keys.yaml
Auto-merging pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_stacked_etcd.yaml
CONFLICT (modify/delete): pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_oidc.yaml deleted in HEAD and modified in Add support for node taints and labels for tinkerbell provider. Version Add support for node taints and labels for tinkerbell provider of pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_minimal_oidc.yaml left in tree.
CONFLICT (modify/delete): pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_full_oidc.yaml deleted in HEAD and modified in Add support for node taints and labels for tinkerbell provider. Version Add support for node taints and labels for tinkerbell provider of pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_full_oidc.yaml left in tree.
Auto-merging pkg/providers/tinkerbell/testdata/expected_results_cluster_tinkerbell_cp_external_etcd.yaml
Auto-merging pkg/providers/tinkerbell/template.go
CONFLICT (content): Merge conflict in pkg/providers/tinkerbell/template.go
Auto-merging pkg/providers/tinkerbell/config/template-cp.yaml
CONFLICT (content): Merge conflict in pkg/providers/tinkerbell/config/template-cp.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add support for node taints and labels for tinkerbell provider
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.10

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.

@abhinavmpandey08 abhinavmpandey08 deleted the tinkerbell-labels-support branch June 23, 2022 14:03
@abhinavmpandey08
Copy link
Member Author

/cherry-pick release-0.10

@eks-distro-pr-bot
Copy link
Contributor

@abhinavmpandey08: new pull request created: #2527

In response to this:

/cherry-pick release-0.10

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants