Merge pull request #2055 from CrowleyRajapakse/new-main4

Changing apim docker image to amd64 arch
wso2 · Mar 1, 2024 · 17126c1 · 17126c1
2 parents 4d9931f + 4f86a5c
commit 17126c1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/agent-integration-test.yml b/.github/workflows/agent-integration-test.yml
@@ -61,8 +61,9 @@ jobs:
         helm repo add jetstack https://charts.jetstack.io
         helm dependency build
         helm install apim -n apk . --debug --wait --timeout 5m0s \
-        --set deployment.image.respository=sampathrajapakse/wso2am \
-        --set deployment.image.tag=4.3.0 
+        --set wso2.deployment.image.registry=docker.io \
+        --set wso2.deployment.image.respository=rakhitharr/wso2am \
+        --set wso2.deployment.image.digest=sha256:6f647d64753462736bb1bc22b6fe675413278a02623a9c12609b3bc4d1f4a0ef
         kubectl get pods -n apk
         kubectl get svc -n apk
 
@@ -113,7 +114,7 @@ jobs:
       with:
         azcliversion: 2.44.1
         inlineScript: |
-          az aks delete --resource-group ${{ secrets.AZURE_RESOURCE_GROUP }} --name go-integ-${{ secrets.AKS_CLUSTER_NAME }}-${{ github.event.number || github.run_id }} --yes
+          az aks delete --resource-group ${{ secrets.AZURE_RESOURCE_GROUP }} --name agent-integ-${{ secrets.AKS_CLUSTER_NAME }}-${{ github.event.number || github.run_id }} --yes
     - name: Logout from azure
       if: always()
       uses: azure/CLI@v1

diff --git a/...gent-test/apim-cp-helm-chart/templates/control-plane/instance-1/wso2am-cp-deployment.yaml b/...gent-test/apim-cp-helm-chart/templates/control-plane/instance-1/wso2am-cp-deployment.yaml
@@ -62,7 +62,7 @@ spec:
           type: RuntimeDefault
       containers:
       - name: wso2am-control-plane
-        image: sampathrajapakse/wso2am:4.3.0
+        image: {{ .Values.wso2.deployment.image.registry }}/{{ .Values.wso2.deployment.image.repository }}@{{ .Values.wso2.deployment.image.digest }}
         imagePullPolicy: {{ .Values.wso2.deployment.imagePullPolicy }}
         env:
         - name: PROFILE_NAME

diff --git a/test/apim-apk-agent-test/apim-cp-helm-chart/values.yaml b/test/apim-apk-agent-test/apim-cp-helm-chart/values.yaml
@@ -167,7 +167,7 @@ kubernetes:
 
   securityContext:
     # -- User ID of the container
-    runAsUser: 802
+    runAsUser: 10001
   # -- Enable AppArmor profiles for the deployment
   enableAppArmor: false
 
@@ -363,11 +363,11 @@ wso2:
     # Container image configurations
     image:
       # -- Container registry hostname
-      registry: ""
+      registry: "docker.io"
       # -- Azure ACR repository name consisting the image
-      repository: "sampathrajapakse/wso2am"
+      repository: "rakhitharr/wso2am"
       # -- Docker image digest
-      digest: ""
+      digest: "sha256:6f647d64753462736bb1bc22b6fe675413278a02623a9c12609b3bc4d1f4a0ef"
       # -- Refer to the Kubernetes documentation on updating images (https://kubernetes.io/docs/concepts/containers/images/#updating-images)
       imagePullPolicy: Always