Update Tiltfile

Author: gcleroux

Tiltfile

@@ -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.15.0",
+    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',
@@ -37,13 +53,13 @@ helm_remote('cert-manager',
             repo_name='jetstack',
             set=['crds.enabled=true'],
             repo_url='https://charts.jetstack.io')
-k8s_yaml('./test/cert-manager/clusterIssuer.yaml')
 
-helm_remote('cert-manager-webhook-pinax',
-            version="0.1.0",
-            namespace="kube-system",
-            repo_name='oci://ghcr.io/pinax-network/charts',
-            set=['certManager.namespace=kube-system'])
+# helm_remote('cert-manager-webhook-pinax',
+#             version="0.1.0",
+#             namespace="kube-system",
+#             repo_name='oci://ghcr.io/pinax-network/charts',
+#             set=['certManager.namespace=kube-system'])
+#
 
 # CoreDNS with updated RBAC
 k8s_yaml(helm(
@@ -54,46 +70,47 @@ k8s_yaml(helm(
     )
 )
 
-# Baremetal ingress controller (nodeport-based)
+# # Baremetal ingress controller (nodeport-based)
 helm_remote('ingress-nginx',
             version="4.8.3",
             repo_name='ingress-nginx',
             set=['controller.admissionWebhooks.enabled=false'],
             repo_url='https://kubernetes.github.io/ingress-nginx')
-
-# Nginxinc kubernetes-ingress
-helm_remote('nginx-ingress',
-            version="1.0.1",
-            release_name="nginxinc",
-            repo_name='oci://ghcr.io/nginxinc/charts',
-            values=['./test/nginxinc-kubernetes-ingress/values.yaml']
-            )
-k8s_kind('VirtualServer', api_version='k8s.nginx.org/v1')
-
-helm_remote('istiod',
-            version="1.19.3",
-            repo_name='istio',
-            set=['global.istioNamespace=default', 'base.enableIstioConfigCRDs=false', 'telemetry.enabled=false'],
-            repo_url='https://istio-release.storage.googleapis.com/charts')
-helm_remote('gateway',
-            version="1.19.3",
-            repo_name='istio',
-            namespace='default',
-            repo_url='https://istio-release.storage.googleapis.com/charts')
+#
+# # Nginxinc kubernetes-ingress
+# helm_remote('nginx-ingress',
+#             version="1.0.1",
+#             release_name="nginxinc",
+#             repo_name='oci://ghcr.io/nginxinc/charts',
+#             values=['./test/nginxinc-kubernetes-ingress/values.yaml']
+#             )
+# k8s_kind('VirtualServer', api_version='k8s.nginx.org/v1')
+#
+# helm_remote('istiod',
+#             version="1.19.3",
+#             repo_name='istio',
+#             set=['global.istioNamespace=default', 'base.enableIstioConfigCRDs=false', 'telemetry.enabled=false'],
+#             repo_url='https://istio-release.storage.googleapis.com/charts')
+# helm_remote('gateway',
+#             version="1.19.3",
+#             repo_name='istio',
+#             namespace='default',
+#             repo_url='https://istio-release.storage.googleapis.com/charts')
+#
 
 # Backend deployment for testing
 k8s_yaml('./test/backend.yml')
 
-# gateway-apis
-k8s_yaml('./test/gateway-api/crds.yml')
-
-# Gateway API
-k8s_kind('HTTPRoute', api_version='gateway.networking.k8s.io/v1')
-k8s_kind('TLSRoute', api_version='gateway.networking.k8s.io/v1alpha2')
-k8s_kind('GRPCRoute', api_version='gateway.networking.k8s.io/v1alpha2')
-k8s_kind('Gateway', api_version='gateway.networking.k8s.io/v1')
-k8s_yaml('./test/gateway-api/resources.yml')
-k8s_yaml('./test/gatewayclasses.yaml')
+# # gateway-apis
+# k8s_yaml('./test/gateway-api/crds.yml')
+#
+# # Gateway API
+# k8s_kind('HTTPRoute', api_version='gateway.networking.k8s.io/v1')
+# k8s_kind('TLSRoute', api_version='gateway.networking.k8s.io/v1alpha2')
+# k8s_kind('GRPCRoute', api_version='gateway.networking.k8s.io/v1alpha2')
+# k8s_kind('Gateway', api_version='gateway.networking.k8s.io/v1')
+# k8s_yaml('./test/gateway-api/resources.yml')
+# k8s_yaml('./test/gatewayclasses.yaml')
 k8s_yaml('./test/dual-stack/service-annotation.yml')
 k8s_yaml('./test/dual-stack/ingress-services.yml')
-k8s_yaml('./test/dual-stack/certificate.yaml')
+# k8s_yaml('./test/dual-stack/certificate.yaml')

test/cilium/dual-stack/crd-values.yaml

@@ -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

test/cilium/helm-values.yaml

@@ -1,9 +1,5 @@
-bpf:
-  masquerade: true
 cluster:
   name: local
-containerRuntime:
-  integration: containerd
 endpointRoutes:
   enabled: true
 enableCiliumEndpointSlice: true
@@ -22,9 +18,6 @@ ipam:
     clusterPoolIPv4PodCIDRList:
       - "10.43.0.0/16"
     clusterPoolIPv4MaskSize: 24
-    # clusterPoolIPv6PodCIDRList:
-    #   - "fd00::/104"
-    # clusterPoolIPv6MaskSize: 120
 kubeProxyReplacement: true
 kubeProxyReplacementHealthzBindAddr: 0.0.0.0:10256
 k8sServiceHost: 127.0.0.1
@@ -55,4 +48,3 @@ securityContext:
       - NET_ADMIN
       - SYS_ADMIN
       - SYS_RESOURCE
-tunnel: disabled

test/cilium/single-stack/crd-values.yaml

@@ -4,7 +4,7 @@ kind: CiliumLoadBalancerIPPool
 metadata:
   name: default
 spec:
-  cidrs:
+  blocks:
     - cidr: 198.51.100.0/24
 ---
 apiVersion: cilium.io/v2alpha1