Skip to content

Update Cilium to v1.18.2#17601

Merged
k8s-ci-robot merged 2 commits intokubernetes:masterfrom
hakman:cilium-1.18.1
Sep 25, 2025
Merged

Update Cilium to v1.18.2#17601
k8s-ci-robot merged 2 commits intokubernetes:masterfrom
hakman:cilium-1.18.1

Conversation

@hakman
Copy link
Copy Markdown
Member

@hakman hakman commented Aug 31, 2025

No description provided.

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Aug 31, 2025
@hakman hakman removed request for olemarkus and zetaab August 31, 2025 22:36
@hakman hakman force-pushed the cilium-1.18.1 branch 4 times, most recently from 5f5952b to 05179e9 Compare September 7, 2025 07:44
@hakman
Copy link
Copy Markdown
Member Author

hakman commented Sep 7, 2025

/test pull-kops-e2e-azure-cni-cilium

1 similar comment
@hakman
Copy link
Copy Markdown
Member Author

hakman commented Sep 8, 2025

/test pull-kops-e2e-azure-cni-cilium

@k8s-ci-robot k8s-ci-robot added the area/provider/aws Issues or PRs related to aws provider label Sep 21, 2025
@kubernetes kubernetes deleted a comment from k8s-ci-robot Sep 21, 2025
@hakman
Copy link
Copy Markdown
Member Author

hakman commented Sep 21, 2025

/test pull-kops-e2e-k8s-gce-cilium

@hakman hakman force-pushed the cilium-1.18.1 branch 2 times, most recently from ed38aaa to b88fae9 Compare September 21, 2025 21:09
Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>
Signed-off-by: Ciprian Hacman <ciprian@hakman.dev>
@hakman hakman changed the title WIP Update Cilium to v1.18.1 WIP Update Cilium to v1.18.2 Sep 21, 2025
@hakman hakman changed the title WIP Update Cilium to v1.18.2 Update Cilium to v1.18.2 Sep 21, 2025
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 21, 2025
@hakman
Copy link
Copy Markdown
Member Author

hakman commented Sep 21, 2025

/cc @ameukam @rifelpet

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Sep 21, 2025

None of the failures are in Cilium tests or related.
/retest

Comment on lines -130 to -145
bpf-ct-global-tcp-max: "{{ .BPFCTGlobalTCPMax }}"
bpf-ct-global-any-max: "{{ .BPFCTGlobalAnyMax }}"

# BPF load balancing algorithm ("random", "maglev") (default "random")
bpf-lb-algorithm: "{{ .BPFLBAlgorithm }}"

# Maglev per service backend table size (parameter M) (default 16381)
bpf-lb-maglev-table-size: "{{ .BPFLBMaglevTableSize }}"

# bpf-nat-global-max specified the maximum number of entries in the
# BPF NAT table. (default 524288)
bpf-nat-global-max: "{{ .BPFNATGlobalMax }}"

# bpf-neigh-global-max specified the maximum number of entries in the
# BPF neighbor table. (default 524288)
bpf-neigh-global-max: "{{ .BPFNeighGlobalMax }}"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

These were all removed, is that intentional?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yes, but I have an idea how to add some back. They are not gone, just not overridden.
The point is that they are kind of useless, we should add something at the end to allow any override.

# Extra config allows adding arbitrary properties to the cilium config.
# By putting it at the end of the ConfigMap, it's also possible to override existing properties.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

extra config would need to be done with templating, right? to recognize all of the other spec.networking.cilium fields?

Copy link
Copy Markdown
Member Author

@hakman hakman Sep 24, 2025

Choose a reason for hiding this comment

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

I was thinking of a simple `map[string]string', pretty much how we deal with AWS VPC CNI. Anyone could add whatever option they want, without any validation from kOps.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

yea that sounds reasonable. should we add it in this PR or a followup?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Let's do a followup and see how tests go in the mean time.

# bpf-lb-sock-hostns-only enables skipping socket LB for services when inside a pod namespace,
# in favor of service LB at the pod interface. Socket LB is still used when in the host namespace.
# Required by service mesh (e.g., Istio, Linkerd). (default false)
bpf-lb-sock-hostns-only: "{{ .BPFLBSockHostNSOnly }}"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this was also removed

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Same as above, should be added as a generic override.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Same as above, should be added as a generic override.

enable-remote-node-identity: "{{ .EnableRemoteNodeIdentity }}"

# Enable unreachable routes on pod deletion (default false)
enable-unreachable-routes: "{{ .EnableUnreachableRoutes }}"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

and this

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Some of these are just gone, others have mover around. It's easier to see in the rendered files.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This seems to have been hidden at some point.

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Sep 22, 2025

/test pull-kops-e2e-aws-upgrade-k133-ko133-to-kstable-kolatest-many-addons

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Sep 22, 2025

/test pull-kops-e2e-cni-amazonvpc

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Sep 22, 2025

/retest

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Sep 22, 2025

/test pull-kops-e2e-cni-amazonvpc

@hakman
Copy link
Copy Markdown
Member Author

hakman commented Sep 23, 2025

/test pull-kops-e2e-k8s-aws-amazonvpc

@ameukam
Copy link
Copy Markdown
Member

ameukam commented Sep 24, 2025

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Sep 24, 2025
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rifelpet

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details 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 Sep 25, 2025
@k8s-ci-robot k8s-ci-robot merged commit b7f63c0 into kubernetes:master Sep 25, 2025
38 checks passed
@hakman hakman deleted the cilium-1.18.1 branch September 25, 2025 04:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/addons area/api area/provider/aws Issues or PRs related to aws provider 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/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