From 8b9a7fbbd68a0bdcd296eeb4bc3eddfcdc50874a Mon Sep 17 00:00:00 2001 From: Dan Constantinescu Date: Mon, 4 Oct 2021 13:18:44 -0400 Subject: [PATCH 1/3] update container names to match the ones expected by cortex-mixin Signed-off-by: Dan Constantinescu --- templates/alertmanager/alertmanager-dep.yaml | 2 +- templates/alertmanager/alertmanager-statefulset.yaml | 4 ++-- templates/compactor/compactor-statefulset.yaml | 2 +- templates/configs/configs-dep.yaml | 2 +- templates/distributor/distributor-dep.yaml | 2 +- templates/ingester/ingester-dep.yaml | 2 +- templates/ingester/ingester-statefulset.yaml | 2 +- templates/nginx/nginx-dep.yaml | 2 +- templates/querier/querier-dep.yaml | 2 +- templates/query-frontend/query-frontend-dep.yaml | 2 +- templates/ruler/ruler-dep.yaml | 2 +- templates/store-gateway/store-gateway-statefulset.yaml | 2 +- templates/table-manager/table-manager-dep.yaml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/templates/alertmanager/alertmanager-dep.yaml b/templates/alertmanager/alertmanager-dep.yaml index c6c51d21..0a97ee3d 100644 --- a/templates/alertmanager/alertmanager-dep.yaml +++ b/templates/alertmanager/alertmanager-dep.yaml @@ -98,7 +98,7 @@ spec: - name: storage mountPath: "/data" {{- end}} - - name: {{ .Chart.Name }} + - name: alertmanager image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: diff --git a/templates/alertmanager/alertmanager-statefulset.yaml b/templates/alertmanager/alertmanager-statefulset.yaml index 870f1331..f51431d3 100644 --- a/templates/alertmanager/alertmanager-statefulset.yaml +++ b/templates/alertmanager/alertmanager-statefulset.yaml @@ -150,7 +150,7 @@ spec: - name: storage mountPath: "/data" {{- end}} - - name: {{ .Chart.Name }} + - name: alertmanager image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: @@ -161,7 +161,7 @@ spec: {{- end }} {{- if gt (.Values.alertmanager.replicas | int) 1 }} {{- range $n := until (.Values.alertmanager.replicas |int ) }} - - -alertmanager.cluster.peers={{ template "cortex.fullname" $ }}-alertmanager-{{ $n }}.{{ template "cortex.fullname" $ }}-alertmanager-headless.{{ $.Release.Namespace }}.svc.{{ $.Values.clusterDomain }}:{{ $clusterPort }} + - "-alertmanager.cluster.peers={{ template "cortex.fullname" $ }}-alertmanager-{{ $n }}.{{ template "cortex.fullname" $ }}-alertmanager-headless.{{ $.Release.Namespace }}.svc.{{ $.Values.clusterDomain }}:{{ $clusterPort }}" {{- end }} {{- end }} {{- range $key, $value := .Values.alertmanager.extraArgs }} diff --git a/templates/compactor/compactor-statefulset.yaml b/templates/compactor/compactor-statefulset.yaml index 4727f291..8d4b1376 100644 --- a/templates/compactor/compactor-statefulset.yaml +++ b/templates/compactor/compactor-statefulset.yaml @@ -102,7 +102,7 @@ spec: {{- if .Values.compactor.extraContainers }} {{ toYaml .Values.compactor.extraContainers | nindent 8 }} {{- end }} - - name: {{ .Chart.Name }} + - name: compactor image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: diff --git a/templates/configs/configs-dep.yaml b/templates/configs/configs-dep.yaml index c32e75b4..23a0e093 100644 --- a/templates/configs/configs-dep.yaml +++ b/templates/configs/configs-dep.yaml @@ -48,7 +48,7 @@ spec: {{- end}} {{- end }} containers: - - name: {{ .Chart.Name }} + - name: configs image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: diff --git a/templates/distributor/distributor-dep.yaml b/templates/distributor/distributor-dep.yaml index 1a37e973..3a16a6f1 100644 --- a/templates/distributor/distributor-dep.yaml +++ b/templates/distributor/distributor-dep.yaml @@ -51,7 +51,7 @@ spec: {{- end}} {{- end }} containers: - - name: {{ .Chart.Name }} + - name: distributor image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: diff --git a/templates/ingester/ingester-dep.yaml b/templates/ingester/ingester-dep.yaml index 9bd75649..d2e0f5a1 100644 --- a/templates/ingester/ingester-dep.yaml +++ b/templates/ingester/ingester-dep.yaml @@ -52,7 +52,7 @@ spec: {{- end }} {{- end }} containers: - - name: {{ .Chart.Name }} + - name: ingester image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: diff --git a/templates/ingester/ingester-statefulset.yaml b/templates/ingester/ingester-statefulset.yaml index bb7c2a51..97470745 100644 --- a/templates/ingester/ingester-statefulset.yaml +++ b/templates/ingester/ingester-statefulset.yaml @@ -104,7 +104,7 @@ spec: {{- if .Values.ingester.extraContainers }} {{ toYaml .Values.ingester.extraContainers | nindent 8 }} {{- end }} - - name: {{ .Chart.Name }} + - name: ingester image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: diff --git a/templates/nginx/nginx-dep.yaml b/templates/nginx/nginx-dep.yaml index af69768e..d799ffed 100644 --- a/templates/nginx/nginx-dep.yaml +++ b/templates/nginx/nginx-dep.yaml @@ -44,7 +44,7 @@ spec: {{- end}} {{- end }} containers: - - name: nginx + - name: cortex-gw image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}" imagePullPolicy: {{ .Values.nginx.image.pullPolicy }} {{- if .Values.nginx.extraArgs }} diff --git a/templates/querier/querier-dep.yaml b/templates/querier/querier-dep.yaml index bd5f65b5..d9c93d25 100644 --- a/templates/querier/querier-dep.yaml +++ b/templates/querier/querier-dep.yaml @@ -49,7 +49,7 @@ spec: {{- end}} {{- end }} containers: - - name: {{ .Chart.Name }} + - name: querier image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: diff --git a/templates/query-frontend/query-frontend-dep.yaml b/templates/query-frontend/query-frontend-dep.yaml index 19d4c952..1a3e47d2 100644 --- a/templates/query-frontend/query-frontend-dep.yaml +++ b/templates/query-frontend/query-frontend-dep.yaml @@ -47,7 +47,7 @@ spec: {{- end}} {{- end }} containers: - - name: {{ .Chart.Name }} + - name: query-frontend image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: diff --git a/templates/ruler/ruler-dep.yaml b/templates/ruler/ruler-dep.yaml index c7031600..d3c84cb1 100644 --- a/templates/ruler/ruler-dep.yaml +++ b/templates/ruler/ruler-dep.yaml @@ -97,7 +97,7 @@ spec: - name: sc-rules-volume mountPath: {{ .Values.ruler.sidecar.folder | quote }} {{- end}} - - name: {{ .Chart.Name }} + - name: rules image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: diff --git a/templates/store-gateway/store-gateway-statefulset.yaml b/templates/store-gateway/store-gateway-statefulset.yaml index 9ac188e2..8194209f 100644 --- a/templates/store-gateway/store-gateway-statefulset.yaml +++ b/templates/store-gateway/store-gateway-statefulset.yaml @@ -101,7 +101,7 @@ spec: {{- if .Values.store_gateway.extraContainers }} {{ toYaml .Values.store_gateway.extraContainers | nindent 8 }} {{- end }} - - name: {{ .Chart.Name }} + - name: store-gateway image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: diff --git a/templates/table-manager/table-manager-dep.yaml b/templates/table-manager/table-manager-dep.yaml index 380f59bf..ed351294 100644 --- a/templates/table-manager/table-manager-dep.yaml +++ b/templates/table-manager/table-manager-dep.yaml @@ -48,7 +48,7 @@ spec: {{- end}} {{- end }} containers: - - name: {{ .Chart.Name }} + - name: table-manager image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: From 35e6377d2e441567407aba6b3bbb681d3be2d6e4 Mon Sep 17 00:00:00 2001 From: Dan Constantinescu Date: Mon, 4 Oct 2021 13:28:42 -0400 Subject: [PATCH 2/3] update changelog Signed-off-by: Dan Constantinescu --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 890af30b..b82a2a01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ * [ENHANCEMENT] Optionally generate endpoints for `X-Scope-OrgID` injection (multi-tenancy) #180 * [ENHANCEMENT] Optionally configure Basic Auth within Nginx #205 * [ENHANCEMENT] Add extraEndpointSpec to all servicemonitors for specifying things like TLS #216 +* [ENHANCEMENT] Update container names to match cortex-mixin expectations #233 * [BUGFIX] Fix whitespace in runtime-config annotations, introduced in #209, fixed in #212 * [BUGFIX] Correcting nginx config for auth orgs to right proxy_pass #192 From 5cd731d0701c7eb8a53bc3549e80380b7a4025bc Mon Sep 17 00:00:00 2001 From: Dan Constantinescu Date: Mon, 4 Oct 2021 13:43:34 -0400 Subject: [PATCH 3/3] rollback nginx container name Signed-off-by: Dan Constantinescu --- templates/nginx/nginx-dep.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/nginx/nginx-dep.yaml b/templates/nginx/nginx-dep.yaml index d799ffed..af69768e 100644 --- a/templates/nginx/nginx-dep.yaml +++ b/templates/nginx/nginx-dep.yaml @@ -44,7 +44,7 @@ spec: {{- end}} {{- end }} containers: - - name: cortex-gw + - name: nginx image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}" imagePullPolicy: {{ .Values.nginx.image.pullPolicy }} {{- if .Values.nginx.extraArgs }}