Skip to content

Commit

Permalink
update cilium
Browse files Browse the repository at this point in the history
  • Loading branch information
gcleroux committed Jan 20, 2025
1 parent c263b55 commit 7f485e1
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 21 deletions.
30 changes: 23 additions & 7 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,29 @@ docker_build_with_restart(IMG, '.',
)

# Cilium CNI
helm_remote('cilium',
version="1.15.0-pre.1",
namespace="kube-system",
repo_name='cilium',
values=['./test/cilium/helm-values.yaml'],
repo_url='https://helm.cilium.io')
k8s_yaml('./test/cilium/dual-stack/crd-values.yaml')
helm_remote(
'cilium',
version="1.16.3",
namespace="kube-system",
repo_name='cilium',
values=['./test/cilium/helm-values.yaml'],
repo_url='https://helm.cilium.io'
)

# Create a local resource that waits for Cilium's deployment to be complete
local_resource(
'cilium_wait',
cmd='echo "Waiting for Cilium..."',
resource_deps=['cilium'],
deps=['./test/cilium/helm-values.yaml']
)

local_resource(
'lb_crds',
cmd='kubectl apply -f ./test/cilium/dual-stack/crd-values.yaml',
resource_deps=['cilium_wait'],
deps=['./test/cilium/dual-stack/crd-values.yaml']
)

# Cert-manager
helm_remote('cert-manager',
Expand Down
3 changes: 1 addition & 2 deletions test/cilium/dual-stack/crd-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,9 @@ kind: CiliumLoadBalancerIPPool
metadata:
name: default
spec:
cidrs:
blocks:
- cidr: 198.51.100.0/24
- cidr: fd12:3456:789a:1::/64

---
apiVersion: cilium.io/v2alpha1
kind: CiliumL2AnnouncementPolicy
Expand Down
13 changes: 1 addition & 12 deletions test/cilium/helm-values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ bpf:
masquerade: true
cluster:
name: local
containerRuntime:
integration: containerd
endpointRoutes:
enabled: true
enableCiliumEndpointSlice: true
Expand All @@ -15,16 +13,8 @@ gatewayAPI:
l7Proxy: true
l2announcements:
enabled: true
ipv4NativeRoutingCIDR: 10.42.0.0/16
ipam:
mode: "cluster-pool"
operator:
clusterPoolIPv4PodCIDRList:
- "10.43.0.0/16"
clusterPoolIPv4MaskSize: 24
# clusterPoolIPv6PodCIDRList:
# - "fd00::/104"
# clusterPoolIPv6MaskSize: 120
mode: "kubernetes"
kubeProxyReplacement: true
kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256
k8sServiceHost: 127.0.0.1
Expand Down Expand Up @@ -55,4 +45,3 @@ securityContext:
- NET_ADMIN
- SYS_ADMIN
- SYS_RESOURCE
tunnel: disabled

0 comments on commit 7f485e1

Please sign in to comment.