From 0a7cfdca6c755513b65ae5394d4ba7be553c071f Mon Sep 17 00:00:00 2001 From: Jean Demeusy Date: Thu, 6 Jun 2024 19:00:23 +0200 Subject: [PATCH] remove unnecessary deployment stuff --- helm/ctdapp/templates/configmap-postman.yaml | 11 ---- helm/ctdapp/templates/deployment-postman.yaml | 50 ------------------- helm/ctdapp/values.yaml | 13 ----- helm/values-prod.yaml | 3 -- helm/values-staging.yaml | 3 -- 5 files changed, 80 deletions(-) delete mode 100644 helm/ctdapp/templates/configmap-postman.yaml delete mode 100644 helm/ctdapp/templates/deployment-postman.yaml diff --git a/helm/ctdapp/templates/configmap-postman.yaml b/helm/ctdapp/templates/configmap-postman.yaml deleted file mode 100644 index 2bfccae2..00000000 --- a/helm/ctdapp/templates/configmap-postman.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - annotations: - argocd.argoproj.io/sync-wave: "1" - name: postman-config -data: - CONFIG_FILE_PATH: ./scripts/core_{{ .Values.environmentName }}_config.yaml - {{- if .Values.ctdapp.postman.extraEnvVars -}} - {{ .Values.ctdapp.postman.extraEnvVars | toYaml | nindent 2 }} - {{- end }} \ No newline at end of file diff --git a/helm/ctdapp/templates/deployment-postman.yaml b/helm/ctdapp/templates/deployment-postman.yaml deleted file mode 100644 index 1e342c81..00000000 --- a/helm/ctdapp/templates/deployment-postman.yaml +++ /dev/null @@ -1,50 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - argocd.argoproj.io/sync-wave: "4" - name: {{ include "ctdapp.fullname" . }}-postman - labels: - {{- include "ctdapp.labels" . | nindent 4 }} -spec: - replicas: {{ .Values.ctdapp.postman.replicas }} - selector: - matchLabels: - {{- include "ctdapp.selectorLabels" . | nindent 6 }} - app.kubernetes.io/component: postman - template: - metadata: - {{- with .Values.ctdapp.podAnnotations }} - annotations: - {{- toYaml . | nindent 8 }} - {{- end }} - labels: - app.kubernetes.io/component: postman - {{- include "ctdapp.labels" . | nindent 8 }} - {{- with .Values.ctdapp.podLabels }} - {{- toYaml . | nindent 8 }} - {{- end }} - spec: - serviceAccountName: {{ include "ctdapp.serviceAccountName" . }} - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.ctdapp.postman.repository }}:{{ .Values.ctdapp.postman.tag }}" - imagePullPolicy: {{ .Values.ctdapp.postman.pullPolicy }} - envFrom: - - configMapRef: - name: postman-config - - configMapRef: - name: hoprd-nodes - - secretRef: - name: hoprd-nodes - - secretRef: - name: postgres - - secretRef: - name: rabbitmq-ctdapp - args: - - /bin/sh - - -c - - | - celery -A postman.postman_tasks.app worker -c 5 -n worker@%h -l info -E -Q "send_messages" - resources: - {{- toYaml .Values.ctdapp.postman.resources | nindent 12 }} diff --git a/helm/ctdapp/values.yaml b/helm/ctdapp/values.yaml index 7f617495..cd6fa78b 100644 --- a/helm/ctdapp/values.yaml +++ b/helm/ctdapp/values.yaml @@ -45,16 +45,3 @@ ctdapp: requests: cpu: 250m memory: 256Mi - postman: - repository: europe-west3-docker.pkg.dev/hoprassociation/docker-images/cover-traffic - pullPolicy: Always - tag: "" - replicas: 1 - extraEnvVars: {} - resources: - limits: - cpu: '1' - memory: 1Gi - requests: - cpu: 500m - memory: 512Mi diff --git a/helm/values-prod.yaml b/helm/values-prod.yaml index 735d69e2..cc5b91f6 100644 --- a/helm/values-prod.yaml +++ b/helm/values-prod.yaml @@ -11,9 +11,6 @@ ctdapp: core: replicas: 1 tag: v2.2.1 - postman: - replicas: 1 - tag: v2.2.1 nodes: NODE_ADDRESS_1: http://ctdapp-blue-node-1:3001 NODE_ADDRESS_2: http://ctdapp-blue-node-2:3001 diff --git a/helm/values-staging.yaml b/helm/values-staging.yaml index 7b6d1ff4..4713bfa3 100644 --- a/helm/values-staging.yaml +++ b/helm/values-staging.yaml @@ -11,9 +11,6 @@ ctdapp: core: replicas: 1 tag: staging - postman: - replicas: 1 - tag: staging nodes: NODE_ADDRESS_1: http://ctdapp-blue-node-1.ctdapp.svc:3001 NODE_ADDRESS_2: http://ctdapp-blue-node-2.ctdapp.svc:3001