From 872409a95d2cf11a49c05f536b6f5af161ff4d11 Mon Sep 17 00:00:00 2001 From: Jonathan Gramain Date: Wed, 18 Jul 2018 14:10:50 -0700 Subject: [PATCH] rf: ZENKO-758 rename replication pods Add "replication" to pod names to avoid confusions, and change "producer" and "consumer" to more meaningful names. New pod names: - backbeat-producer -> backbeat-replication-populator - backbeat-consumer -> backbeat-replication-data-processor - backbeat-status -> backbeat-replication-status-processor If there's a risk it does not fit anymore in DNS name limit (63 char?) we can consider shortening names, but ideally (to me) they would be as self-descriptive as they can get. --- ...loyment.yaml => data_processor_deployment.yaml} | 14 +++++++------- ...r_deployment.yaml => populator_deployment.yaml} | 14 +++++++------- ...yment.yaml => status_processor_deployment.yaml} | 14 +++++++------- charts/backbeat/values.yaml | 6 +++--- 4 files changed, 24 insertions(+), 24 deletions(-) rename charts/backbeat/templates/replication/{consumer_deployment.yaml => data_processor_deployment.yaml} (87%) rename charts/backbeat/templates/replication/{producer_deployment.yaml => populator_deployment.yaml} (84%) rename charts/backbeat/templates/replication/{status_deployment.yaml => status_processor_deployment.yaml} (85%) diff --git a/charts/backbeat/templates/replication/consumer_deployment.yaml b/charts/backbeat/templates/replication/data_processor_deployment.yaml similarity index 87% rename from charts/backbeat/templates/replication/consumer_deployment.yaml rename to charts/backbeat/templates/replication/data_processor_deployment.yaml index 356b14a869..61bcb4ae9f 100644 --- a/charts/backbeat/templates/replication/consumer_deployment.yaml +++ b/charts/backbeat/templates/replication/data_processor_deployment.yaml @@ -1,14 +1,14 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "backbeat.fullname" . }}-consumer + name: {{ template "backbeat.fullname" . }}-replication-data-processor labels: app: {{ template "backbeat.name" . }}-replication chart: {{ template "backbeat.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ .Values.replication.consumer.replicaCount }} + replicas: {{ .Values.replication.dataProcessor.replicaCount }} template: metadata: labels: @@ -16,7 +16,7 @@ spec: release: {{ .Release.Name }} spec: containers: - - name: {{ template "backbeat.fullname" . }}-consumer + - name: replication-data-processor image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} command: ["/usr/src/app/docker-entrypoint.sh"] @@ -65,16 +65,16 @@ spec: path: {{ .Values.health.path.readiness }} port: {{ .Values.health.port }} resources: -{{ toYaml .Values.replication.consumer.resources | indent 12 }} - {{- with .Values.replication.consumer.nodeSelector }} +{{ toYaml .Values.replication.dataProcessor.resources | indent 12 }} + {{- with .Values.replication.dataProcessor.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} {{- end }} - {{- with .Values.replication.consumer.affinity }} + {{- with .Values.replication.dataProcessor.affinity }} affinity: {{ toYaml . | indent 8 }} {{- end }} - {{- with .Values.replication.consumer.tolerations }} + {{- with .Values.replication.dataProcessor.tolerations }} tolerations: {{ toYaml . | indent 8 }} {{- end }} diff --git a/charts/backbeat/templates/replication/producer_deployment.yaml b/charts/backbeat/templates/replication/populator_deployment.yaml similarity index 84% rename from charts/backbeat/templates/replication/producer_deployment.yaml rename to charts/backbeat/templates/replication/populator_deployment.yaml index 73eff378ce..fe4e6592cc 100644 --- a/charts/backbeat/templates/replication/producer_deployment.yaml +++ b/charts/backbeat/templates/replication/populator_deployment.yaml @@ -1,14 +1,14 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "backbeat.fullname" . }}-producer + name: {{ template "backbeat.fullname" . }}-replication-populator labels: app: {{ template "backbeat.name" . }}-replication chart: {{ template "backbeat.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ .Values.replication.producer.replicaCount }} + replicas: {{ .Values.replication.populator.replicaCount }} template: metadata: labels: @@ -16,7 +16,7 @@ spec: release: {{ .Release.Name }} spec: containers: - - name: {{ template "backbeat.fullname" . }}-producer + - name: replication-populator image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} args: ["npm", "run", "queue_populator"] @@ -50,16 +50,16 @@ spec: path: {{ .Values.health.path.readiness }} port: {{ .Values.health.port }} resources: -{{ toYaml .Values.replication.producer.resources | indent 12 }} - {{- with .Values.replication.producer.nodeSelector }} +{{ toYaml .Values.replication.populator.resources | indent 12 }} + {{- with .Values.replication.populator.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} {{- end }} - {{- with .Values.replication.producer.affinity }} + {{- with .Values.replication.populator.affinity }} affinity: {{ toYaml . | indent 8 }} {{- end }} - {{- with .Values.replication.producer.tolerations }} + {{- with .Values.replication.populator.tolerations }} tolerations: {{ toYaml . | indent 8 }} {{- end }} diff --git a/charts/backbeat/templates/replication/status_deployment.yaml b/charts/backbeat/templates/replication/status_processor_deployment.yaml similarity index 85% rename from charts/backbeat/templates/replication/status_deployment.yaml rename to charts/backbeat/templates/replication/status_processor_deployment.yaml index 6db6801bac..3ae7efde6d 100644 --- a/charts/backbeat/templates/replication/status_deployment.yaml +++ b/charts/backbeat/templates/replication/status_processor_deployment.yaml @@ -1,14 +1,14 @@ apiVersion: extensions/v1beta1 kind: Deployment metadata: - name: {{ template "backbeat.fullname" . }}-status + name: {{ template "backbeat.fullname" . }}-replication-status-processor labels: app: {{ template "backbeat.name" . }}-replication chart: {{ template "backbeat.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: - replicas: {{ .Values.replication.status.replicaCount }} + replicas: {{ .Values.replication.statusProcessor.replicaCount }} template: metadata: labels: @@ -16,7 +16,7 @@ spec: release: {{ .Release.Name }} spec: containers: - - name: replication-status + - name: replication-status-processor image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} command: ["/usr/src/app/docker-entrypoint.sh"] @@ -59,16 +59,16 @@ spec: path: {{ .Values.health.path.readiness }} port: {{ .Values.health.port }} resources: -{{ toYaml .Values.replication.status.resources | indent 12 }} - {{- with .Values.replication.status.nodeSelector }} +{{ toYaml .Values.replication.statusProcessor.resources | indent 12 }} + {{- with .Values.replication.statusProcessor.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} {{- end }} - {{- with .Values.replication.status.affinity }} + {{- with .Values.replication.statusProcessor.affinity }} affinity: {{ toYaml . | indent 8 }} {{- end }} - {{- with .Values.replication.status.tolerations }} + {{- with .Values.replication.statusProcessor.tolerations }} tolerations: {{ toYaml . | indent 8 }} {{- end }} diff --git a/charts/backbeat/values.yaml b/charts/backbeat/values.yaml index 566bf32bf6..128780cfe2 100644 --- a/charts/backbeat/values.yaml +++ b/charts/backbeat/values.yaml @@ -101,7 +101,7 @@ lifecycle: enabled: True replication: - consumer: + dataProcessor: replicaCount: 1 resources: {} @@ -109,7 +109,7 @@ replication: tolerations: [] affinity: {} - producer: + populator: replicaCount: 1 resources: {} @@ -117,7 +117,7 @@ replication: tolerations: [] affinity: {} - status: + statusProcessor: replicaCount: 1 resources: {}