Skip to content
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

Jump to bottom

update container names to match the ones expected by cortex-mixin #233

Merged
merged 4 commits into from
Nov 17, 2021
Merged

update container names to match the ones expected by cortex-mixin #233

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b9a7fb
update container names to match the ones expected by cortex-mixin
Oct 4, 2021
35e6377
update changelog
Oct 4, 2021
5cd731d
rollback nginx container name
Oct 4, 2021
2c0635e
Merge branch 'master' into enhancement/container-names-match-cortex-m…
nschad Nov 17, 2021
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion templates/alertmanager/alertmanager-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ spec:
- name: storage
mountPath: "/data"
{{- end}}
- name: {{ .Chart.Name }}
- name: alertmanager
nschad marked this conversation as resolved.
Show resolved Hide resolved
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
args:
Expand Down
4 changes: 2 additions & 2 deletions templates/alertmanager/alertmanager-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion templates/compactor/compactor-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion templates/configs/configs-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion templates/distributor/distributor-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion templates/ingester/ingester-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion templates/ingester/ingester-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion templates/nginx/nginx-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
{{- end}}
{{- end }}
containers:
- name: nginx
- name: cortex-gw
danfromtitan marked this conversation as resolved.
Show resolved Hide resolved
image: "{{ .Values.nginx.image.repository }}:{{ .Values.nginx.image.tag }}"
imagePullPolicy: {{ .Values.nginx.image.pullPolicy }}
{{- if .Values.nginx.extraArgs }}
Expand Down
2 changes: 1 addition & 1 deletion templates/querier/querier-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion templates/query-frontend/query-frontend-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion templates/ruler/ruler-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion templates/store-gateway/store-gateway-statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion templates/table-manager/table-manager-dep.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down