Skip to content

fix(helm): coerce OmsAgent.isUsingAADAuth to a boolean #1679

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rashmichandrashekar merged 2 commits into from
May 13, 2026
Merged

fix(helm): coerce OmsAgent.isUsingAADAuth to a boolean #1679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8041589
fix(helm): coerce OmsAgent.isUsingAADAuth to a boolean
rashmichandrashekar May 12, 2026
a1c3a2d
Fix isUsingAADAuth string truthiness in azuremonitor-containerinsight…
rashmichandrashekar May 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions charts/azuremonitor-containerinsights-for-prod-clusters/templates/ama-logs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@
{{- $addonTokenAdapterWindowsDefaultImageTag := dict "component" "addon-token-adapter-windows" "version" .Values.global.commonGlobals.Versions.Kubernetes | include "get.imagetag"}}
{{- $amalogsRSVPAImageTag := dict "component" "addon-resizer" "version" .Values.global.commonGlobals.Versions.Kubernetes | include "get.addonImageTag" -}}
{{- $WinImageTag := default $amalogsWindowsDefaultImageTag .Values.OmsAgent.imageTagWindows -}}
{{/* Determine isusingaadauth value from OmsAgent.isUsingAADAuth */}}
{{/* Determine isusingaadauth value from OmsAgent.isUsingAADAuth.
Compare as a lowercased string because Helm --set and quoted YAML
both deliver this value as a string, and any non-empty string is
truthy in Go templates (so "false" would otherwise evaluate to true). */}}
{{- $isusingaadauth := false -}}
{{- if hasKey .Values.OmsAgent "isUsingAADAuth" -}}
{{- $isusingaadauth = .Values.OmsAgent.isUsingAADAuth -}}
{{- if eq (lower (toString .Values.OmsAgent.isUsingAADAuth)) "true" -}}
{{- $isusingaadauth = true -}}
{{- end -}}
{{- end -}}
{{/* TODO This needs to be fixed post Canary validation */}}
{{/* Extract cluster information from aksresourceid */}}
Expand Down
13 changes: 10 additions & 3 deletions charts/azuremonitor-containerinsights/templates/ama-logs-daemonset-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
{{- $arcSettings := include "arc-extension-settings" . | fromYaml }}
{{- $isArcExtension := $arcSettings.isArcExtension }}
{{- $amalogsWindowsDefaultImageTag := dict "component" "ama-logs-win" "version" .Values.global.commonGlobals.Versions.Kubernetes | include "get.addonImageTag" }}
{{/* Determine isusingaadauth value */}}
{{/* Determine isusingaadauth value.
Compare as a lowercased string because Helm --set and quoted YAML
both deliver this value as a string, and any non-empty string is
truthy in Go templates (so "false" would otherwise evaluate to true). */}}
{{- $isusingaadauth := false -}}
{{- if not $isArcExtension -}}
{{- if hasKey .Values.OmsAgent "isUsingAADAuth" -}}
{{- $isusingaadauth = .Values.OmsAgent.isUsingAADAuth -}}
{{- if eq (lower (toString .Values.OmsAgent.isUsingAADAuth)) "true" -}}
{{- $isusingaadauth = true -}}
{{- end -}}
{{- end -}}
{{- else -}}
{{- if and .Values.amalogs (hasKey .Values.amalogs "useAADAuth") -}}
{{- $isusingaadauth = .Values.amalogs.useAADAuth -}}
{{- if eq (lower (toString .Values.amalogs.useAADAuth)) "true" -}}
{{- $isusingaadauth = true -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- $cloudEnv := lower .Values.global.commonGlobals.CloudEnvironment }}
Expand Down
13 changes: 10 additions & 3 deletions charts/azuremonitor-containerinsights/templates/ama-logs-daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
{{- $arcSettings := include "arc-extension-settings" . | fromYaml }}
{{- $isArcExtension := $arcSettings.isArcExtension }}
{{- $amalogsLinuxDefaultImageTag := dict "component" "ama-logs-linux" "version" .Values.global.commonGlobals.Versions.Kubernetes | include "get.addonImageTag" }}
{{/* Determine isusingaadauth value */}}
{{/* Determine isusingaadauth value.
Compare as a lowercased string because Helm --set and quoted YAML
both deliver this value as a string, and any non-empty string is
truthy in Go templates (so "false" would otherwise evaluate to true). */}}
{{- $isusingaadauth := false -}}
{{- if not $isArcExtension -}}
{{- if hasKey .Values.OmsAgent "isUsingAADAuth" -}}
{{- $isusingaadauth = .Values.OmsAgent.isUsingAADAuth -}}
{{- if eq (lower (toString .Values.OmsAgent.isUsingAADAuth)) "true" -}}
{{- $isusingaadauth = true -}}
{{- end -}}
{{- end -}}
{{- else -}}
{{- if and .Values.amalogs (hasKey .Values.amalogs "useAADAuth") -}}
{{- $isusingaadauth = .Values.amalogs.useAADAuth -}}
{{- if eq (lower (toString .Values.amalogs.useAADAuth)) "true" -}}
{{- $isusingaadauth = true -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/* Outer condition: AKS always renders, Arc renders with valid credentials */}}
Expand Down
9 changes: 7 additions & 2 deletions charts/azuremonitor-containerinsights/templates/ama-logs-deployment-multitenancy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,15 @@
{{/* AKS-only resource */}}
{{- if not $isArcExtension }}
{{- $amalogsLinuxDefaultImageTag := dict "component" "ama-logs-linux" "version" .Values.global.commonGlobals.Versions.Kubernetes | include "get.addonImageTag" }}
{{/* Determine isusingaadauth value */}}
{{/* Determine isusingaadauth value.
Compare as a lowercased string because Helm --set and quoted YAML
both deliver this value as a string, and any non-empty string is
truthy in Go templates (so "false" would otherwise evaluate to true). */}}
{{- $isusingaadauth := false -}}
{{- if hasKey .Values.OmsAgent "isUsingAADAuth" -}}
{{- $isusingaadauth = .Values.OmsAgent.isUsingAADAuth -}}
{{- if eq (lower (toString .Values.OmsAgent.isUsingAADAuth)) "true" -}}
{{- $isusingaadauth = true -}}
{{- end -}}
{{- end -}}
{{- $cloudEnv := lower .Values.global.commonGlobals.CloudEnvironment }}
{{- if and $isusingaadauth .Values.OmsAgent.isMultitenancyLogsEnabled }}
Expand Down
13 changes: 10 additions & 3 deletions charts/azuremonitor-containerinsights/templates/ama-logs-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,22 @@
{{- $isArcExtension := $arcSettings.isArcExtension }}
{{- $amalogsLinuxDefaultImageTag := dict "component" "ama-logs-linux" "version" .Values.global.commonGlobals.Versions.Kubernetes | include "get.addonImageTag" }}
{{- $amalogsRSVPAImageTag := dict "component" "addon-resizer" "version" .Values.global.commonGlobals.Versions.Kubernetes | include "get.addonImageTag" -}}
{{/* Determine isusingaadauth value */}}
{{/* Determine isusingaadauth value.
Compare as a lowercased string because Helm --set and quoted YAML
both deliver this value as a string, and any non-empty string is
truthy in Go templates (so "false" would otherwise evaluate to true). */}}
{{- $isusingaadauth := false -}}
{{- if not $isArcExtension -}}
{{- if hasKey .Values.OmsAgent "isUsingAADAuth" -}}
{{- $isusingaadauth = .Values.OmsAgent.isUsingAADAuth -}}
{{- if eq (lower (toString .Values.OmsAgent.isUsingAADAuth)) "true" -}}
{{- $isusingaadauth = true -}}
{{- end -}}
{{- end -}}
{{- else -}}
{{- if and .Values.amalogs (hasKey .Values.amalogs "useAADAuth") -}}
{{- $isusingaadauth = .Values.amalogs.useAADAuth -}}
{{- if eq (lower (toString .Values.amalogs.useAADAuth)) "true" -}}
{{- $isusingaadauth = true -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{- $cloudEnv := lower .Values.global.commonGlobals.CloudEnvironment }}
Expand Down
9 changes: 7 additions & 2 deletions charts/azuremonitor-containerinsights/templates/ama-logs-hpa.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@
{{- $isArcExtension := $arcSettings.isArcExtension }}
{{/* AKS-only resource */}}
{{- if not $isArcExtension }}
{{/* Determine isusingaadauth value */}}
{{/* Determine isusingaadauth value.
Compare as a lowercased string because Helm --set and quoted YAML
both deliver this value as a string, and any non-empty string is
truthy in Go templates (so "false" would otherwise evaluate to true). */}}
{{- $isusingaadauth := false -}}
{{- if hasKey .Values.OmsAgent "isUsingAADAuth" -}}
{{- $isusingaadauth = .Values.OmsAgent.isUsingAADAuth -}}
{{- if eq (lower (toString .Values.OmsAgent.isUsingAADAuth)) "true" -}}
{{- $isusingaadauth = true -}}
{{- end -}}
{{- end -}}
{{- if and $isusingaadauth .Values.OmsAgent.isMultitenancyLogsEnabled }}
---
Expand Down
9 changes: 7 additions & 2 deletions charts/azuremonitor-containerinsights/templates/ama-logs-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
{{- $arcSettings := include "arc-extension-settings" . | fromYaml }}
{{- $isArcExtension := $arcSettings.isArcExtension }}
{{/* Determine isusingaadauth value */}}
{{/* Determine isusingaadauth value.
Compare as a lowercased string because Helm --set and quoted YAML
both deliver this value as a string, and any non-empty string is
truthy in Go templates (so "false" would otherwise evaluate to true). */}}
{{- $isusingaadauth := false -}}
{{- if not $isArcExtension -}}
{{- if hasKey .Values.OmsAgent "isUsingAADAuth" -}}
{{- $isusingaadauth = .Values.OmsAgent.isUsingAADAuth -}}
{{- if eq (lower (toString .Values.OmsAgent.isUsingAADAuth)) "true" -}}
{{- $isusingaadauth = true -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/* Arc has rbac condition, AKS always renders */}}
Expand Down
9 changes: 7 additions & 2 deletions charts/azuremonitor-containerinsights/templates/ama-logs-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@
{{- $isArcExtension := $arcSettings.isArcExtension }}
{{/* AKS-only resource */}}
{{- if not $isArcExtension }}
{{/* Determine isusingaadauth value */}}
{{/* Determine isusingaadauth value.
Compare as a lowercased string because Helm --set and quoted YAML
both deliver this value as a string, and any non-empty string is
truthy in Go templates (so "false" would otherwise evaluate to true). */}}
{{- $isusingaadauth := false -}}
{{- if hasKey .Values.OmsAgent "isUsingAADAuth" -}}
{{- $isusingaadauth = .Values.OmsAgent.isUsingAADAuth -}}
{{- if eq (lower (toString .Values.OmsAgent.isUsingAADAuth)) "true" -}}
{{- $isusingaadauth = true -}}
{{- end -}}
{{- end -}}
{{- if and $isusingaadauth .Values.OmsAgent.isMultitenancyLogsEnabled }}
---
Expand Down
Loading