ci: add job for sidecar container feature

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
kumahq · Feb 21, 2024 · e1cec89 · e1cec89
1 parent 653fd37
commit e1cec89
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -36,9 +36,9 @@ parameters:
   e2e_param_cniNetworkPlugin:
     type: string
     default: flannel
-  e2e_param_legacyKDS:
-    type: boolean
-    default: false
+  e2e_param_sidecarContainers:
+    type: string
+    default: ""
 # See https://circleci.com/docs/2.0/configuration-reference/#commands-requires-version-21.
 commands:
   install_build_tools:
@@ -265,8 +265,8 @@ jobs:
         description: The CNI networking plugin to use [flannel | calico]
         type: string
         default: flannel
-      legacyKDS:
-        description: if should run tests with new implementation of KDS
+      sidecarContainers:
+        description: if should run tests with sidecar containers
         type: boolean
         default: false
     executor:
@@ -285,7 +285,7 @@ jobs:
               - {equal: [calico, << parameters.cniNetworkPlugin >>]}
               - {equal: [kindIpv6, << parameters.k8sVersion >>]}
               - {equal: [arm64, << parameters.arch >>]}
-              - {equal: [true, << parameters.legacyKDS >>]}
+              # - {equal: [true, << parameters.sidecarContainers >>]}
               - {equal: [<< pipeline.parameters.first_k8s_version >>, << parameters.k8sVersion >>]}
           steps:
             - halt_non_priority_job
@@ -362,8 +362,8 @@ jobs:
               export MAKE_PARAMETERS="-j2"
             fi
 
-            if [[ "<< parameters.legacyKDS >>" == true ]]; then
-              export KUMA_LEGACY_KDS=true
+            if [[ "<< parameters.sidecarContainers >>" == true ]]; then
+              export KUMA_EXPERIMENTAL_SIDECAR_CONTAINERS=true
             fi
 
             if [[ "<< parameters.target >>" == "" ]]; then
@@ -403,8 +403,8 @@ jobs:
         description: The CNI networking plugin to use [flannel | calico]
         type: string
         default: flannel
-      legacyKDS:
-        description: if should run tests with new implementation of KDS
+      sidecarContainers:
+        description: if should run tests with sidecar containers
         type: boolean
     executor:
       name: vm-<< parameters.arch >>
@@ -471,8 +471,8 @@ jobs:
               export MAKE_PARAMETERS="-j2"
             fi
 
-            if [[ "<< parameters.legacyKDS >>" == true ]]; then
-              export KUMA_LEGACY_KDS=true
+            if [[ "<< parameters.sidecarContainers >>" == true ]]; then
+              export KUMA_EXPERIMENTAL_SIDECAR_CONTAINERS=true
             fi
 
             if [[ "<< parameters.target >>" == "" ]]; then
@@ -625,14 +625,14 @@ workflows:
               arch: [amd64, arm64]
           requires: [build, go_cache-<< matrix.arch >>]
       - e2e:
-          name: << matrix.target >>:<< matrix.arch >>-<< matrix.k8sVersion >>-legacy-kds
+          name: << matrix.target >>:<< matrix.arch >>-<< matrix.k8sVersion >>-sidecar-containers
           matrix:
-            alias: legacy-kds
+            alias: sidecar-containers
             parameters:
               k8sVersion: [<< pipeline.parameters.last_k8s_version >>]
-              target: [multizone]
+              target: [kubernetes]
               arch: [amd64]
-              legacyKDS: [true]
+              sidecarContainers: [true]
           requires: [build, go_cache-amd64]
       - e2e:
           name: << matrix.target >>:<< matrix.arch >>-<< matrix.k8sVersion >>-calico
@@ -661,6 +661,6 @@ workflows:
           k8sVersion: << pipeline.parameters.e2e_param_k8sVersion >>
           target: << pipeline.parameters.e2e_param_target >>
           arch: << pipeline.parameters.e2e_param_arch >>
-          legacyKDS: << pipeline.parameters.e2e_param_legacyKDS >>
+          sidecarContainers: {not: {equal: [<< pipeline.parameters.e2e_param_sidecarContainers >>, ""]}}
           cniNetworkPlugin: << pipeline.parameters.e2e_param_cniNetworkPlugin >>
           parallelism: << pipeline.parameters.e2e_param_parallelism >>
diff --git a/.github/workflows/build-test-distribute.yaml b/.github/workflows/build-test-distribute.yaml
@@ -221,23 +221,23 @@ jobs:
                 "arch": ["amd64"],
                 "parallelism": [4],
                 "cniNetworkPlugin": ["flannel"],
-                "legacyKDS": [false]
+                "sidecarContainers": [""]
               },
               "test_e2e_env": {
                 "target": ["kubernetes", "universal", "multizone"],
                 "k8sVersion": ["kind", "kindIpv6", "${{ env.K8S_MIN_VERSION }}", "${{ env.K8S_MAX_VERSION }}"],
                 "arch": ["amd64"],
                 "parallelism": [1],
                 "cniNetworkPlugin": ["flannel"],
-                "legacyKDS": [false],
+                "sidecarContainers": [""],
                 "exclude":[
                   {"target": "kubernetes", "k8sVersion":"kind"},
                   {"target": "multizone", "k8sVersion":"kind"},
                   {"target":"universal", "k8sVersion":"${{ env.K8S_MIN_VERSION }}"},
                   {"target":"universal", "k8sVersion":"${{ env.K8S_MAX_VERSION }}"}
                 ],
                 "include":[
-                  {"legacyKDS": true, "k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "multizone", "arch": "amd64"},
+                  {"sidecarContainers": "sidecarContainers", "k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "multizone", "arch": "amd64"},
                   {"k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "multizone", "arch": "arm64"},
                   {"k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "kubernetes", "arch": "arm64"},
                   {"k8sVersion": "${{ env.K8S_MAX_VERSION }}", "target": "universal", "arch": "arm64"},

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -17,7 +17,7 @@ env:
   E2E_PARAM_K8S_VERSION: ${{ fromJSON(inputs.matrix).k8sVersion }}
   E2E_PARAM_CNI_NETWORK_PLUGIN: ${{ fromJSON(inputs.matrix).cniNetworkPlugin }}
   E2E_PARAM_ARCH: ${{ fromJSON(inputs.matrix).arch }}
-  E2E_PARAM_LEGACY_KDS: ${{ fromJSON(inputs.matrix).legacyKDS }}
+  E2E_PARAM_SIDECAR_CONTAINERS: ${{ fromJSON(inputs.matrix).sidecarContainers }}
   E2E_PARAM_TARGET: ${{ fromJSON(inputs.matrix).target }}
   E2E_PARAM_PARALLELISM: ${{ fromJSON(inputs.matrix).parallelism }}
   CI_TOOLS_DIR: /home/runner/work/kuma/kuma/.ci_tools
@@ -124,8 +124,8 @@ jobs:
             export MAKE_PARAMETERS="-j2"
           fi
 
-          if [[ "${{ env.E2E_PARAM_LEGACY_KDS }}" == "true" ]]; then
-            export KUMA_LEGACY_KDS=true
+          if [[ "${{ env.E2E_PARAM_SIDECAR_CONTAINERS }}" != "" ]]; then
+            export KUMA_EXPERIMENTAL_SIDECAR_CONTAINERS=true
           fi
 
           if [[ "${{ env.E2E_PARAM_TARGET }}" == "" ]]; then