From e5d0491653447c06f5bf28a227ae71ec72cd186b Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Mon, 5 Jun 2023 10:33:05 +0200
Subject: [PATCH 1/1] Remove mon-service from OSM helm chart

Change-Id: Id7e04a968cd590964efc61e13ec6a4d0f0614d7b
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
 installers/full_install_osm.sh                |  1 -
 .../helm/osm/templates/mon/mon-service.yaml   | 34 -------------------
 installers/helm/osm/values.yaml               |  3 --
 3 files changed, 38 deletions(-)
 delete mode 100644 installers/helm/osm/templates/mon/mon-service.yaml

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 8d862f60..9f0f3bb8 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -316,7 +316,6 @@ EOF"
     # OSM_HELM_OPTS="${OSM_HELM_OPTS} --set nbi.useOsmSecret=false"
     OSM_HELM_OPTS="${OSM_HELM_OPTS} --set global.image.repositoryBase=${DOCKER_REGISTRY_URL}${DOCKER_USER}"
     OSM_HELM_OPTS="${OSM_HELM_OPTS} --set mysql.dbHostPath=${OSM_NAMESPACE_VOL}"
-    OSM_HELM_OPTS="${OSM_HELM_OPTS} --set mon.config.OS_NOTIFIER_URI=http://${OSM_DEFAULT_IP}:8662"
     OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.host=${OSM_VCA_HOST}"
     OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.secret=${OSM_VCA_SECRET}"
     OSM_HELM_OPTS="${OSM_HELM_OPTS} --set vca.cacert=${OSM_VCA_CACERT}"
diff --git a/installers/helm/osm/templates/mon/mon-service.yaml b/installers/helm/osm/templates/mon/mon-service.yaml
deleted file mode 100644
index 0737e144..00000000
--- a/installers/helm/osm/templates/mon/mon-service.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-{{- if .Values.mon.enabled -}}
-#######################################################################################
-# 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: mon
-  labels:
-    {{- include "osm.labels" . | nindent 4 }}
-spec:
-  type: ClusterIP
-  clusterIP: None
-  ports:
-    - port: {{ .Values.mon.service.port }}
-      targetPort: 8662
-      protocol: TCP
-  selector:
-    app.kubernetes.io/component: mon
-    {{- include "osm.selectorLabels" . | nindent 4 }}
-{{- end }}
\ No newline at end of file
diff --git a/installers/helm/osm/values.yaml b/installers/helm/osm/values.yaml
index e018b2b9..fbbed8f4 100644
--- a/installers/helm/osm/values.yaml
+++ b/installers/helm/osm/values.yaml
@@ -110,8 +110,6 @@ lcm:
 mon:
   enabled: true
   # logLevel: DEBUG
-  service:
-    port: 8662
   image: {}
     # repository: opensourcemano/mon
     # tag: "13"
@@ -119,7 +117,6 @@ mon:
   useOsmSecret: true
   # secretName: "mon-secret"
   config: {}
-    # OS_NOTIFIER_URI: "http://DEFAULT_IP:8662"
 
 mysql:
   enabled: true
-- 
2.25.1