From: Mike Elliott <mike.elliott@amdocs.com>
Date: Fri, 1 Jun 2018 15:30:11 +0000 (+0000)
Subject: Merge "Update helm charts with release docker artifacts"
X-Git-Tag: 2.0.0-ONAP~39
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=668d47622c6ea290967e64d9950e7efd78cda035;hp=-c;p=oom.git

Merge "Update helm charts with release docker artifacts"
---

668d47622c6ea290967e64d9950e7efd78cda035
diff --combined kubernetes/aai/charts/aai-babel/values.yaml
index 7118d1669b,64970e0110..2239c9a11d
--- a/kubernetes/aai/charts/aai-babel/values.yaml
+++ b/kubernetes/aai/charts/aai-babel/values.yaml
@@@ -24,7 -24,7 +24,7 @@@ global
  #################################################################
  
  # application image
- image: onap/babel:1.2-STAGING-latest
+ image: onap/babel:1.2.0
  
  # application configuration
  config:
@@@ -53,7 -53,7 +53,7 @@@ readiness
  service:
    type: NodePort
    portName: babel
 -  externalPort: 79
 +  externalPort: 9516
    internalPort: 9516
    nodePort: 79
  
diff --combined kubernetes/aai/charts/aai-champ/values.yaml
index 13cc9e77c0,8e05b0e76f..78afd419ca
--- a/kubernetes/aai/charts/aai-champ/values.yaml
+++ b/kubernetes/aai/charts/aai-champ/values.yaml
@@@ -24,7 -24,7 +24,7 @@@ global
  #################################################################
  
  # application image
- image: onap/champ:1.2-STAGING-latest
+ image: onap/champ:1.2.3
  
  # application configuration
  config:
@@@ -52,7 -52,8 +52,7 @@@ readiness
  
  service:
    type: NodePort
 -  name: champ
 -  portName: champ
 +  portName: aai-champ
    internalPort: 9522
    nodePort: 78
  
diff --combined kubernetes/aai/charts/aai-gizmo/values.yaml
index 1ea924fc13,4ce164db76..acf64172cc
--- a/kubernetes/aai/charts/aai-gizmo/values.yaml
+++ b/kubernetes/aai/charts/aai-gizmo/values.yaml
@@@ -22,7 -22,7 +22,7 @@@ global
  #################################################################
  
  # application image
- image: onap/gizmo:1.1-STAGING-latest
+ image: onap/gizmo:1.2.1
  
  # application configuration
  config:
@@@ -50,8 -50,8 +50,8 @@@ readiness
  
  service:
    type: NodePort
 -  name: crud-service
 -  portName: crud-service
 +  name: aai-crud-service
 +  portName: aai-crud-service
    internalPort: 9520
    nodePort: 68
  
diff --combined kubernetes/aai/charts/aai-modelloader/values.yaml
index 676fc6fdfc,b952219614..8acb28f9d2
--- a/kubernetes/aai/charts/aai-modelloader/values.yaml
+++ b/kubernetes/aai/charts/aai-modelloader/values.yaml
@@@ -7,7 -7,7 +7,7 @@@ global: # global default
  
  # application image
  repository: nexus3.onap.org:10001
- image: onap/model-loader:1.2-STAGING-latest
+ image: onap/model-loader:1.2.1
  pullPolicy: Always
  restartPolicy: Always
  
@@@ -35,11 -35,10 +35,11 @@@ readiness
  
  service:
    type: NodePort
 -  name: aai-modelloader
 +  portName: aai-modelloader
    externalPort: 8080
    internalPort: 8080
    nodePort: 10
 +  portName2: aai-modelloader-ssl
    externalPort2: 8443
    internalPort2: 8443
    nodePort2: 29
diff --combined kubernetes/aai/charts/aai-search-data/values.yaml
index c6f42bd38b,e808332a42..f781662e79
--- a/kubernetes/aai/charts/aai-search-data/values.yaml
+++ b/kubernetes/aai/charts/aai-search-data/values.yaml
@@@ -9,7 -9,7 +9,7 @@@ global: # global default
  
  # application image
  repository: nexus3.onap.org:10001
- image: onap/search-data-service:1.2-STAGING-latest
+ image: onap/search-data-service:1.2.1
  pullPolicy: Always
  restartPolicy: Always
  
@@@ -41,7 -41,7 +41,7 @@@ readiness
  
  service:
    type: ClusterIP
 -  name: aai-search-data
 +  portName: aai-search-data
    internalPort: 9509
  
  ingress:
diff --combined kubernetes/aai/charts/aai-sparky-be/values.yaml
index b9ef4ca85d,fee11ae4a3..c87ec5bf02
--- a/kubernetes/aai/charts/aai-sparky-be/values.yaml
+++ b/kubernetes/aai/charts/aai-sparky-be/values.yaml
@@@ -4,7 -4,7 +4,7 @@@
  global: # global defaults
    nodePortPrefix: 302
    aai:
 -    serviceName: aai-aai
 +    serviceName: aai
    aaiElasticsearch:
      serviceName: aai-elasticsearch
    gizmo:
@@@ -14,7 -14,7 +14,7 @@@
  
  # application image
  repository: nexus3.onap.org:10001
- image: onap/sparky-be:1.2-STAGING-latest
+ image: onap/sparky-be:1.2.1
  pullPolicy: Always
  restartPolicy: Always
  
@@@ -62,7 -62,7 +62,7 @@@ readiness
  
  service:
    type: ClusterIP
 -  name: aai-sparky-be
 +  portName: aai-sparky-be
    internalPort: 9517
    internalPort2: 8000