Merge "Update SDNC helm charts to use Neon version"

13 files changed, 33 insertions, 43 deletions

diff --git a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
index 7ac3274f32..29eeb19477 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
@@ -40,7 +40,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/ccsdk-blueprintsprocessor:0.5.1
+image: onap/ccsdk-blueprintsprocessor:0.6.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/cds/charts/cds-command-executor/values.yaml b/kubernetes/cds/charts/cds-command-executor/values.yaml
index 0db73be134..a04651db13 100755
--- a/kubernetes/cds/charts/cds-command-executor/values.yaml
+++ b/kubernetes/cds/charts/cds-command-executor/values.yaml
@@ -40,7 +40,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/ccsdk-commandexecutor:0.5.1
+image: onap/ccsdk-commandexecutor:0.6.0
 pullPolicy: Always
 
 # application configuration
diff --git a/kubernetes/cds/charts/cds-controller-blueprints/values.yaml b/kubernetes/cds/charts/cds-controller-blueprints/values.yaml
index 4e32c5eac4..06efd741d9 100755
--- a/kubernetes/cds/charts/cds-controller-blueprints/values.yaml
+++ b/kubernetes/cds/charts/cds-controller-blueprints/values.yaml
@@ -38,7 +38,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/ccsdk-controllerblueprints:0.5.1
+image: onap/ccsdk-controllerblueprints:0.6.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/cds/charts/cds-sdc-listener/values.yaml b/kubernetes/cds/charts/cds-sdc-listener/values.yaml
index c14b997acc..f359b97f1d 100644
--- a/kubernetes/cds/charts/cds-sdc-listener/values.yaml
+++ b/kubernetes/cds/charts/cds-sdc-listener/values.yaml
@@ -37,7 +37,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/ccsdk-sdclistener:0.5.1
+image: onap/ccsdk-sdclistener:0.6.0
 name: sdc-listener
 pullPolicy: Always
 
diff --git a/kubernetes/cds/charts/cds-ui/values.yaml b/kubernetes/cds/charts/cds-ui/values.yaml
index 60c0a8a037..064f8cb7e2 100644
--- a/kubernetes/cds/charts/cds-ui/values.yaml
+++ b/kubernetes/cds/charts/cds-ui/values.yaml
@@ -28,7 +28,7 @@ subChartsOnly:
 
 # application image
 repository: nexus3.onap.org:10001
-image: onap/ccsdk-cds-ui-server:0.5.1
+image: onap/ccsdk-cds-ui-server:0.6.0
 pullPolicy: Always
 
 # application configuration
diff --git a/kubernetes/common/dgbuilder/values.yaml b/kubernetes/common/dgbuilder/values.yaml
index 8cf95d6aba..df52fbc64b 100644
--- a/kubernetes/common/dgbuilder/values.yaml
+++ b/kubernetes/common/dgbuilder/values.yaml
@@ -47,7 +47,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/ccsdk-dgbuilder-image:0.5.1
+image: onap/ccsdk-dgbuilder-image:0.6.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/charts/dmaap-listener/values.yaml b/kubernetes/sdnc/charts/dmaap-listener/values.yaml
index b921564b92..600bae2d91 100644
--- a/kubernetes/sdnc/charts/dmaap-listener/values.yaml
+++ b/kubernetes/sdnc/charts/dmaap-listener/values.yaml
@@ -27,7 +27,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdnc-dmaap-listener-image:1.6.2
+image: onap/sdnc-dmaap-listener-image:1.7.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
index df256a3890..8651e32628 100644
--- a/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml
@@ -27,7 +27,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdnc-ansible-server-image:1.6.2
+image: onap/sdnc-ansible-server-image:1.7.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/charts/sdnc-portal/values.yaml b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
index cf6eaf9b79..31575ca40f 100644
--- a/kubernetes/sdnc/charts/sdnc-portal/values.yaml
+++ b/kubernetes/sdnc/charts/sdnc-portal/values.yaml
@@ -27,13 +27,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/admportal-sdnc-image:1.6.2
-pullPolicy: Always
-
-# flag to enable debugging - application support required
-debugEnabled: false
-
-# application configuration
+image: onap/admportal-sdnc-image:1.7.0
 config:
   dbRootPassword: secretpassword
   dbSdnctlPassword: gamma
@@ -48,7 +42,7 @@ config:
     internalPort: 3306
 
 # default number of instances
-replicaCount: 0
+replicaCount: 1
 
 nodeSelector: {}
 
diff --git a/kubernetes/sdnc/charts/ueb-listener/values.yaml b/kubernetes/sdnc/charts/ueb-listener/values.yaml
index f0c8ab5ab8..a6040f038c 100644
--- a/kubernetes/sdnc/charts/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/values.yaml
@@ -27,7 +27,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdnc-ueb-listener-image:1.6.2
+image: onap/sdnc-ueb-listener-image:1.7.0
 pullPolicy: Always
 
 # flag to enable debugging - application support required
diff --git a/kubernetes/sdnc/resources/config/overrides/image-versions.yaml b/kubernetes/sdnc/resources/config/overrides/image-versions.yaml
deleted file mode 100644
index fa4d8d2012..0000000000
--- a/kubernetes/sdnc/resources/config/overrides/image-versions.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-sdnc:
-  image: onap/sdnc-image:1.6.1
-  sdnc-ansible-server:
-    image: onap/sdnc-ansible-server-image:1.6.1
-  dmaap-listener:
-    image: onap/sdnc-dmaap-listener-image:1.6.1
-  sdnc-portal:
-    image: onap/admportal-sdnc-image:1.6.1
-  ueb-listener:
-    image: onap/sdnc-ueb-listener-image:1.6.1
-cds:
-  cds-command-executor:
-    image: onap/ccsdk-commandexecutor:0.5.1
-  cds-blueprints-processor:
-    image: onap/ccsdk-blueprintsprocessor:0.5.1
-  cds-ui:
-    image: onap/ccsdk-cds-ui-server:0.5.1
-  cds-controller-blueprints:
-    image: onap/ccsdk-controllerblueprints:0.5.1
-  cds-sdc-listener:
-    image: onap/ccsdk-sdclistener:0.5.1
-common:
-  dgbuilder:
-    image: onap/ccsdk-dgbuilder-image:0.5.1
-
diff --git a/kubernetes/sdnc/resources/config/overrides/sdnc-versions.yaml b/kubernetes/sdnc/resources/config/overrides/sdnc-versions.yaml
new file mode 100644
index 0000000000..c664860218
--- /dev/null
+++ b/kubernetes/sdnc/resources/config/overrides/sdnc-versions.yaml
@@ -0,0 +1,21 @@
+sdnc:
+  image: onap/sdnc-image:1.7.0
+  sdnc-ansible-server:
+    image: onap/sdnc-ansible-server-image:1.7.0
+  dmaap-listener:
+    image: onap/sdnc-dmaap-listener-image:1.7.0
+  sdnc-portal:
+    image: onap/admportal-sdnc-image:1.7.0
+  ueb-listener:
+    image: onap/sdnc-ueb-listener-image:1.7.0
+cds:
+  cds-command-executor:
+    image: onap/ccsdk-commandexecutor:0.6.0
+  cds-blueprints-processor:
+    image: onap/ccsdk-blueprintsprocessor:0.6.0
+  cds-ui:
+    image: onap/ccsdk-cds-ui-server:0.6.0
+  cds-controller-blueprints:
+    image: onap/ccsdk-controllerblueprints:0.6.0
+  cds-sdc-listener:
+    image: onap/ccsdk-sdclistener:0.6.0
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index dfad46ac79..2df38b74e7 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -32,7 +32,7 @@ global:
 # application images
 repository: nexus3.onap.org:10001
 pullPolicy: Always
-image: onap/sdnc-image:1.6.2
+image: onap/sdnc-image:1.7.0
 
 
 # flag to enable debugging - application support required