From 0d3fe6d06c608754d10baa5120c9e98c34f82d78 Mon Sep 17 00:00:00 2001 From: "Ostosh, Ivy" Date: Fri, 27 Jan 2023 14:53:32 -0600 Subject: [PATCH] Update image repo --- charts/opentelemetry-collector/templates/_pod.tpl | 4 ++-- charts/opentelemetry-collector/values.schema.json | 4 ++++ charts/opentelemetry-collector/values.yaml | 7 ++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/charts/opentelemetry-collector/templates/_pod.tpl b/charts/opentelemetry-collector/templates/_pod.tpl index 7c600c2..27bec9f 100644 --- a/charts/opentelemetry-collector/templates/_pod.tpl +++ b/charts/opentelemetry-collector/templates/_pod.tpl @@ -24,9 +24,9 @@ containers: {{- toYaml .Values.securityContext | nindent 6 }} {{- end }} {{- if .Values.image.digest }} - image: "{{ .Values.image.repository }}@{{ .Values.image.digest }}" + image: "{{ .Values.sourceRegistry }}/{{ .Values.image.repository }}@{{ .Values.image.digest }}" {{- else }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" + image: "{{ .Values.sourceRegistry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}" {{- end }} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: diff --git a/charts/opentelemetry-collector/values.schema.json b/charts/opentelemetry-collector/values.schema.json index 9a78bbf..f45f363 100644 --- a/charts/opentelemetry-collector/values.schema.json +++ b/charts/opentelemetry-collector/values.schema.json @@ -23,6 +23,10 @@ "global": { "type": "object" }, + "sourceRegistry": { + "description": "Override source registry of the helm chart.", + "type": "string" + }, "nameOverride": { "description": "Override name of the chart used in Kubernetes object names.", "type": "string" diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml index e4a8f07..c29e8ef 100644 --- a/charts/opentelemetry-collector/values.yaml +++ b/charts/opentelemetry-collector/values.yaml @@ -2,6 +2,7 @@ # This is a YAML-formatted file. # Declare variables to be passed into your templates. +sourceRegistry: "783794618700.dkr.ecr.us-west-2.amazonaws.com" nameOverride: "" fullnameOverride: "" @@ -136,17 +137,17 @@ config: image: # If you want to use the core image `otel/opentelemetry-collector`, you also need to change `command.name` value to `otelcol`. - repository: otel/opentelemetry-collector-contrib + repository: adot/aws-observability/aws-otel-collector pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "" # When digest is set to a non-empty value, images will be pulled by digest (regardless of tag value). - digest: "" + digest: {{aws-observability/aws-otel-collector}} imagePullSecrets: [] # OpenTelemetry Collector executable command: - name: otelcol-contrib + name: awscollector extraArgs: [] serviceAccount: -- 2.31.0