Assign unique set of labels to k8s deployments #19703 (#19706)

This commit is contained in:
Alex Nordlund 2022-11-08 17:21:06 +01:00 committed by GitHub
parent f4b78028a3
commit 476e74b4c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 18 additions and 10 deletions

View File

@ -27,7 +27,7 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector: - labelSelector:
matchExpressions: matchExpressions:
- key: component - key: app.kubernetes.io/part-of
operator: In operator: In
values: values:
- rails - rails

View File

@ -11,7 +11,8 @@ spec:
selector: selector:
matchLabels: matchLabels:
{{- include "mastodon.selectorLabels" . | nindent 6 }} {{- include "mastodon.selectorLabels" . | nindent 6 }}
component: rails app.kubernetes.io/component: sidekiq
app.kubernetes.io/part-of: rails
template: template:
metadata: metadata:
annotations: annotations:
@ -22,7 +23,8 @@ spec:
rollme: {{ randAlphaNum 5 | quote }} rollme: {{ randAlphaNum 5 | quote }}
labels: labels:
{{- include "mastodon.selectorLabels" . | nindent 8 }} {{- include "mastodon.selectorLabels" . | nindent 8 }}
component: rails app.kubernetes.io/component: sidekiq
app.kubernetes.io/part-of: rails
spec: spec:
{{- with .Values.imagePullSecrets }} {{- with .Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:
@ -40,7 +42,7 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector: - labelSelector:
matchExpressions: matchExpressions:
- key: component - key: app.kubernetes.io/part-of
operator: In operator: In
values: values:
- rails - rails

View File

@ -11,6 +11,7 @@ spec:
selector: selector:
matchLabels: matchLabels:
{{- include "mastodon.selectorLabels" . | nindent 6 }} {{- include "mastodon.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: streaming
template: template:
metadata: metadata:
{{- with .Values.podAnnotations }} {{- with .Values.podAnnotations }}
@ -19,6 +20,7 @@ spec:
{{- end }} {{- end }}
labels: labels:
{{- include "mastodon.selectorLabels" . | nindent 8 }} {{- include "mastodon.selectorLabels" . | nindent 8 }}
app.kubernetes.io/component: streaming
spec: spec:
{{- with .Values.imagePullSecrets }} {{- with .Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:

View File

@ -11,7 +11,8 @@ spec:
selector: selector:
matchLabels: matchLabels:
{{- include "mastodon.selectorLabels" . | nindent 6 }} {{- include "mastodon.selectorLabels" . | nindent 6 }}
component: rails app.kubernetes.io/component: web
app.kubernetes.io/part-of: rails
template: template:
metadata: metadata:
annotations: annotations:
@ -22,7 +23,8 @@ spec:
rollme: {{ randAlphaNum 5 | quote }} rollme: {{ randAlphaNum 5 | quote }}
labels: labels:
{{- include "mastodon.selectorLabels" . | nindent 8 }} {{- include "mastodon.selectorLabels" . | nindent 8 }}
component: rails app.kubernetes.io/component: web
app.kubernetes.io/part-of: rails
spec: spec:
{{- with .Values.imagePullSecrets }} {{- with .Values.imagePullSecrets }}
imagePullSecrets: imagePullSecrets:

View File

@ -27,7 +27,7 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector: - labelSelector:
matchExpressions: matchExpressions:
- key: component - key: app.kubernetes.io/part-of
operator: In operator: In
values: values:
- rails - rails

View File

@ -28,7 +28,7 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector: - labelSelector:
matchExpressions: matchExpressions:
- key: component - key: app.kubernetes.io/part-of
operator: In operator: In
values: values:
- rails - rails

View File

@ -28,7 +28,7 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector: - labelSelector:
matchExpressions: matchExpressions:
- key: component - key: app.kubernetes.io/part-of
operator: In operator: In
values: values:
- rails - rails

View File

@ -27,7 +27,7 @@ spec:
requiredDuringSchedulingIgnoredDuringExecution: requiredDuringSchedulingIgnoredDuringExecution:
- labelSelector: - labelSelector:
matchExpressions: matchExpressions:
- key: component - key: app.kubernetes.io/part-of
operator: In operator: In
values: values:
- rails - rails

View File

@ -13,3 +13,4 @@ spec:
name: streaming name: streaming
selector: selector:
{{- include "mastodon.selectorLabels" . | nindent 4 }} {{- include "mastodon.selectorLabels" . | nindent 4 }}
app.kubernetes.io/component: streaming

View File

@ -13,3 +13,4 @@ spec:
name: http name: http
selector: selector:
{{- include "mastodon.selectorLabels" . | nindent 4 }} {{- include "mastodon.selectorLabels" . | nindent 4 }}
app.kubernetes.io/component: web