From: garciadeblas Date: Thu, 10 Feb 2022 02:11:50 +0000 (+0100) Subject: Remove old mongo K8s manifest file and references in the installer X-Git-Tag: v12.0.0rc1~40 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=0cd9b884e516ed40497088bcb68069fe1afaba99 Remove old mongo K8s manifest file and references in the installer Change-Id: Ic60d3f5605fb353a3f70ae58b5836696223dfb87 Signed-off-by: garciadeblas --- diff --git a/installers/docker/osm_pods/mongo.yaml b/installers/docker/osm_pods/mongo.yaml deleted file mode 100644 index 7eb1dc8c..00000000 --- a/installers/docker/osm_pods/mongo.yaml +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 2019 TATA ELXSI -# Copyright 2021 Whitestack -# -# 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 -# Author: Vijay Nag B S (vijaynag.bs@tataelxsi.co.in), Fabián Bravo(fbravo@whitestack.com) - -apiVersion: v1 -kind: Service -metadata: - name: mongo -spec: - clusterIP: None - ports: - - port: 27017 - protocol: TCP - targetPort: 27017 - selector: - app: mongo - type: ClusterIP ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: mongo - labels: - app: mongo -spec: - replicas: 1 - serviceName: mongo - selector: - matchLabels: - app: mongo - template: - metadata: - labels: - app: mongo - spec: - containers: - - name: mongo - image: mongo:latest - command: - - mongod - - "--replSet" - - rs0 - ports: - - containerPort: 27017 - protocol: TCP - volumeMounts: - - name: mongo-db - mountPath: /data/db - - name: mongo-sidecar - image: cvallance/mongo-k8s-sidecar - env: - - name: MONGO_SIDECAR_POD_LABELS - value: "app=mongo" - volumes: - - name: mongo-db - hostPath: - path: /var/lib/osm/osm_mongo_db/_data diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index f31d46e1..d21b6ce8 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -255,10 +255,6 @@ function generate_docker_images() { sg docker -c "docker pull wurstmeister/kafka:${KAFKA_TAG}" || FATAL "cannot get kafka docker image" fi - if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q MONGO ; then - sg docker -c "docker pull mongo" || FATAL "cannot get mongo docker image" - fi - if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q PROMETHEUS ; then sg docker -c "docker pull prom/prometheus:${PROMETHEUS_TAG}" || FATAL "cannot get prometheus docker image" fi @@ -342,7 +338,6 @@ function generate_k8s_manifest_files() { [ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function #Kubernetes resources sudo cp -bR ${OSM_DEVOPS}/installers/docker/osm_pods $OSM_DOCKER_WORK_DIR - sudo rm -f $OSM_K8S_WORK_DIR/mongo.yaml [ -z "${DEBUG_INSTALL}" ] || DEBUG end of function } @@ -839,6 +834,8 @@ function dump_vars(){ echo "OPENSTACK_VM_NAME"="$OPENSTACK_VM_NAME" echo "OSM_DEVOPS=$OSM_DEVOPS" echo "OSM_DOCKER_TAG=$OSM_DOCKER_TAG" + echo "OSM_DOCKER_WORK_DIR=$OSM_DOCKER_WORK_DIR" + echo "OSM_K8S_WORK_DIR=$OSM_K8S_WORK_DIR" echo "OSM_STACK_NAME=$OSM_STACK_NAME" echo "OSM_VCA_HOST=$OSM_VCA_HOST" echo "OSM_VCA_PUBKEY=$OSM_VCA_PUBKEY"