CSPL-3776 Initial changes for int-tests build

kasiakoziol · kasiakoziol · commit 2a1dbc927283 · 2025-07-04T11:49:30.000+02:00
diff --git a/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml b/.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml
@@ -117,7 +117,7 @@ jobs:
       matrix:
         test: [
                 basic,
-                appframeworksS1,
+                appframeworks1,
                 managersecret,
                 managermc,
                ]
diff --git a/.github/workflows/arm-AL2023-int-test-workflow.yml b/.github/workflows/arm-AL2023-int-test-workflow.yml
@@ -60,7 +60,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managersecret,
             managersmartstore,
             managermc1,
diff --git a/.github/workflows/arm-RHEL-build-test-push-workflow.yml b/.github/workflows/arm-RHEL-build-test-push-workflow.yml
@@ -60,7 +60,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managersecret,
             managersmartstore,
             managermc1,
diff --git a/.github/workflows/arm-RHEL-int-test-workflow.yml b/.github/workflows/arm-RHEL-int-test-workflow.yml
@@ -60,7 +60,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managersecret,
             managersmartstore,
             managermc1,
diff --git a/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml b/.github/workflows/arm-Ubuntu-build-test-push-workflow.yml
@@ -117,7 +117,7 @@ jobs:
       matrix:
         test: [
                 basic,
-                appframeworksS1,
+                appframeworks1,
                 managersecret,
                 managermc,
               ]
diff --git a/.github/workflows/arm-Ubuntu-int-test-workflow.yml b/.github/workflows/arm-Ubuntu-int-test-workflow.yml
@@ -60,7 +60,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managersecret,
             managersmartstore,
             managermc1,
diff --git a/.github/workflows/build-test-push-workflow.yml b/.github/workflows/build-test-push-workflow.yml
@@ -161,7 +161,7 @@ jobs:
       matrix:
         test: [
                 basic,
-                appframeworksS1,
+                appframeworks1,
                 managerappframeworkc3,
                 managerappframeworkm4,
                 managersecret,
diff --git a/.github/workflows/distroless-build-test-push-workflow.yml b/.github/workflows/distroless-build-test-push-workflow.yml
@@ -160,7 +160,7 @@ jobs:
       matrix:
         test: [
           basic,
-          appframeworksS1,
+          appframeworks1,
           managerappframeworkc3,
           managerappframeworkm4,
           managersecret,
diff --git a/.github/workflows/distroless-int-test-workflow.yml b/.github/workflows/distroless-int-test-workflow.yml
@@ -54,7 +54,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managerappframeworkc3,
             managerappframeworkm4,
             managersecret,
diff --git a/.github/workflows/int-test-workflow.yml b/.github/workflows/int-test-workflow.yml
@@ -5,6 +5,7 @@ on:
       - develop
       - main
       - feature**
+      - CSPL-3776-vcluster-enablement
 jobs:
   build-operator-image:
     runs-on: ubuntu-latest
@@ -51,7 +52,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managerappframeworkc3,
             managerappframeworkm4,
             managersecret,
@@ -84,16 +85,15 @@ jobs:
       ENTERPRISE_LICENSE_LOCATION: ${{ secrets.ENTERPRISE_LICENSE_LOCATION }}
       CLUSTER_WIDE: "true"
       DEPLOYMENT_TYPE: ""
+      TEST_CLUSTER_NAME: cspl-3776-vcluster-test
+      TEST_VCLUSTER_NAME: eks-integ-${{ matrix.test }}-${{ github.run_id }}
     steps:
-      - name: Set Test Cluster Name
-        run: |
-          echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
       - name: Set Test Cluster Nodes and Parallel Runs
         run: >-
-          if grep -q "appframework" <<< "${{ matrix.test }}"; then
-            echo "CLUSTER_WORKERS=5" >> $GITHUB_ENV
-            echo "CLUSTER_NODES=2" >> $GITHUB_ENV
-          fi
+            if grep -q "appframework" <<< "${{ matrix.test }}"; then
+              echo "CLUSTER_WORKERS=5" >> $GITHUB_ENV
+              echo "CLUSTER_NODES=2" >> $GITHUB_ENV
+            fi
       - name: Checkcout code
         uses: actions/checkout@v2
       - name: Dotenv Action
@@ -127,7 +127,7 @@ jobs:
           curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
           chmod 700 get_helm.sh
           ./get_helm.sh
-          DESIRED_VERSION=v3.8.2 bash get_helm.sh
+          DESIRED_VERSION=v3.10.0 bash get_helm.sh
       - name: Install EKS CTL
         run: |
           curl --silent --insecure --location "https://github.com/weaveworks/eksctl/releases/download/${{ steps.dotenv.outputs.EKSCTL_VERSION }}/eksctl_$(uname -s)_amd64.tar.gz" | tar xz -C /tmp
@@ -158,10 +158,14 @@ jobs:
         run: |
           docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
           docker push ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
-      - name: Create EKS cluster
-        run: |
-          export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
-          make cluster-up
+      - name: Login to test cluster
+        run: |
+          echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
+          eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
+      - name: Install vCluster CLI
+        uses: loft-sh/setup-vcluster@main
+      - name: Create Virtual Cluster
+        run: vcluster create ${TEST_VCLUSTER_NAME}
       - name: install metric server
         run: |
           kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -192,10 +196,8 @@ jobs:
         run: |
           make cleanup
           make clean
-      - name: Cleanup up EKS cluster
-        if: ${{ always() }}
-        run: |
-          make cluster-down
+      - name: Delete Virtual Cluster
+        run: vcluster delete ${TEST_VCLUSTER_NAME}
       #- name: Test Report
       #  uses: dorny/test-reporter@v1
       #  if: success() || failure()    # run this step even if previous step failed
diff --git a/.github/workflows/manual-int-test-workflow.yml b/.github/workflows/manual-int-test-workflow.yml
@@ -13,7 +13,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managerappframeworkc3,
             managerappframeworkm4,
             managersecret,
diff --git a/.github/workflows/namespace-scope-int-workflow.yml b/.github/workflows/namespace-scope-int-workflow.yml
@@ -9,7 +9,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managerappframeworkc3,
             managerappframeworkm4,
             managersecret,
diff --git a/.github/workflows/nightly-int-test-workflow.yml b/.github/workflows/nightly-int-test-workflow.yml
@@ -49,7 +49,7 @@ jobs:
       matrix:
         test:
           [
-            appframeworksS1,
+            appframeworks1,
             managerappframeworkc3,
             managerappframeworkm4,
             managersecret,
diff --git a/test/appframework_aws/s1/appframework_aws_test.go b/test/appframework_aws/s1/appframework_aws_test.go
@@ -80,7 +80,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then upgrade them", func() {
+		It("smoke, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then upgrade them", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -253,7 +253,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then downgrade them", func() {
+		It("smoke, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps then downgrade them", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -418,7 +418,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("s1, smoke, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, install apps on new pod, scale down", func() {
+		It("s1, smoke, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, install apps on new pod, scale down", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -615,7 +615,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("s1, integration, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, upgrade apps", func() {
+		It("s1, integration, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps, scale up, upgrade apps", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -750,7 +750,7 @@ var _ = Describe("s1appfw test", func() {
 
 	// ES App Installation not supported at the time. Will be added back at a later time.
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("s1, integration, appframeworksS1, appframework: can deploy a Standalone and have ES app installed", func() {
+		It("s1, integration, appframeworks1, appframework: can deploy a Standalone and have ES app installed", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -852,7 +852,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled and install around 350MB of apps at once", func() {
+		It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled and install around 350MB of apps at once", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -922,7 +922,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("s1, smoke, appframeworksS1, appframework: can deploy a standalone instance with App Framework enabled for manual poll", func() {
+		It("s1, smoke, appframeworks1, appframework: can deploy a standalone instance with App Framework enabled for manual poll", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -1113,7 +1113,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: can deploy Several standalone CRs in the same namespace with App Framework enabled", func() {
+		It("integration, s1, appframeworks1, appframework: can deploy Several standalone CRs in the same namespace with App Framework enabled", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -1216,7 +1216,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: can add new apps to app source while install is in progress and have all apps installed", func() {
+		It("integration, s1, appframeworks1, appframework: can add new apps to app source while install is in progress and have all apps installed", func() {
 
 			/* Test Steps
 				################## SETUP ####################
@@ -1330,7 +1330,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app install is in progress", func() {
+		It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app install is in progress", func() {
 
 			/* Test Steps
 				################## SETUP ####################
@@ -1427,7 +1427,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app download is in progress", func() {
+		It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and reset operator pod while app download is in progress", func() {
 
 			/* Test Steps
 				################## SETUP ####################
@@ -1496,7 +1496,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install an app then disable it and remove it from app source", func() {
+		It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install an app then disable it and remove it from app source", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -1591,7 +1591,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, attempt to update using incorrect S3 credentials", func() {
+		It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, attempt to update using incorrect S3 credentials", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -1729,7 +1729,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and update apps after app download is completed", func() {
+		It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and update apps after app download is completed", func() {
 
 			/* Test Steps
 			################## SETUP ####################
@@ -1814,7 +1814,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: can deploy a Standalone instance and install a bigger volume of apps than the operator PV disk space", func() {
+		It("integration, s1, appframeworks1, appframework: can deploy a Standalone instance and install a bigger volume of apps than the operator PV disk space", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################
@@ -1890,7 +1890,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("integration, s1, appframeworksS1, appframework: Deploy a Standalone instance with App Framework enabled and delete apps from app directory when app download is complete", func() {
+		It("integration, s1, appframeworks1, appframework: Deploy a Standalone instance with App Framework enabled and delete apps from app directory when app download is complete", func() {
 
 			/* Test Steps
 				################## SETUP ####################
@@ -1962,7 +1962,7 @@ var _ = Describe("s1appfw test", func() {
 	})
 
 	Context("Standalone deployment (S1) with App Framework", func() {
-		It("smoke, s1, appframeworksS1, appframework: can deploy a Standalone instance with App Framework enabled, install apps and check isDeploymentInProgress is set for Standaloen and MC CR's", func() {
+		It("smoke, s1, appframeworks1, appframework: can deploy a Standalone instance with App Framework enabled, install apps and check isDeploymentInProgress is set for Standaloen and MC CR's", func() {
 
 			/* Test Steps
 			   ################## SETUP ####################

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ jobs:`
`117`	`117`	`matrix:`
`118`	`118`	`test: [`
`119`	`119`	`basic,`
`120`		`- appframeworksS1,`
	`120`	`+ appframeworks1,`
`121`	`121`	`managersecret,`
`122`	`122`	`managermc,`
`123`	`123`	`]`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ jobs:`
`60`	`60`	`matrix:`
`61`	`61`	`test:`
`62`	`62`	`[`
`63`		`- appframeworksS1,`
	`63`	`+ appframeworks1,`
`64`	`64`	`managersecret,`
`65`	`65`	`managersmartstore,`
`66`	`66`	`managermc1,`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ jobs:`
`54`	`54`	`matrix:`
`55`	`55`	`test:`
`56`	`56`	`[`
`57`		`- appframeworksS1,`
	`57`	`+ appframeworks1,`
`58`	`58`	`managerappframeworkc3,`
`59`	`59`	`managerappframeworkm4,`
`60`	`60`	`managersecret,`