From 7ddf24e65cb1d47720040a545464121b1082431e Mon Sep 17 00:00:00 2001 From: Alex Nordlund Date: Tue, 8 Nov 2022 17:21:06 +0100 Subject: [PATCH] Assign unique set of labels to k8s deployments #19703 (#19706) --- templates/cronjob-media-remove.yaml | 2 +- templates/deployment-sidekiq.yaml | 8 +++++--- templates/deployment-streaming.yaml | 2 ++ templates/deployment-web.yaml | 6 ++++-- templates/job-assets-precompile.yaml | 2 +- templates/job-chewy-upgrade.yaml | 2 +- templates/job-create-admin.yaml | 2 +- templates/job-db-migrate.yaml | 2 +- templates/service-streaming.yaml | 1 + templates/service-web.yaml | 1 + 10 files changed, 18 insertions(+), 10 deletions(-) diff --git a/templates/cronjob-media-remove.yaml b/templates/cronjob-media-remove.yaml index 160aee2..d3566e3 100644 --- a/templates/cronjob-media-remove.yaml +++ b/templates/cronjob-media-remove.yaml @@ -27,7 +27,7 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchExpressions: - - key: component + - key: app.kubernetes.io/part-of operator: In values: - rails diff --git a/templates/deployment-sidekiq.yaml b/templates/deployment-sidekiq.yaml index b2e5af5..dd707a4 100644 --- a/templates/deployment-sidekiq.yaml +++ b/templates/deployment-sidekiq.yaml @@ -11,7 +11,8 @@ spec: selector: matchLabels: {{- include "mastodon.selectorLabels" . | nindent 6 }} - component: rails + app.kubernetes.io/component: sidekiq + app.kubernetes.io/part-of: rails template: metadata: annotations: @@ -22,7 +23,8 @@ spec: rollme: {{ randAlphaNum 5 | quote }} labels: {{- include "mastodon.selectorLabels" . | nindent 8 }} - component: rails + app.kubernetes.io/component: sidekiq + app.kubernetes.io/part-of: rails spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: @@ -40,7 +42,7 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchExpressions: - - key: component + - key: app.kubernetes.io/part-of operator: In values: - rails diff --git a/templates/deployment-streaming.yaml b/templates/deployment-streaming.yaml index 12203a5..7f03c9e 100644 --- a/templates/deployment-streaming.yaml +++ b/templates/deployment-streaming.yaml @@ -11,6 +11,7 @@ spec: selector: matchLabels: {{- include "mastodon.selectorLabels" . | nindent 6 }} + app.kubernetes.io/component: streaming template: metadata: {{- with .Values.podAnnotations }} @@ -19,6 +20,7 @@ spec: {{- end }} labels: {{- include "mastodon.selectorLabels" . | nindent 8 }} + app.kubernetes.io/component: streaming spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: diff --git a/templates/deployment-web.yaml b/templates/deployment-web.yaml index c50f32d..fb58b1a 100644 --- a/templates/deployment-web.yaml +++ b/templates/deployment-web.yaml @@ -11,7 +11,8 @@ spec: selector: matchLabels: {{- include "mastodon.selectorLabels" . | nindent 6 }} - component: rails + app.kubernetes.io/component: web + app.kubernetes.io/part-of: rails template: metadata: annotations: @@ -22,7 +23,8 @@ spec: rollme: {{ randAlphaNum 5 | quote }} labels: {{- include "mastodon.selectorLabels" . | nindent 8 }} - component: rails + app.kubernetes.io/component: web + app.kubernetes.io/part-of: rails spec: {{- with .Values.imagePullSecrets }} imagePullSecrets: diff --git a/templates/job-assets-precompile.yaml b/templates/job-assets-precompile.yaml index faa51a2..9bdec2a 100644 --- a/templates/job-assets-precompile.yaml +++ b/templates/job-assets-precompile.yaml @@ -27,7 +27,7 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchExpressions: - - key: component + - key: app.kubernetes.io/part-of operator: In values: - rails diff --git a/templates/job-chewy-upgrade.yaml b/templates/job-chewy-upgrade.yaml index ae6fb38..556133d 100644 --- a/templates/job-chewy-upgrade.yaml +++ b/templates/job-chewy-upgrade.yaml @@ -28,7 +28,7 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchExpressions: - - key: component + - key: app.kubernetes.io/part-of operator: In values: - rails diff --git a/templates/job-create-admin.yaml b/templates/job-create-admin.yaml index 659c006..94d39dc 100644 --- a/templates/job-create-admin.yaml +++ b/templates/job-create-admin.yaml @@ -28,7 +28,7 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchExpressions: - - key: component + - key: app.kubernetes.io/part-of operator: In values: - rails diff --git a/templates/job-db-migrate.yaml b/templates/job-db-migrate.yaml index 8e4f70d..e1544d2 100644 --- a/templates/job-db-migrate.yaml +++ b/templates/job-db-migrate.yaml @@ -27,7 +27,7 @@ spec: requiredDuringSchedulingIgnoredDuringExecution: - labelSelector: matchExpressions: - - key: component + - key: app.kubernetes.io/part-of operator: In values: - rails diff --git a/templates/service-streaming.yaml b/templates/service-streaming.yaml index a005e61..bade7b1 100644 --- a/templates/service-streaming.yaml +++ b/templates/service-streaming.yaml @@ -13,3 +13,4 @@ spec: name: streaming selector: {{- include "mastodon.selectorLabels" . | nindent 4 }} + app.kubernetes.io/component: streaming diff --git a/templates/service-web.yaml b/templates/service-web.yaml index 3563fde..acf1233 100644 --- a/templates/service-web.yaml +++ b/templates/service-web.yaml @@ -13,3 +13,4 @@ spec: name: http selector: {{- include "mastodon.selectorLabels" . | nindent 4 }} + app.kubernetes.io/component: web