Skip to content

Commit 9e26536

Browse files
kasiakoziolkasiakoziol
committed
CSPL-3776 Adding more changes to every EKS based pipeline
1 parent 5c79c5b commit 9e26536

14 files changed

+160
-139
lines changed

‎.github/workflows/arm-AL2023-build-test-push-workflow-AL2023.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,9 @@ jobs:
146146
DEPLOYMENT_TYPE: ""
147147
ARM64: "true"
148148
GRAVITON_TESTING: "true"
149+
TEST_CLUSTER_NAME: cspl-3776-vcluster-test-karpenter
150+
TEST_VCLUSTER_NAME: al-smk-${{ matrix.test }}-${{ github.run_id }}
149151
steps:
150-
- name: Set Test Cluster Name
151-
run: |
152-
echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
153152
- name: Chekcout code
154153
uses: actions/checkout@v2
155154
- name: Dotenv Action
@@ -183,7 +182,7 @@ jobs:
183182
curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
184183
chmod 700 get_helm.sh
185184
./get_helm.sh
186-
DESIRED_VERSION=v3.8.2 bash get_helm.sh
185+
DESIRED_VERSION=v3.18.3 bash get_helm.sh
187186
- name: Install EKS CTL
188187
run: |
189188
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
@@ -214,11 +213,14 @@ jobs:
214213
uses: aws-actions/amazon-ecr-login@v1
215214
- name: Pull Splunk Enterprise Image
216215
run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }}
217-
- name: Create EKS cluster
216+
- name: Login to test cluster
218217
run: |
219-
export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
220-
export EKS_INSTANCE_TYPE=${{ steps.dotenv.outputs.EKS_INSTANCE_TYPE_ARM64 }}
221-
make cluster-up
218+
echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
219+
eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
220+
- name: Install vCluster CLI
221+
uses: loft-sh/setup-vcluster@main
222+
- name: Create Virtual Cluster
223+
run: vcluster create ${TEST_VCLUSTER_NAME}
222224
- name: install metric server
223225
run: |
224226
kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -250,7 +252,6 @@ jobs:
250252
run: |
251253
make cleanup
252254
make clean
253-
- name: Cleanup up EKS cluster
255+
- name: Delete Virtual Cluster
254256
if: ${{ always() }}
255-
run: |
256-
make cluster-down
257+
run: vcluster delete ${TEST_VCLUSTER_NAME}

‎.github/workflows/arm-AL2023-int-test-workflow.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,9 @@ jobs:
9494
DEPLOYMENT_TYPE: ""
9595
ARM64: "true"
9696
GRAVITON_TESTING: "true"
97+
TEST_CLUSTER_NAME: cspl-3776-vcluster-test-karpenter
98+
TEST_VCLUSTER_NAME: al-int-${{ matrix.test }}-${{ github.run_id }}
9799
steps:
98-
- name: Set Test Cluster Name
99-
run: |
100-
echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
101100
- name: Set Test Cluster Nodes and Parallel Runs
102101
run: >-
103102
if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -137,7 +136,7 @@ jobs:
137136
curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
138137
chmod 700 get_helm.sh
139138
./get_helm.sh
140-
DESIRED_VERSION=v3.8.2 bash get_helm.sh
139+
DESIRED_VERSION=v3.18.3 bash get_helm.sh
141140
- name: Install EKS CTL
142141
run: |
143142
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
@@ -164,11 +163,14 @@ jobs:
164163
uses: aws-actions/amazon-ecr-login@v1
165164
- name: Pull Splunk Enterprise Image
166165
run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }}
167-
- name: Create EKS cluster
166+
- name: Login to test cluster
168167
run: |
169-
export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
170-
export EKS_INSTANCE_TYPE=${{ steps.dotenv.outputs.EKS_INSTANCE_TYPE_ARM64 }}
171-
make cluster-up
168+
echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
169+
eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
170+
- name: Install vCluster CLI
171+
uses: loft-sh/setup-vcluster@main
172+
- name: Create Virtual Cluster
173+
run: vcluster create ${TEST_VCLUSTER_NAME}
172174
- name: install metric server
173175
run: |
174176
kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -199,7 +201,6 @@ jobs:
199201
run: |
200202
make cleanup
201203
make clean
202-
- name: Cleanup up EKS cluster
204+
- name: Delete Virtual Cluster
203205
if: ${{ always() }}
204-
run: |
205-
make cluster-down
206+
run: vcluster delete ${TEST_VCLUSTER_NAME}

‎.github/workflows/arm-RHEL-build-test-push-workflow.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,9 @@ jobs:
9494
DEPLOYMENT_TYPE: ""
9595
ARM64: "true"
9696
GRAVITON_TESTING: "true"
97+
TEST_CLUSTER_NAME: cspl-3776-vcluster-test-karpenter
98+
TEST_VCLUSTER_NAME: rh-smk-${{ matrix.test }}-${{ github.run_id }}
9799
steps:
98-
- name: Set Test Cluster Name
99-
run: |
100-
echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
101100
- name: Set Test Cluster Nodes and Parallel Runs
102101
run: >-
103102
if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -137,7 +136,7 @@ jobs:
137136
curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
138137
chmod 700 get_helm.sh
139138
./get_helm.sh
140-
DESIRED_VERSION=v3.8.2 bash get_helm.sh
139+
DESIRED_VERSION=v3.18.3 bash get_helm.sh
141140
- name: Install EKS CTL
142141
run: |
143142
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
@@ -164,11 +163,14 @@ jobs:
164163
uses: aws-actions/amazon-ecr-login@v1
165164
- name: Pull Splunk Enterprise Image
166165
run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }}
167-
- name: Create EKS cluster
166+
- name: Login to test cluster
168167
run: |
169-
export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
170-
export EKS_INSTANCE_TYPE=${{ steps.dotenv.outputs.EKS_INSTANCE_TYPE_ARM64 }}
171-
make cluster-up
168+
echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
169+
eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
170+
- name: Install vCluster CLI
171+
uses: loft-sh/setup-vcluster@main
172+
- name: Create Virtual Cluster
173+
run: vcluster create ${TEST_VCLUSTER_NAME}
172174
- name: install metric server
173175
run: |
174176
kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -199,7 +201,6 @@ jobs:
199201
run: |
200202
make cleanup
201203
make clean
202-
- name: Cleanup up EKS cluster
204+
- name: Delete Virtual Cluster
203205
if: ${{ always() }}
204-
run: |
205-
make cluster-down
206+
run: vcluster delete ${TEST_VCLUSTER_NAME}

‎.github/workflows/arm-RHEL-int-test-workflow.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,9 @@ jobs:
9494
DEPLOYMENT_TYPE: ""
9595
ARM64: "true"
9696
GRAVITON_TESTING: "true"
97+
TEST_CLUSTER_NAME: cspl-3776-vcluster-test-karpenter
98+
TEST_VCLUSTER_NAME: rh-int-${{ matrix.test }}-${{ github.run_id }}
9799
steps:
98-
- name: Set Test Cluster Name
99-
run: |
100-
echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
101100
- name: Set Test Cluster Nodes and Parallel Runs
102101
run: >-
103102
if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -137,7 +136,7 @@ jobs:
137136
curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
138137
chmod 700 get_helm.sh
139138
./get_helm.sh
140-
DESIRED_VERSION=v3.8.2 bash get_helm.sh
139+
DESIRED_VERSION=v3.18.3 bash get_helm.sh
141140
- name: Install EKS CTL
142141
run: |
143142
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
@@ -164,11 +163,14 @@ jobs:
164163
uses: aws-actions/amazon-ecr-login@v1
165164
- name: Pull Splunk Enterprise Image
166165
run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }}
167-
- name: Create EKS cluster
166+
- name: Login to test cluster
168167
run: |
169-
export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
170-
export EKS_INSTANCE_TYPE=${{ steps.dotenv.outputs.EKS_INSTANCE_TYPE_ARM64 }}
171-
make cluster-up
168+
echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
169+
eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
170+
- name: Install vCluster CLI
171+
uses: loft-sh/setup-vcluster@main
172+
- name: Create Virtual Cluster
173+
run: vcluster create ${TEST_VCLUSTER_NAME}
172174
- name: install metric server
173175
run: |
174176
kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -199,7 +201,6 @@ jobs:
199201
run: |
200202
make cleanup
201203
make clean
202-
- name: Cleanup up EKS cluster
204+
- name: Delete Virtual Cluster
203205
if: ${{ always() }}
204-
run: |
205-
make cluster-down
206+
run: vcluster delete ${TEST_VCLUSTER_NAME}

‎.github/workflows/arm-Ubuntu-build-test-push-workflow.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,9 @@ jobs:
146146
DEPLOYMENT_TYPE: ""
147147
ARM64: "true"
148148
GRAVITON_TESTING: "true"
149+
TEST_CLUSTER_NAME: cspl-3776-vcluster-test-karpenter
150+
TEST_VCLUSTER_NAME: ubnt-smk-${{ matrix.test }}-${{ github.run_id }}
149151
steps:
150-
- name: Set Test Cluster Name
151-
run: |
152-
echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
153152
- name: Chekcout code
154153
uses: actions/checkout@v2
155154
- name: Dotenv Action
@@ -183,7 +182,7 @@ jobs:
183182
curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
184183
chmod 700 get_helm.sh
185184
./get_helm.sh
186-
DESIRED_VERSION=v3.8.2 bash get_helm.sh
185+
DESIRED_VERSION=v3.18.3 bash get_helm.sh
187186
- name: Install EKS CTL
188187
run: |
189188
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
@@ -214,11 +213,14 @@ jobs:
214213
uses: aws-actions/amazon-ecr-login@v1
215214
- name: Pull Splunk Enterprise Image
216215
run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }}
217-
- name: Create EKS cluster
216+
- name: Login to test cluster
218217
run: |
219-
export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
220-
export EKS_INSTANCE_TYPE=${{ steps.dotenv.outputs.EKS_INSTANCE_TYPE_ARM64 }}
221-
make cluster-up
218+
echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
219+
eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
220+
- name: Install vCluster CLI
221+
uses: loft-sh/setup-vcluster@main
222+
- name: Create Virtual Cluster
223+
run: vcluster create ${TEST_VCLUSTER_NAME}
222224
- name: install metric server
223225
run: |
224226
kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -250,7 +252,6 @@ jobs:
250252
run: |
251253
make cleanup
252254
make clean
253-
- name: Cleanup up EKS cluster
255+
- name: Delete Virtual Cluster
254256
if: ${{ always() }}
255-
run: |
256-
make cluster-down
257+
run: vcluster delete ${TEST_VCLUSTER_NAME}

‎.github/workflows/arm-Ubuntu-int-test-workflow.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,9 @@ jobs:
9494
DEPLOYMENT_TYPE: ""
9595
ARM64: "true"
9696
GRAVITON_TESTING: "true"
97+
TEST_CLUSTER_NAME: cspl-3776-vcluster-test-karpenter
98+
TEST_VCLUSTER_NAME: ubnt-int-${{ matrix.test }}-${{ github.run_id }}
9799
steps:
98-
- name: Set Test Cluster Name
99-
run: |
100-
echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
101100
- name: Set Test Cluster Nodes and Parallel Runs
102101
run: >-
103102
if grep -q "appframework" <<< "${{ matrix.test }}"; then
@@ -137,7 +136,7 @@ jobs:
137136
curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
138137
chmod 700 get_helm.sh
139138
./get_helm.sh
140-
DESIRED_VERSION=v3.8.2 bash get_helm.sh
139+
DESIRED_VERSION=v3.18.3 bash get_helm.sh
141140
- name: Install EKS CTL
142141
run: |
143142
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
@@ -164,11 +163,14 @@ jobs:
164163
uses: aws-actions/amazon-ecr-login@v1
165164
- name: Pull Splunk Enterprise Image
166165
run: docker pull ${{ env.SPLUNK_ENTERPRISE_IMAGE }}
167-
- name: Create EKS cluster
166+
- name: Login to test cluster
168167
run: |
169-
export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
170-
export EKS_INSTANCE_TYPE=${{ steps.dotenv.outputs.EKS_INSTANCE_TYPE_ARM64 }}
171-
make cluster-up
168+
echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
169+
eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
170+
- name: Install vCluster CLI
171+
uses: loft-sh/setup-vcluster@main
172+
- name: Create Virtual Cluster
173+
run: vcluster create ${TEST_VCLUSTER_NAME}
172174
- name: install metric server
173175
run: |
174176
kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -199,10 +201,9 @@ jobs:
199201
run: |
200202
make cleanup
201203
make clean
202-
- name: Cleanup up EKS cluster
204+
- name: Delete Virtual Cluster
203205
if: ${{ always() }}
204-
run: |
205-
make cluster-down
206+
run: vcluster delete ${TEST_VCLUSTER_NAME}
206207
#- name: Test Report
207208
# uses: dorny/test-reporter@v1
208209
# if: success() || failure() # run this step even if previous step failed

‎.github/workflows/build-test-push-workflow.yml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,9 @@ jobs:
190190
EKS_SSH_PUBLIC_KEY: ${{ secrets.EKS_SSH_PUBLIC_KEY }}
191191
CLUSTER_WIDE: "true"
192192
DEPLOYMENT_TYPE: ""
193+
TEST_CLUSTER_NAME: cspl-3776-vcluster-test-karpenter
194+
TEST_VCLUSTER_NAME: eks-smk-${{ matrix.test }}-${{ github.run_id }}
193195
steps:
194-
- name: Set Test Cluster Name
195-
run: |
196-
echo "TEST_CLUSTER_NAME=eks-integration-test-cluster-${{ matrix.test }}-$GITHUB_RUN_ID" >> $GITHUB_ENV
197196
- name: Chekcout code
198197
uses: actions/checkout@v2
199198
- name: Dotenv Action
@@ -227,7 +226,7 @@ jobs:
227226
curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
228227
chmod 700 get_helm.sh
229228
./get_helm.sh
230-
DESIRED_VERSION=v3.8.2 bash get_helm.sh
229+
DESIRED_VERSION=v3.18.3 bash get_helm.sh
231230
- name: Install EKS CTL
232231
run: |
233232
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
@@ -262,10 +261,14 @@ jobs:
262261
run: |
263262
docker tag ${{ env.SPLUNK_ENTERPRISE_IMAGE }} ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
264263
docker push ${{ secrets.ECR_REPOSITORY }}/${{ env.SPLUNK_ENTERPRISE_IMAGE }}
265-
- name: Create EKS cluster
264+
- name: Login to test cluster
266265
run: |
267-
export EKS_CLUSTER_K8_VERSION=${{ steps.dotenv.outputs.EKS_CLUSTER_K8_VERSION }}
268-
make cluster-up
266+
echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}"
267+
eksctl utils write-kubeconfig --cluster=${TEST_CLUSTER_NAME}
268+
- name: Install vCluster CLI
269+
uses: loft-sh/setup-vcluster@main
270+
- name: Create Virtual Cluster
271+
run: vcluster create ${TEST_VCLUSTER_NAME}
269272
- name: install metric server
270273
run: |
271274
kubectl apply -f https://github.com/kubernetes-sigs/metrics-server/releases/latest/download/components.yaml
@@ -297,10 +300,9 @@ jobs:
297300
run: |
298301
make cleanup
299302
make clean
300-
- name: Cleanup up EKS cluster
303+
- name: Delete Virtual Cluster
301304
if: ${{ always() }}
302-
run: |
303-
make cluster-down
305+
run: vcluster delete ${TEST_VCLUSTER_NAME}
304306
#- name: Test Report
305307
# uses: dorny/test-reporter@v1
306308
# if: success() || failure() # run this step even if previous step failed

0 commit comments

Comments
 (0)