From 1ebeec2ac483a90e80eee5ecf69de706b349e6fa Mon Sep 17 00:00:00 2001
From: jshr-w <shjayaraman@microsoft.com>
Date: Tue, 14 Jan 2025 09:28:46 -0800
Subject: [PATCH] update templates

---
 .pipelines/cni/cilium/cilium-overlay-load-test-template.yaml    | 1 +
 .../cilium-dualstackoverlay-e2e-step-template.yaml              | 1 +
 .../cilium-dualstackoverlay-e2e.steps.yaml                      | 1 +
 .../cilium-nodesubnet/cilium-nodesubnet-e2e-step-template.yaml  | 1 +
 .../cilium-overlay-e2e-step-template.yaml                       | 1 +
 .../cilium-overlay-withhubble/cilium-overlay-e2e.steps.yaml     | 1 +
 .../cilium-overlay/cilium-overlay-e2e-step-template.yaml        | 1 +
 .../singletenancy/cilium-overlay/cilium-overlay-e2e.steps.yaml  | 1 +
 .pipelines/singletenancy/cilium/cilium-e2e.steps.yaml           | 1 +
 .pipelines/templates/cilium-tests.yaml                          | 1 +
 test/integration/manifests/cilium/cilium-nightly-config.yaml    | 2 ++
 .../cilium/v1.13/cilium-operator/templates/deployment.yaml      | 2 ++
 .../cilium/v1.14/cilium-operator/templates/deployment.yaml      | 2 ++
 .../cilium/v1.16/cilium-operator/templates/deployment.yaml      | 2 ++
 14 files changed, 18 insertions(+)

diff --git a/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml b/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
index 5a50afc62c..e6c56bfb89 100644
--- a/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
+++ b/.pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
@@ -120,6 +120,7 @@ stages:
                   echo "Deploy Azure-CNS"
                   sudo -E env "PATH=$PATH" make test-integration AZURE_IPAM_VERSION=$(make azure-ipam-version) CNS_VERSION=$(make cns-version) INSTALL_CNS=true INSTALL_OVERLAY=true CNS_IMAGE_REPO=$(CNS_IMAGE_REPO)
                   kubectl get po -owide -A
+                  kubectl get crd -A
       - ${{if eq(parameters.hubbleEnabled, true)}}:
         - job: deploy_cilium_components
           displayName: Deploy Cilium with Hubble
diff --git a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
index 701f79e636..b6de1b5480 100644
--- a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e-step-template.yaml
@@ -65,6 +65,7 @@ steps:
       echo "Waiting < 2 minutes for cilium to be ready"
       # Ensure Cilium is ready Xm\Xs
       cilium status --wait --wait-duration 2m
+      kubectl get crd -A
     retryCountOnTaskFailure: 3
     name: "CiliumStatus"
     displayName: "Cilium Status"
diff --git a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e.steps.yaml b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e.steps.yaml
index 8d0b262de6..b3e5596d18 100644
--- a/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e.steps.yaml
+++ b/.pipelines/singletenancy/cilium-dualstack-overlay/cilium-dualstackoverlay-e2e.steps.yaml
@@ -49,6 +49,7 @@ steps:
         envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY},${IPV6_HP_BPF_VERSION}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset-dualstack.yaml | kubectl apply -f -
         envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
         kubectl get po -owide -A
+        kubectl get crd -A
     name: "installCilium"
     displayName: "Install Cilium on AKS Dualstack Overlay"
 
diff --git a/.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-step-template.yaml
index 242ec88bd9..f3b488ade5 100644
--- a/.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-nodesubnet/cilium-nodesubnet-e2e-step-template.yaml
@@ -69,6 +69,7 @@ steps:
         envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-agent/templates/daemonset.yaml | kubectl apply -f -
         envsubst '${CILIUM_VERSION_TAG},${CILIUM_IMAGE_REGISTRY}' < test/integration/manifests/cilium/v${DIR}/cilium-operator/templates/deployment.yaml | kubectl apply -f -
         kubectl get po -owide -A
+        kubectl get crd -A
     name: "installCilium"
     displayName: "Install Cilium"
 
diff --git a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
index ff52d7a663..bc3dd999ff 100644
--- a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e-step-template.yaml
@@ -69,6 +69,7 @@ steps:
       echo "Waiting < 2 minutes for cilium to be ready"
       # Ensure Cilium is ready Xm\Xs
       cilium status --wait --wait-duration 2m
+      kubectl get crd -A
     retryCountOnTaskFailure: 3
     name: "CiliumStatus"
     displayName: "Cilium Status"
diff --git a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e.steps.yaml b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e.steps.yaml
index f52800e74f..5d1aabe449 100644
--- a/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e.steps.yaml
+++ b/.pipelines/singletenancy/cilium-overlay-withhubble/cilium-overlay-e2e.steps.yaml
@@ -64,6 +64,7 @@ steps:
       echo "Waiting < 2 minutes for cilium to be ready"
       # Ensure Cilium is ready Xm\Xs
       cilium status --wait --wait-duration 2m
+      kubectl get crd -A
     retryCountOnTaskFailure: 3
     name: "CiliumStatus"
     displayName: "Cilium Status"
diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
index ccd2fffce9..25ffa96a75 100644
--- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
+++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-step-template.yaml
@@ -91,6 +91,7 @@ steps:
       echo "Waiting < 2 minutes for cilium to be ready"
       # Ensure Cilium is ready Xm\Xs
       cilium status --wait --wait-duration 2m
+      kubectl get crd -A
     retryCountOnTaskFailure: 3
     name: "CiliumStatus"
     displayName: "Cilium Status"
diff --git a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e.steps.yaml b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e.steps.yaml
index dea722df9c..c958a569c9 100644
--- a/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e.steps.yaml
+++ b/.pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e.steps.yaml
@@ -86,6 +86,7 @@ steps:
       echo "Waiting < 2 minutes for cilium to be ready"
       # Ensure Cilium is ready Xm\Xs
       cilium status --wait --wait-duration 2m
+      kubectl get crd -A
     retryCountOnTaskFailure: 3
     name: "CiliumStatus"
     displayName: "Cilium Status"
diff --git a/.pipelines/singletenancy/cilium/cilium-e2e.steps.yaml b/.pipelines/singletenancy/cilium/cilium-e2e.steps.yaml
index 12e6f4e2ad..ceae9c3cf8 100644
--- a/.pipelines/singletenancy/cilium/cilium-e2e.steps.yaml
+++ b/.pipelines/singletenancy/cilium/cilium-e2e.steps.yaml
@@ -64,6 +64,7 @@ steps:
       echo "Waiting < 2 minutes for cilium to be ready"
       # Ensure Cilium is ready Xm\Xs
       cilium status --wait --wait-duration 2m
+      kubectl get crd -A
     retryCountOnTaskFailure: 3
     name: "CiliumStatus"
     displayName: "Cilium Status"
diff --git a/.pipelines/templates/cilium-tests.yaml b/.pipelines/templates/cilium-tests.yaml
index d43743b5ca..88a33b6abb 100644
--- a/.pipelines/templates/cilium-tests.yaml
+++ b/.pipelines/templates/cilium-tests.yaml
@@ -4,6 +4,7 @@ steps:
       echo "Waiting < 2 minutes for cilium to be ready"
       # Ensure Cilium is ready Xm\Xs
       cilium status --wait --wait-duration 2m
+      kubectl get crd -A
     retryCountOnTaskFailure: 3
     name: "CiliumStatus"
     displayName: "Cilium Status"
diff --git a/test/integration/manifests/cilium/cilium-nightly-config.yaml b/test/integration/manifests/cilium/cilium-nightly-config.yaml
index 09cb637462..09145ec643 100644
--- a/test/integration/manifests/cilium/cilium-nightly-config.yaml
+++ b/test/integration/manifests/cilium/cilium-nightly-config.yaml
@@ -9,6 +9,7 @@ data:
   bpf-map-dynamic-size-ratio: "0.0025"
   bpf-policy-map-max: "16384"
   bpf-root: /sys/fs/bpf
+  ces-slice-mode: fcfs
   cgroup-root: /run/cilium/cgroupv2
   cilium-endpoint-gc-interval: 5m0s
   cluster-id: "0"
@@ -19,6 +20,7 @@ data:
   enable-auto-protect-node-port-range: "true"
   enable-bgp-control-plane: "false"
   enable-bpf-clock-probe: "true"
+  enable-cilium-endpoint-slice: "true"
   enable-endpoint-health-checking: "false"
   enable-endpoint-routes: "true"
   enable-health-check-nodeport: "true"
diff --git a/test/integration/manifests/cilium/v1.13/cilium-operator/templates/deployment.yaml b/test/integration/manifests/cilium/v1.13/cilium-operator/templates/deployment.yaml
index cdc0e79d83..df782a03e8 100644
--- a/test/integration/manifests/cilium/v1.13/cilium-operator/templates/deployment.yaml
+++ b/test/integration/manifests/cilium/v1.13/cilium-operator/templates/deployment.yaml
@@ -38,6 +38,8 @@ spec:
         - --debug=$(CILIUM_DEBUG)
         - --identity-gc-interval=0m20s
         - --identity-heartbeat-timeout=0m20s
+        - --enable-cilium-endpoint-slice=true
+        - --ces-slice-mode=cesSliceModeFCFS
         env:
         - name: K8S_NODE_NAME
           valueFrom:
diff --git a/test/integration/manifests/cilium/v1.14/cilium-operator/templates/deployment.yaml b/test/integration/manifests/cilium/v1.14/cilium-operator/templates/deployment.yaml
index cdc0e79d83..df782a03e8 100644
--- a/test/integration/manifests/cilium/v1.14/cilium-operator/templates/deployment.yaml
+++ b/test/integration/manifests/cilium/v1.14/cilium-operator/templates/deployment.yaml
@@ -38,6 +38,8 @@ spec:
         - --debug=$(CILIUM_DEBUG)
         - --identity-gc-interval=0m20s
         - --identity-heartbeat-timeout=0m20s
+        - --enable-cilium-endpoint-slice=true
+        - --ces-slice-mode=cesSliceModeFCFS
         env:
         - name: K8S_NODE_NAME
           valueFrom:
diff --git a/test/integration/manifests/cilium/v1.16/cilium-operator/templates/deployment.yaml b/test/integration/manifests/cilium/v1.16/cilium-operator/templates/deployment.yaml
index cdc0e79d83..df782a03e8 100644
--- a/test/integration/manifests/cilium/v1.16/cilium-operator/templates/deployment.yaml
+++ b/test/integration/manifests/cilium/v1.16/cilium-operator/templates/deployment.yaml
@@ -38,6 +38,8 @@ spec:
         - --debug=$(CILIUM_DEBUG)
         - --identity-gc-interval=0m20s
         - --identity-heartbeat-timeout=0m20s
+        - --enable-cilium-endpoint-slice=true
+        - --ces-slice-mode=cesSliceModeFCFS
         env:
         - name: K8S_NODE_NAME
           valueFrom: