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

Fix etcd-encryption for bottlerocket #6874

Merged
merged 2 commits into from
Oct 23, 2023

Conversation

abhinavmpandey08
Copy link
Member

@abhinavmpandey08 abhinavmpandey08 commented Oct 23, 2023

Description of changes:
Update the path for the encryption config to be compatible with Bottlerocket and add an E2E test for validation]

Also added blocks to restrict etcd encryption to only the supported providers

Testing (if applicable):
Ran the E2E test and verified the changes

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/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 23, 2023
@codecov
Copy link

codecov bot commented Oct 23, 2023

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Comparison is base (58a6ca5) 72.01% compared to head (bede82e) 72.01%.
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6874      +/-   ##
==========================================
- Coverage   72.01%   72.01%   -0.01%     
==========================================
  Files         532      532              
  Lines       41644    41650       +6     
==========================================
+ Hits        29991    29994       +3     
- Misses       9980     9983       +3     
  Partials     1673     1673              
Files Coverage Δ
pkg/api/v1alpha1/cluster_webhook.go 92.85% <100.00%> (+0.04%) ⬆️
cmd/eksctl-anywhere/cmd/upgradecluster.go 7.05% <0.00%> (-0.13%) ⬇️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@eks-distro-bot eks-distro-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 23, 2023
@abhay-krishna
Copy link
Member

/lgtm
/approve
/retest

@eks-distro-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhay-krishna

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

@abhinavmpandey08 abhinavmpandey08 merged commit 4210d96 into aws:main Oct 23, 2023
4 of 5 checks passed
@abhinavmpandey08 abhinavmpandey08 deleted the etcd-encryption branch October 23, 2023 21:54
@abhinavmpandey08
Copy link
Member Author

/cherry-pick release-0.17

@eks-distro-pr-bot
Copy link
Contributor

@abhinavmpandey08: #6874 failed to apply on top of branch "release-0.17":

Applying: Fix etcd-encryption for bottlerocket + e2e
Using index info to reconstruct a base tree...
M	pkg/providers/cloudstack/config/template-cp.yaml
A	pkg/providers/cloudstack/testdata/expected_results_encryption_config_cp.yaml
M	pkg/providers/vsphere/config/template-cp.yaml
A	pkg/providers/vsphere/testdata/expected_results_ubuntu_etcd_encryption_cp.yaml
M	test/e2e/cloudstack_test.go
M	test/e2e/vsphere_test.go
M	test/framework/cluster.go
A	test/framework/config/aws-kms-encryption-provider.yaml
A	test/framework/etcdencryption.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): test/framework/etcdencryption.go deleted in HEAD and modified in Fix etcd-encryption for bottlerocket + e2e. Version Fix etcd-encryption for bottlerocket + e2e of test/framework/etcdencryption.go left in tree.
CONFLICT (modify/delete): test/framework/config/aws-kms-encryption-provider.yaml deleted in HEAD and modified in Fix etcd-encryption for bottlerocket + e2e. Version Fix etcd-encryption for bottlerocket + e2e of test/framework/config/aws-kms-encryption-provider.yaml left in tree.
Auto-merging test/framework/cluster.go
Auto-merging test/e2e/vsphere_test.go
CONFLICT (content): Merge conflict in test/e2e/vsphere_test.go
Auto-merging test/e2e/cloudstack_test.go
CONFLICT (content): Merge conflict in test/e2e/cloudstack_test.go
Auto-merging pkg/providers/vsphere/testdata/expected_results_main_121_cp.yaml
CONFLICT (content): Merge conflict in pkg/providers/vsphere/testdata/expected_results_main_121_cp.yaml
Auto-merging pkg/providers/vsphere/config/template-cp.yaml
CONFLICT (content): Merge conflict in pkg/providers/vsphere/config/template-cp.yaml
Auto-merging pkg/providers/cloudstack/testdata/expected_results_minimal_proxy_cp.yaml
CONFLICT (content): Merge conflict in pkg/providers/cloudstack/testdata/expected_results_minimal_proxy_cp.yaml
Auto-merging pkg/providers/cloudstack/config/template-cp.yaml
CONFLICT (content): Merge conflict in pkg/providers/cloudstack/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 Fix etcd-encryption for bottlerocket + e2e
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.17

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

/cherry-pick release-0.18

@eks-distro-pr-bot
Copy link
Contributor

@abhinavmpandey08: new pull request created: #6877

In response to this:

/cherry-pick release-0.18

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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants