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

[cni/cilium] Add support for additional config options #11678

Merged
merged 1 commit into from
Jun 16, 2021
Merged

[cni/cilium] Add support for additional config options #11678

merged 1 commit into from
Jun 16, 2021

Conversation

dntosas
Copy link
Contributor

@dntosas dntosas commented Jun 3, 2021 •
edited
Loading

In this commit, we enable users define their setup with following
additional fields:

  • DisableEndpointCRD
  • EnableL7Proxy
  • EnableEndpointHealthChecking
  • IdentityAllocationMode
  • IdentityChangeGracePeriod
  • BPFLBAlgorithm
  • BPFLBMaglevTableSize
  • BPFNATGlobalMax
  • BPFNeighGlobalMax
  • BPFPolicyMapMax

Added also validation tests to prevent conflicting value combinations to
reach actual cluster state.

Signed-off-by: dntosas ntosas@gmail.com

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 3, 2021
@k8s-ci-robot
Copy link
Contributor

Hi @dntosas. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 3, 2021
@k8s-ci-robot k8s-ci-robot requested review from hakman and zetaab June 3, 2021 09:00
@olemarkus
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jun 3, 2021
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 3, 2021
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 3, 2021
@dntosas
Copy link
Contributor Author

dntosas commented Jun 3, 2021

/assign @olemarkus

@dntosas
Copy link
Contributor Author

dntosas commented Jun 3, 2021

reflog is our friend 😛 🙇‍♂️

dntosas
dntosas commented Jun 3, 2021
View reviewed changes
pkg/apis/kops/v1alpha2/networking.go
@@ -256,6 +256,8 @@ type AmazonVPCNetworkingSpec struct {
Env []EnvVar `json:"env,omitempty"`
}

const CiliumIpamEni = "eni"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

you suggest including the above to CiliumSpec if i understand correctly?

@dntosas dntosas force-pushed the safe-cilium branch 2 times, most recently from f6ba296 to f43ebdf Compare June 3, 2021 19:14
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 10, 2021
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 10, 2021
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 14, 2021
@dntosas dntosas force-pushed the safe-cilium branch 3 times, most recently from 12ba14a to 37629d6 Compare June 15, 2021 12:01
@dntosas
Copy link
Contributor Author

dntosas commented Jun 15, 2021

/retest

@dntosas
Copy link
Contributor Author

dntosas commented Jun 15, 2021

/retest

@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jun 15, 2021
@dntosas @hwoarang
[cni/cilium] Add support for additional config options
7bf65ff 
In this commit, we enable users define their setup with following
additional fields:

- DisableEndpointCRD
- EnableEndpointHealthChecking
- IdentityAllocationMode
- IdentityChangeGracePeriod
- BPFLBAlgorithm
- BPFLBMaglevTableSize
- BPFNATGlobalMax
- BPFNeighGlobalMax
- BPFPolicyMapMax
- EnableBPFMasquerade
- EnableL7Proxy

Added also validation tests to prevent conflicting value combinations to
reach actual cluster state.

Signed-off-by: dntosas <ntosas@gmail.com>
Co-authored-by: hwoarang <markos@chandras.me>
Signed-off-by: dntosas <ntosas@gmail.com>
@dntosas dntosas requested a review from olemarkus June 16, 2021 07:39
olemarkus
olemarkus approved these changes Jun 16, 2021
View reviewed changes
Copy link
Member

@olemarkus olemarkus left a comment

Choose a reason for hiding this comment

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

Thanks for this and thanks for your patience :)

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: olemarkus

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 Jun 16, 2021
@k8s-ci-robot k8s-ci-robot merged commit 84a730c into kubernetes:master Jun 16, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.22 milestone Jun 16, 2021
@dntosas dntosas mentioned this pull request Jun 16, 2021
Closed
@dntosas dntosas deleted the safe-cilium branch June 17, 2021 11:18
@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

@olemarkus olemarkus olemarkus approved these changes

@hakman hakman Awaiting requested review from hakman

@zetaab zetaab Awaiting requested review from zetaab

Assignees

@olemarkus olemarkus

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/addons area/api 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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.22
Development

Successfully merging this pull request may close these issues.
3 participants
@dntosas @k8s-ci-robot @olemarkus