From bacdfa852d07131631709fa16de142eb9257235e Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 4 Apr 2023 10:52:46 +0200 Subject: [PATCH] Feature 10981: installation of webhook translator as part of NG-SA Change-Id: I5318460103a6b89b37931bf661618251a3837d04 Signed-off-by: garciadeblas --- .../docker/osm_pods/webhook-translator.yaml | 55 +++++++++++++++++++ installers/full_install_osm.sh | 11 ++++ 2 files changed, 66 insertions(+) create mode 100644 installers/docker/osm_pods/webhook-translator.yaml diff --git a/installers/docker/osm_pods/webhook-translator.yaml b/installers/docker/osm_pods/webhook-translator.yaml new file mode 100644 index 00000000..eb41f589 --- /dev/null +++ b/installers/docker/osm_pods/webhook-translator.yaml @@ -0,0 +1,55 @@ +####################################################################################### +# Copyright ETSI Contributors and Others. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. +####################################################################################### + +apiVersion: v1 +kind: Service +metadata: + name: webhook-translator +spec: + ports: + - nodePort: 9998 + port: 80 + targetPort: 80 + selector: + app: webhook-translator + type: NodePort +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: webhook-translator + labels: + app: webhook-translator +spec: + replicas: 1 + selector: + matchLabels: + app: webhook-translator + template: + metadata: + labels: + app: webhook-translator + spec: + containers: + - name: webhook-translator + image: gerardogarcia/webhook-translator:13 + ports: + - containerPort: 80 + protocol: TCP + envFrom: + - secretRef: + name: webhook-translator-secret diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 8c651e2e..489326db 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -327,6 +327,7 @@ function generate_docker_env_files() { sudo cp $OSM_DOCKER_WORK_DIR/ro.env{,~} if [ -n "${INSTALL_NGSA}" ]; then sudo cp $OSM_DOCKER_WORK_DIR/ngsa.env{,~} + sudo cp $OSM_DOCKER_WORK_DIR/webhook-translator.env{,~} fi echo "Generating docker env files" @@ -475,6 +476,14 @@ function generate_docker_env_files() { echo "OSMMON_DATABASE_COMMONKEY=${OSM_DATABASE_COMMONKEY}" | sudo tee -a $OSM_DOCKER_WORK_DIR/ngsa.env fi + # Webhook-translator + if [ -n "${INSTALL_NGSA}" ] && [ ! -f $OSM_DOCKER_WORK_DIR/webhook-translator.env ]; then + echo "AIRFLOW_HOST=airflow-webserver" | sudo tee -a $OSM_DOCKER_WORK_DIR/webhook-translator.env + echo "AIRFLOW_PORT=8080" | sudo tee -a $OSM_DOCKER_WORK_DIR/webhook-translator.env + echo "AIRFLOW_USER=admin" | sudo tee -a $OSM_DOCKER_WORK_DIR/webhook-translator.env + echo "AIRFLOW_PASS=admin" | sudo tee -a $OSM_DOCKER_WORK_DIR/webhook-translator.env + fi + echo "Finished generation of docker env files" [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function } @@ -492,6 +501,7 @@ function kube_secrets(){ kubectl create secret generic pol-secret -n $OSM_STACK_NAME --from-env-file=$OSM_DOCKER_WORK_DIR/pol.env if [ -n "${INSTALL_NGSA}" ]; then kubectl create secret generic ngsa-secret -n $OSM_STACK_NAME --from-env-file=$OSM_DOCKER_WORK_DIR/ngsa.env + kubectl create secret generic webhook-translator-secret -n $OSM_STACK_NAME --from-env-file=$OSM_DOCKER_WORK_DIR/webhook-translator.env fi [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function } @@ -568,6 +578,7 @@ function update_manifest_files() { sudo rm -f ${OSM_K8S_WORK_DIR}/prometheus.yaml else sudo rm -f ${OSM_K8S_WORK_DIR}/ng-prometheus.yaml + sudo rm -f ${OSM_K8S_WORK_DIR}/webhook-translator.yaml fi [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function } -- 2.25.1