Skip to content

Commit

Permalink
ci: bump cilium to v1.16.0
Browse files Browse the repository at this point in the history
Signed-off-by: zhangzujian <[email protected]>
  • Loading branch information
zhangzujian committed Jul 25, 2024
1 parent d80de45 commit f674853
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ KUBEVIRT_LAUNCHER_IMAGE = quay.io/kubevirt/virt-launcher:$(KUBEVIRT_VERSION)
KUBEVIRT_OPERATOR_YAML = https://github.com/kubevirt/kubevirt/releases/download/$(KUBEVIRT_VERSION)/kubevirt-operator.yaml
KUBEVIRT_CR_YAML = https://github.com/kubevirt/kubevirt/releases/download/$(KUBEVIRT_VERSION)/kubevirt-cr.yaml

CILIUM_VERSION = 1.15.7
CILIUM_VERSION = 1.16.0
CILIUM_IMAGE_REPO = quay.io/cilium

CERT_MANAGER_VERSION = v1.15.1
Expand Down Expand Up @@ -737,7 +737,7 @@ kind-install-multus:
kubectl -n kube-system rollout status ds kube-multus-ds

.PHONY: kind-install-metallb
kind-install-metallb: kind-install
kind-install-metallb:
$(call docker_network_info,kind)
$(call kind_load_image,kube-ovn,$(METALLB_CONTROLLER_IMAGE),1)
$(call kind_load_image,kube-ovn,$(METALLB_SPEAKER_IMAGE),1)
Expand Down Expand Up @@ -815,20 +815,22 @@ kind-install-cilium-chaining-%:
--namespace kube-system \
--set k8sServiceHost=$(KUBERNETES_SERVICE_HOST) \
--set k8sServicePort=6443 \
--set kubeProxyReplacement=partial \
--set kubeProxyReplacement=true \
--set operator.replicas=1 \
--set socketLB.enabled=true \
--set nodePort.enabled=true \
--set externalIPs.enabled=true \
--set hostPort.enabled=false \
--set routingMode=native \
--set sessionAffinity=true \
--set enableIPv4Masquerade=false \
--set enableIPv6Masquerade=false \
--set hubble.enabled=true \
--set sctp.enabled=true \
--set ipv4.enabled=$(shell if echo $* | grep -q ipv6; then echo false; else echo true; fi) \
--set ipv6.enabled=$(shell if echo $* | grep -q ipv4; then echo false; else echo true; fi) \
--set routingMode=native \
--set devices="eth+ ovn0" \
--set forceDeviceDetection=true \
--set ipam.mode=cluster-pool \
--set-json ipam.operator.clusterPoolIPv4PodCIDRList='["100.65.0.0/16"]' \
--set-json ipam.operator.clusterPoolIPv6PodCIDRList='["fd00:100:65::/112"]' \
Expand Down

0 comments on commit f674853

Please sign in to comment.