fix: fix label and add render chart command (#1694)

* fix label and add render chart command

* go version

* fix trivy pipeline

Author: akshaysngupta

.github/workflows/merge-build.yml

@@ -33,7 +33,7 @@ jobs:
     - name: Set up Go
       uses: actions/[email protected]
       with:
-        go-version: '1.22.5'
+        go-version: '1.23.6'
     - name: Go and Helm lint check
       run: make lint-all
     - name: Go vet

.github/workflows/vuln-scanner.yml

@@ -26,18 +26,33 @@ jobs:
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4
+    - name: Set up Go
+      uses: actions/[email protected]
+      with:
+        go-version: '1.23.6'
+    
     - name: Build AGIC docker image
       run: make build-image
+    
     - name: Run Trivy vulnerability scanner
       uses: aquasecurity/[email protected]
       with:
         image-ref: 'appgwreg.azurecr.io/public/azure-application-gateway/kubernetes-ingress-staging:latest'
-        format: 'sarif'
-        output: 'trivy-results.sarif'
+        format: 'json'
+        output: 'trivy-results.json'
         exit-code: '1'
         ignore-unfixed: true
         vuln-type: 'os,library'
         severity: 'CRITICAL,HIGH'
+
+    - name: Convert JSON to SARIF
+      if: always()
+      run: trivy convert --format sarif -o trivy-results.sarif trivy-results.json
+
+    - name: Convert JSON to Table Format
+      if: always()
+      run: trivy convert --format table trivy-results.json
+
     - name: Upload Trivy scan results to GitHub Security tab
       uses: github/codeql-action/[email protected]
       if: always()

Makefile

@@ -92,6 +92,9 @@ lint:
 lint-helm:
 	helm lint ./helm/ingress-azure
 
+render-chart:
+	RENDER_SNAPSHOTS="true" go test -tags=unittest ./helm/ingress-azure/tests/...
+
 vet-all: vet vet-unittest vet-e2e
 
 vet:

helm/ingress-azure/templates/cleanup-job.yaml

@@ -34,9 +34,9 @@ spec:
           - "overlayextensionconfigs.acn.azure.com"
           - "-l"
 {{- if .Values.addon }}
-          - "app.kubernetes.io/managed-by=ingress-azure-addon"
+          - "app.kubernetes.io/managed-by=ingress-appgw-addon"
 {{- else }}
-          - "app.kubernetes.io/managed-by=ingress-azure-helm"
+          - "app.kubernetes.io/managed-by=ingress-appgw-helm"
 {{- end }}
         securityContext:
           capabilities:

helm/ingress-azure/tests/snapshots/sample-config-addon/ingress-azure/templates/cleanup-job.yaml

@@ -35,7 +35,7 @@ spec:
           - "$(AGIC_POD_NAMESPACE)"
           - "overlayextensionconfigs.acn.azure.com"
           - "-l"
-          - "app.kubernetes.io/managed-by=ingress-azure-addon"
+          - "app.kubernetes.io/managed-by=ingress-appgw-addon"
         securityContext:
           capabilities:
             drop:

helm/ingress-azure/tests/snapshots/sample-config-empty/ingress-azure/templates/cleanup-job.yaml

@@ -35,7 +35,7 @@ spec:
           - "$(AGIC_POD_NAMESPACE)"
           - "overlayextensionconfigs.acn.azure.com"
           - "-l"
-          - "app.kubernetes.io/managed-by=ingress-azure-helm"
+          - "app.kubernetes.io/managed-by=ingress-appgw-helm"
         securityContext:
           capabilities:
             drop:

helm/ingress-azure/tests/snapshots/sample-config-existing-secret/ingress-azure/templates/cleanup-job.yaml

@@ -35,7 +35,7 @@ spec:
           - "$(AGIC_POD_NAMESPACE)"
           - "overlayextensionconfigs.acn.azure.com"
           - "-l"
-          - "app.kubernetes.io/managed-by=ingress-azure-helm"
+          - "app.kubernetes.io/managed-by=ingress-appgw-helm"
         securityContext:
           capabilities:
             drop:

helm/ingress-azure/tests/snapshots/sample-config-prohibited-target/ingress-azure/templates/cleanup-job.yaml

@@ -35,7 +35,7 @@ spec:
           - "$(AGIC_POD_NAMESPACE)"
           - "overlayextensionconfigs.acn.azure.com"
           - "-l"
-          - "app.kubernetes.io/managed-by=ingress-azure-helm"
+          - "app.kubernetes.io/managed-by=ingress-appgw-helm"
         securityContext:
           capabilities:
             drop:

helm/ingress-azure/tests/snapshots/sample-config-workload-identity/ingress-azure/templates/cleanup-job.yaml

@@ -35,7 +35,7 @@ spec:
           - "$(AGIC_POD_NAMESPACE)"
           - "overlayextensionconfigs.acn.azure.com"
           - "-l"
-          - "app.kubernetes.io/managed-by=ingress-azure-helm"
+          - "app.kubernetes.io/managed-by=ingress-appgw-helm"
         securityContext:
           capabilities:
             drop:

helm/ingress-azure/tests/snapshots/sample-config/ingress-azure/templates/cleanup-job.yaml

@@ -35,7 +35,7 @@ spec:
           - "$(AGIC_POD_NAMESPACE)"
           - "overlayextensionconfigs.acn.azure.com"
           - "-l"
-          - "app.kubernetes.io/managed-by=ingress-azure-helm"
+          - "app.kubernetes.io/managed-by=ingress-appgw-helm"
         securityContext:
           capabilities:
             drop: