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

Cilium wireguard support #12158

Merged
merged 6 commits into from
Aug 17, 2021
Merged

Cilium wireguard support #12158

merged 6 commits into from
Aug 17, 2021

Conversation

olemarkus
Copy link
Member

This is a continuation of #11786 which went inactive.

/cc @dntosas

@k8s-ci-robot
Copy link
Contributor

@olemarkus: GitHub didn't allow me to request PR reviews from the following users: dntosas.

Note that only kubernetes members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

This is a continuation of #11786 which went inactive.

/cc @dntosas

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.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. area/addons area/api labels Aug 15, 2021
johngmyers
johngmyers requested changes Aug 15, 2021
View reviewed changes
Copy link
Member

@johngmyers johngmyers left a comment •
edited
Loading

Choose a reason for hiding this comment

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

The documentation and CLI refer to the "ciliumpassword" secret as the "Cilium IPsec configuration". It looks like the code requires and provisions this for Wireguard as well. The terminology in the documentation/CLI should be updated.

pkg/apis/kops/validation/validation.go Outdated
Comment on lines 877 to 896
if fi.BoolValue(v.EnableL7Proxy) {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("encryptionType"), "Cilium EncryptionType=WireGuard cannot work with L7 Proxy enabled."))
}

// Cilium with Wireguard integration follow-up --> https://github.com/cilium/cilium/issues/15462.
// The following rule of validation should be deleted as this combination
// will be supported on future releases of Cilium (>= v1.11.0).
if fi.BoolValue(v.EnableL7Proxy) {
allErrs = append(allErrs, field.Forbidden(fldPath.Child("enableL7Proxy"), "L7 proxy cannot be enabled if wireguard is enabled."))
}
Copy link
Member

Choose a reason for hiding this comment

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

These two validations are redundant with each other. One should be removed.

@johngmyers
Copy link
Member

johngmyers commented Aug 15, 2021 •
edited
Loading

Ah, if the ciliumpassword secret isn't needed for Wireguard, then kOps shouldn't require it to exist and shouldn't provision it to the nodes.

@johngmyers
Copy link
Member

kops/upup/pkg/fi/cloudup/apply_cluster.go

Lines 363 to 370 in cd1aa1a

if ciliumSpec != nil && ciliumSpec.EnableEncryption {
secret, err := secretStore.FindSecret("ciliumpassword")
if err != nil {
return fmt.Errorf("could not load the ciliumpassword secret: %w", err)
}
if secret == nil {
fmt.Println("")
fmt.Println("You have cilium encryption enabled, but no ciliumpassword secret has been set.")

Needs to test the encryption type.

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: johngmyers

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 Aug 17, 2021
@k8s-ci-robot k8s-ci-robot merged commit be493f1 into kubernetes:master Aug 17, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Aug 17, 2021
@olemarkus olemarkus mentioned this pull request Aug 17, 2021
Closed
@dntosas dntosas mentioned this pull request Oct 7, 2022
Closed
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johngmyers johngmyers johngmyers approved these changes

Assignees

@johngmyers johngmyers

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/addons area/api area/documentation 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.22
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@olemarkus @k8s-ci-robot @johngmyers @dntosas