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

support asymmetric encryption algorithms in ClusterConfigration #11751

Merged
merged 1 commit into from
Nov 28, 2024
Merged

support asymmetric encryption algorithms in ClusterConfigration #11751

merged 1 commit into from
Nov 28, 2024

Conversation

ErikJiang
Copy link
Member

@ErikJiang ErikJiang commented Nov 27, 2024 •
edited by VannTen
Loading

What type of PR is this?

/kind feature

What this PR does / why we need it:

Add ClusterConfiguration.encryptionAlgorithm to specify an asymmetric encryption algorithm for the cluster's certificates and keys.

Which issue(s) this PR fixes:

Fixes #11749

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

@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/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 27, 2024
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 27, 2024
VannTen
VannTen requested changes Nov 27, 2024
View reviewed changes
Copy link
Contributor

@VannTen VannTen left a comment

Choose a reason for hiding this comment

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

/ok-to-test

roles/kubernetes/control-plane/defaults/main/main.yml Outdated
@@ -236,3 +236,6 @@ kube_apiserver_tracing_sampling_rate_per_million: 100

# Enable kubeadm file discovery if anonymous access has been removed
kubeadm_use_file_discovery: "{{ remove_anonymous_access }}"

# Set the asymmetric encryption algorithm for the cluster's keys and certificates
kube_asym_encryption_algorithm: "RSA-2048"
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
kube_asym_encryption_algorithm: "RSA-2048"
kube_asymmetric_encryption_algorithm: "RSA-2048"

Not worth saving some character over this.
Also, can you add a link here to the relevant Kubernetes documentation ?

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@k8s-ci-robot k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Nov 27, 2024
@ErikJiang ErikJiang force-pushed the add_kube_encryption_algorithm branch from edec694 to af00f70 Compare November 28, 2024 02:09
@ErikJiang ErikJiang changed the title add encryptionAlgorithm for ClusterConfigration support asymmetric encryption algorithms in ClusterConfigration Nov 28, 2024
VannTen
VannTen reviewed Nov 28, 2024
View reviewed changes
Copy link
Contributor

@VannTen VannTen left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve
Thanks !

roles/kubernetes/control-plane/defaults/main/main.yml
@@ -236,3 +236,8 @@ kube_apiserver_tracing_sampling_rate_per_million: 100

# Enable kubeadm file discovery if anonymous access has been removed
kubeadm_use_file_discovery: "{{ remove_anonymous_access }}"

# Supported asymmetric encryption algorithm types for the cluster's keys and certificates.
# can be one of RSA-2048(default), RSA-3072, RSA-4096, ECDSA-P256
Copy link
Contributor

Choose a reason for hiding this comment

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

The upstream docs apparently disagree:

encryptionAlgorithm holds the type of asymmetric encryption algorithm used for keys and certificates. Can be "RSA" (default algorithm, key size is 2048) or "ECDSA" (uses the P-256 elliptic curve).

But given kubernetes/kubernetes#123054 I assume the docs are outdated

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ErikJiang, VannTen

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 Nov 28, 2024
@k8s-ci-robot k8s-ci-robot merged commit 9f01eff into kubernetes-sigs:master Nov 28, 2024
41 checks passed
@VannTen
Copy link
Contributor

VannTen commented Nov 28, 2024

Hum, I wanted to ask you to add some variations in the CI to test this, I forgot about it... 😄

@VannTen VannTen mentioned this pull request Nov 28, 2024
Closed
ErikJiang added a commit to ErikJiang/kubespray that referenced this pull request Nov 28, 2024
@ErikJiang
Revert "add encryptionAlgorithm for ClusterConfigration (kubernetes-s…
df67fa6 
…igs#11751)"

This reverts commit 9f01eff.
@ErikJiang ErikJiang mentioned this pull request Nov 28, 2024
Merged
@VannTen
Copy link
Contributor

VannTen commented Nov 28, 2024 •
edited
Loading

/release-note-edit release-note NONE

(Since we're reverting this)

k8s-ci-robot pushed a commit that referenced this pull request Nov 28, 2024
@ErikJiang
Revert "add encryptionAlgorithm for ClusterConfigration (#11751)" (#1…
f834714 
…1756)

This reverts commit 9f01eff.
@VannTen
Copy link
Contributor

VannTen commented Nov 28, 2024

/release-note-none

@k8s-ci-robot
Copy link
Contributor

@VannTen: you can only set the release note label to release-note-none if the release-note block in the PR body text is empty or "none".

In response to this:

/release-note-none

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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Nov 28, 2024
@tico88612 tico88612 mentioned this pull request Nov 29, 2024
Merged
kpoxo6op pushed a commit to kpoxo6op/kubespray that referenced this pull request Dec 27, 2024
@ErikJiang @kpoxo6op
add encryptionAlgorithm for ClusterConfigration (kubernetes-sigs#11751)
de0da54 
Signed-off-by: bo.jiang <[email protected]>
kpoxo6op pushed a commit to kpoxo6op/kubespray that referenced this pull request Dec 27, 2024
@ErikJiang @kpoxo6op
Revert "add encryptionAlgorithm for ClusterConfigration (kubernetes-s…
4cdea82 
…igs#11751)" (kubernetes-sigs#11756)

This reverts commit 9f01eff.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VannTen VannTen VannTen requested changes

@cyclinder cyclinder Awaiting requested review from cyclinder

@tico88612 tico88612 Awaiting requested review from tico88612

Assignees

@VannTen VannTen

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/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note. 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.

Support Configuring EncryptionAlgorithm in Kubeadm v1beta4
3 participants
@ErikJiang @k8s-ci-robot @VannTen