From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu, 8 Jun 2023 09:19:40 +0000 (+0200)
Subject: Update port and targetPort in webhook-translator
X-Git-Tag: release-v14.0-start~21
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=83bbf4ca53387acc181a2b4f37cc1eeba00d5f4a;p=osm%2Fdevops.git

Update port and targetPort in webhook-translator

Change-Id: I1e0a4a44f1d5ec540e2c8cffa9ff42e8a106233f
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/docker/Webhook/Dockerfile b/docker/Webhook/Dockerfile
index d99c877f..5a7b5928 100644
--- a/docker/Webhook/Dockerfile
+++ b/docker/Webhook/Dockerfile
@@ -80,6 +80,5 @@ USER appuser
 
 EXPOSE 9998
 
-CMD ["uvicorn", "osm_webhook_translator.main:app", "--host", "0.0.0.0", "--port", "80"]
-
+CMD ["uvicorn", "osm_webhook_translator.main:app", "--host", "0.0.0.0", "--port", "9998"]
 
diff --git a/installers/helm/osm/templates/webhook_translator/webhook-translator-service.yaml b/installers/helm/osm/templates/webhook_translator/webhook-translator-service.yaml
index 97a426f0..0fb1d8eb 100644
--- a/installers/helm/osm/templates/webhook_translator/webhook-translator-service.yaml
+++ b/installers/helm/osm/templates/webhook_translator/webhook-translator-service.yaml
@@ -26,8 +26,8 @@ spec:
   type: {{ .Values.webhookTranslator.service.type }}
   ports:
     - nodePort: {{ .Values.webhookTranslator.service.nodePort }}
-      port: 80
-      targetPort: 80
+      port: {{ .Values.webhookTranslator.service.port }}
+      targetPort: 9998
       protocol: TCP
   selector:
     app.kubernetes.io/component: webhook-translator
diff --git a/installers/helm/osm/values.yaml b/installers/helm/osm/values.yaml
index fbbed8f4..c4cf8903 100644
--- a/installers/helm/osm/values.yaml
+++ b/installers/helm/osm/values.yaml
@@ -206,6 +206,7 @@ webhookTranslator:
   service:
     type: NodePort
     nodePort: 9998
+    port: 9998
   image: {}
     # repository: opensourcemano/webhook
     # tag: "13"
diff --git a/installers/helm/values/alertmanager-values.yaml b/installers/helm/values/alertmanager-values.yaml
index 4640e3a1..fb01de0b 100644
--- a/installers/helm/values/alertmanager-values.yaml
+++ b/installers/helm/values/alertmanager-values.yaml
@@ -23,16 +23,16 @@ config:
     - name: default-receiver
     - name: vdu-webhook
       webhook_configs:
-       - url: http://webhook-translator/vdu_down
+       - url: http://webhook-translator:9998/vdu_down
     - name: scaleout-webhook
       webhook_configs:
-       - url: http://webhook-translator/scaleout_vdu
+       - url: http://webhook-translator:9998/scaleout_vdu
     - name: scalein-webhook
       webhook_configs:
-       - url: http://webhook-translator/scalein_vdu
+       - url: http://webhook-translator:9998/scalein_vdu
     - name: alarm-webhook
       webhook_configs:
-       - url: http://webhook-translator/vdu_alarm
+       - url: http://webhook-translator:9998/vdu_alarm
   route:
     group_wait: 10s
     group_interval: 2m