From: Mandeep Khinda <Mandeep.Khinda@amdocs.com>
Date: Tue, 18 Sep 2018 15:02:03 +0000 (+0000)
Subject: Merge "Vid Template alignment."
X-Git-Tag: 3.0.0-ONAP~338
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=772db528bf73a61252f474d81fc868094acd1351;hp=-c;p=oom.git

Merge "Vid Template alignment."
---

772db528bf73a61252f474d81fc868094acd1351
diff --combined kubernetes/vid/templates/deployment.yaml
index 5c98b04ae8,c20ba10a87..5cd4f38331
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@@ -31,16 -31,9 +31,9 @@@ spec
          release: {{ .Release.Name }}
      spec:
        initContainers:
- #dd775k: This container checks if the job that wait for all db instances to be up and initializes the db had finished.
- #      - command:
- #        - /bin/sh
- #        args:
- #        - "-c"
- #        - "sleep 1000000000m"
        - command:
-         - python
+         - /root/job_complete.py
          args:
-         - /tmp/vid-check-job-completion/vid_check_job_completion.py
          - --job-name
          - vid-config-galera
          env:
@@@ -52,13 -45,14 +45,10 @@@
          image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
          name: {{ include "common.name" . }}-readiness
-         volumeMounts:
-         - mountPath: /tmp/vid-check-job-completion
-           name: vid-check-job-completion
        containers:
          - name: {{ include "common.name" . }}
            image: "{{ include "common.repository" . }}/{{ .Values.image }}"
            imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
 -          lifecycle:
 -            postStart:
 -              exec:
 -                command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/usr/local/tomcat/webapps/vid/WEB-INF/classes/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
            ports:
            - containerPort: {{ .Values.service.internalPort }}
            # disable liveness probe when breakpoints set in debugger
@@@ -89,7 -83,7 +79,7 @@@
              - name: VID_ECOMP_SHARED_CONTEXT_REST_URL
                value: http://portal-app.{{ include "common.namespace" . }}:{{ .Values.config.onapport }}/ONAPPORTAL/context
              - name: VID_MSO_SERVER_URL
 -              value: http://so.{{ include "common.namespace" . }}:{{ .Values.config.msoport }}
 +              value: https://so.{{ include "common.namespace" . }}:{{ .Values.config.msoport }}
              - name: VID_MSO_PASS
                value: "{{ .Values.config.vidmsopass }}"
              - name: MSO_DME2_SERVER_URL
@@@ -163,10 -157,6 +153,6 @@@
          - name: vid-logback
            configMap:
              name: {{ include "common.fullname" . }}-log-configmap
-         - name: vid-check-job-completion
-           configMap:
-             name: {{ include "common.fullname" . }}-check-job-completion
        imagePullSecrets:
        - name: "{{ include "common.namespace" . }}-docker-registry-key"
  
- 
diff --combined kubernetes/vid/values.yaml
index 4e5f403391,63726df07a..34a265c656
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@@ -17,9 -17,8 +17,8 @@@
  # Declare variables to be passed into your templates.
  global:
    nodePortPrefix: 302
-   repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
    readinessRepository: oomk8s
-   readinessImage: readiness-check:1.0.0
+   readinessImage: readiness-check:2.0.1
    loggingRepository: docker.elastic.co
    loggingImage: beats/filebeat:5.5.0
  
@@@ -28,7 -27,7 +27,7 @@@ subChartsOnly
  
  # application image
  repository: nexus3.onap.org:10001
 -image: onap/vid:2.0.0
 +image: onap/vid:3.0.0
  pullPolicy: Always
  
  # mariadb image for initializing
@@@ -41,7 -40,7 +40,7 @@@ config
    asdcclientrestport: "8080"
    vidaaiport: "8443"
    onapport: "8989"
 -  msoport: "8080"
 +  msoport: "8443"
    vidmsopass: OBF:1ih71i271vny1yf41ymf1ylz1yf21vn41hzj1icz
    msodme2serverurl: http://localhost:8081
    vidcontactuslink: https://todo_contact_us_link.com
@@@ -54,8 -53,9 +53,9 @@@
    logstashPort: 5044
  
  # subchart configuration
- mariadb-galera:
-   nameOverride: vid-mariadb-galera
+ vid_mariadb_galera:
+ #  nameOverride: vid-mariadb-galera
+   replicaCount: 1
  
  # default number of instances
  replicaCount: 1
@@@ -80,13 -80,9 +80,13 @@@ service
    type: NodePort
    name: vid
    portName: vid
 -  externalPort: "00"
 +  externalPort: 8443
 +  internalPort: 8443
    nodePort: "00"
 -  internalPort: 8080
 +  portName2: vid-http
 +  externalPort2: 8080
 +  internalPort2: 8080
 +  nodePort2: "38"
  
  ingress:
    enabled: false