From ba81735c663d1c476bbc2fd72b12ee358dbe5b47 Mon Sep 17 00:00:00 2001
From: Nilekh Chaudhari <1626598+nilekhc@users.noreply.github.com>
Date: Wed, 5 Oct 2022 10:10:38 -0700
Subject: [PATCH] fix: updates template condition for Arc (#973)

Signed-off-by: Nilekh Chaudhari <1626598+nilekhc@users.noreply.github.com>
---
 .../templates/provider-azure-installer.yaml               | 8 ++++++--
 test/e2e/framework/helm/helm.go                           | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/charts/csi-secrets-store-provider-azure/templates/provider-azure-installer.yaml b/charts/csi-secrets-store-provider-azure/templates/provider-azure-installer.yaml
index 02ae87afd..5f3603c4d 100644
--- a/charts/csi-secrets-store-provider-azure/templates/provider-azure-installer.yaml
+++ b/charts/csi-secrets-store-provider-azure/templates/provider-azure-installer.yaml
@@ -22,14 +22,18 @@ spec:
 {{- if .Values.linux.podAnnotations}}
 {{- toYaml .Values.linux.podAnnotations | nindent 8 }}
 {{- end }}
-{{- if and .Values.enableArcExtension .Values.arc.enableMonitoring }}
+{{- if .Values.enableArcExtension }}
+{{- if .Values.arc.enableMonitoring }}
         prometheus.io/scrape: "true" 
         prometheus.io/port: "8898"
 {{- end }}
+{{- end }}
 # this will ensure pods are rolled in next helm upgrade if cert files are updated.
-{{- if and .Values.enableArcExtension .Values.Azure.proxySettings.isProxyEnabled }}
+{{- if .Values.enableArcExtension }}
+{{- if .Values.Azure.proxySettings.isProxyEnabled }}
         checksum/arc-proxy-config: {{ include (print $.Template.BasePath "/arc-proxy-secret.yaml") . | sha256sum }}
 {{- end }}
+{{- end }}
 {{- end }}
     spec:
       {{- if .Values.imagePullSecrets }}
diff --git a/test/e2e/framework/helm/helm.go b/test/e2e/framework/helm/helm.go
index 39156ad90..36c82bc86 100644
--- a/test/e2e/framework/helm/helm.go
+++ b/test/e2e/framework/helm/helm.go
@@ -51,6 +51,7 @@ func Install(input InstallInput) {
 		fmt.Sprintf("--set=secrets-store-csi-driver.rotationPollInterval=30s"),
 		fmt.Sprintf("--set=secrets-store-csi-driver.syncSecret.enabled=true"),
 		fmt.Sprintf(`--set=secrets-store-csi-driver.tokenRequests[0].audience=api://AzureADTokenExchange`),
+		fmt.Sprintf(`--set=linux.podAnnotations.foo=bar`),
 		fmt.Sprintf("--set=logVerbosity=5"),
 		fmt.Sprintf("--set=linux.customUserAgent=csi-e2e"),
 		fmt.Sprintf("--set=windows.customUserAgent=csi-e2e"),