diff --git a/charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-custom-resource.yaml b/charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-custom-resource.yaml index 76dd774..584adf6 100644 --- a/charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-custom-resource.yaml +++ b/charts/amazon-cloudwatch-observability/templates/linux/cloudwatch-agent-custom-resource.yaml @@ -58,7 +58,7 @@ metadata: name: {{ $agent.name | default (include "cloudwatch-agent.name" $) }} namespace: {{ $.Release.Namespace }} spec: - image: {{ include "cloudwatch-agent.image" (merge $agent.image (dict "region" $.Values.region)) }} + image: {{ template "cloudwatch-agent.image" (merge $agent.image (dict "region" $.Values.region)) }} mode: {{ $agent.mode }} replicas: {{ $agent.replicas }} nodeSelector: @@ -93,7 +93,7 @@ spec: {{- if $agent.prometheus.targetAllocator.enabled }} targetAllocator: enabled: {{ $agent.prometheus.targetAllocator.enabled | default false }} - image: {{ include "target-allocator.image" (merge $agent.prometheus.targetAllocator.image (dict "region" $.Values.region)) }} + image: {{ template "target-allocator.image" (merge $agent.prometheus.targetAllocator.image (dict "region" $.Values.region)) }} allocationStrategy: "consistent-hashing" {{- if $agent.prometheus.targetAllocator.prometheusCR.enabled }} prometheusCR: {{ $agent.prometheus.targetAllocator.prometheusCR.enabled | default false }} diff --git a/charts/amazon-cloudwatch-observability/templates/operator-deployment.yaml b/charts/amazon-cloudwatch-observability/templates/operator-deployment.yaml index dc2f8d5..a055481 100644 --- a/charts/amazon-cloudwatch-observability/templates/operator-deployment.yaml +++ b/charts/amazon-cloudwatch-observability/templates/operator-deployment.yaml @@ -32,7 +32,7 @@ spec: - "--auto-instrumentation-python-image={{ template "auto-instrumentation-python.image" . }}" - "--auto-instrumentation-dotnet-image={{ template "auto-instrumentation-dotnet.image" . }}" - "--auto-instrumentation-nodejs-image={{ template "auto-instrumentation-nodejs.image" . }}" - - "--target-allocator-image={{ include "target-allocator.image" (merge .Values.agent.prometheus.targetAllocator.image (dict "region" $.Values.region)) }}" + - "--target-allocator-image={{ template "target-allocator.image" (merge .Values.agent.prometheus.targetAllocator.image (dict "region" $.Values.region)) }}" - "--feature-gates=operator.autoinstrumentation.multi-instrumentation,operator.autoinstrumentation.multi-instrumentation.skip-container-validation" command: - /manager diff --git a/charts/amazon-cloudwatch-observability/templates/windows/cloudwatch-agent-windows-container-insights-daemonset.yaml b/charts/amazon-cloudwatch-observability/templates/windows/cloudwatch-agent-windows-container-insights-daemonset.yaml index 946268a..a51cd40 100644 --- a/charts/amazon-cloudwatch-observability/templates/windows/cloudwatch-agent-windows-container-insights-daemonset.yaml +++ b/charts/amazon-cloudwatch-observability/templates/windows/cloudwatch-agent-windows-container-insights-daemonset.yaml @@ -14,7 +14,7 @@ spec: hostProcess: true runAsUserName: "NT AUTHORITY\\System" hostNetwork: true - image: {{ include "cloudwatch-agent.image" (merge .Values.agent.image (dict "region" .Values.region)) }} + image: {{ template "cloudwatch-agent.image" (merge .Values.agent.image (dict "region" .Values.region)) }} workingDir: "%CONTAINER_SANDBOX_MOUNT_POINT%\\Program Files\\Amazon\\AmazonCloudWatchAgent" mode: daemonset serviceAccount: {{ template "cloudwatch-agent.serviceAccountName" . }} diff --git a/charts/amazon-cloudwatch-observability/templates/windows/cloudwatch-agent-windows-daemonset.yaml b/charts/amazon-cloudwatch-observability/templates/windows/cloudwatch-agent-windows-daemonset.yaml index 6f5a37f..45426af 100644 --- a/charts/amazon-cloudwatch-observability/templates/windows/cloudwatch-agent-windows-daemonset.yaml +++ b/charts/amazon-cloudwatch-observability/templates/windows/cloudwatch-agent-windows-daemonset.yaml @@ -11,7 +11,7 @@ spec: podSecurityContext: windowsOptions: runAsUserName: "NT AUTHORITY\\System" - image: {{ include "cloudwatch-agent.image" (merge .Values.agent.image (dict "region" .Values.region)) }} + image: {{ template "cloudwatch-agent.image" (merge .Values.agent.image (dict "region" .Values.region)) }} mode: daemonset serviceAccount: {{ template "cloudwatch-agent.serviceAccountName" . }} priorityClassName: {{ .Values.agent.priorityClassName }}