Merge pull request #1333 from snyk/staging

RELEASE
snyk · Jun 23, 2023 · 9534140 · 9534140
2 parents 6865656 + edc7f7e
commit 9534140
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/snyk-monitor/README.md b/snyk-monitor/README.md
@@ -308,6 +308,25 @@ helm upgrade --install snyk-monitor snyk-charts/snyk-monitor \
   --set volumes.projected.serviceAccountToken=true
 ```
 
+## Using AKS with Managed Identities
+
+For the particular case when you are using AKS with user-managed identities to authorize access to ACR and there are multiple identities that assign the `AcrPull` role to the VM scale set, you must also specify the Client ID of the desired user-managed identity to be used. This value must be set as an override, in `.Values.azureEnvVars`:
+```yaml
+azureEnvVars:
+  - name: AZURE_CLIENT_ID
+    value: "abcd1234-abcd-1234-abcd-1234abcd1234"
+```
+
+With the YAML above saved in `override.yaml`, run the following:
+
+```shell
+helm upgrade --install snyk-monitor snyk-charts/snyk-monitor \
+  --namespace snyk-monitor \
+  -f override.yaml
+```
+
+By default, this value is an empty string, and it will not be used as such.
+
 ## Configuring resources
 
 If more resources is required in order to deploy snyk-monitor, you can configure the helm charts default value for requests and limits with the `--set` flag.

diff --git a/snyk-monitor/templates/deployment.yaml b/snyk-monitor/templates/deployment.yaml
@@ -204,6 +204,15 @@ spec:
           {{- with .Values.envs }}
           {{- toYaml . | trim | nindent 10 -}}
           {{- end }}
+          {{- with .Values.nodeEnvVars }}
+          {{- toYaml . | trim | nindent 10 -}}
+          {{- end }}
+          {{- range $v := .Values.azureEnvVars }}
+          {{- if $v.value }}
+          - name: {{ $v.name }}
+            value: {{ quote $v.value }}
+          {{- end }}
+          {{- end }}
           resources:
             {{- with .Values.requests }}
             requests:

diff --git a/snyk-monitor/values.yaml b/snyk-monitor/values.yaml
@@ -69,15 +69,23 @@ rbac:
     annotations: {}
     labels: {}
 
-# Node.js in-container process memory enhancements
+# General-purpose environment variables
 envs:
+
+# Node.js in-container process memory enhancements
+nodeEnvVars:
   - name: V8_MAX_OLD_SPACE_SIZE
     value: "2048"
   - name: UV_THREADPOOL_SIZE
     value: "24"
   - name: NODE_OPTIONS
     value: --max_old_space_size=2048
 
+# Variables related to AKS
+azureEnvVars:
+  - name: AZURE_CLIENT_ID
+    value: ""
+
 extraCaCerts: /srv/app/certs/ca.pem
 
 # CPU/Mem requests and limits for snyk-monitor