From 6a172cdc67457996750f69804236859ffe452d38 Mon Sep 17 00:00:00 2001
From: Pascal Holy <pascal@airy.co>
Date: Mon, 3 May 2021 15:04:26 +0200
Subject: [PATCH] [#1698] Webhook config error

---
 .../charts/api-admin/templates/deployment.yaml    |  5 -----
 .../charts/webhook/templates/deployments.yaml     | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/infrastructure/helm-chart/charts/apps/charts/api/charts/api-admin/templates/deployment.yaml b/infrastructure/helm-chart/charts/apps/charts/api/charts/api-admin/templates/deployment.yaml
index 07ee8106ae..7e62ba1eee 100644
--- a/infrastructure/helm-chart/charts/apps/charts/api/charts/api-admin/templates/deployment.yaml
+++ b/infrastructure/helm-chart/charts/apps/charts/api/charts/api-admin/templates/deployment.yaml
@@ -63,11 +63,6 @@ spec:
             configMapKeyRef:
               name: beanstalk-config
               key: BEANSTALK_PORT
-        - name: WEBHOOK_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: webhooks-config
-              key: NAME
         livenessProbe:
           httpGet:
             path: /actuator/health
diff --git a/infrastructure/helm-chart/charts/apps/charts/integration/charts/webhook/templates/deployments.yaml b/infrastructure/helm-chart/charts/apps/charts/integration/charts/webhook/templates/deployments.yaml
index c5d22493f5..7f46b716f8 100644
--- a/infrastructure/helm-chart/charts/apps/charts/integration/charts/webhook/templates/deployments.yaml
+++ b/infrastructure/helm-chart/charts/apps/charts/integration/charts/webhook/templates/deployments.yaml
@@ -41,11 +41,21 @@ spec:
             configMapKeyRef:
               name: beanstalk-config
               key: BEANSTALK_PORT
+        - name: KAFKA_BROKERS
+          valueFrom:
+            configMapKeyRef:
+              name: kafka-config
+              key: KAFKA_BROKERS
         - name: WEBHOOK_NAME
           valueFrom:
             configMapKeyRef:
               name: "{{ .Values.component }}"
               key: name
+        - name: MAX_BACKOFF_SECONDS
+          valueFrom:
+            configMapKeyRef:
+              name: integration-webhook
+              key: maxBackoff
         livenessProbe:
             httpGet:
               path: /health
@@ -71,11 +81,6 @@ spec:
             configMapKeyRef:
               name: beanstalkd-config
               key: BEANSTALK_PORT
-        - name: MAX_BACKOFF_SECONDS
-          valueFrom:
-            configMapKeyRef:
-              name: webhook-config
-              key: MAX_BACKOFF_SECONDS
         volumeMounts:
         - name: provisioning-scripts
           mountPath: /opt/provisioning