Merge "SO Rolling upgrade using helm hooks"

diff --combined kubernetes/so/charts/so-bpmn-infra/values.yaml
index ab6e736,55fad1c..68df124
--- 1/kubernetes/so/charts/so-bpmn-infra/values.yaml
--- 2/kubernetes/so/charts/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/values.yaml
@@@ -19,7 -19,7 +19,7 @@@ global
    nodePortPrefixExt: 304
    repository: nexus3.onap.org:10001
    readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: readiness-check:2.0.2
    persistence:
      mountPath: /dockerdata-nfs
  
@@@ -27,7 -27,7 +27,7 @@@
  # Application configuration defaults.
  #################################################################
  repository: nexus3.onap.org:10001
 -image: onap/so/bpmn-infra:1.3.3
 +image: onap/so/bpmn-infra:1.4.0-STAGING-latest
  pullPolicy: Always
  
  replicaCount: 1
@@@ -71,8 -71,6 +71,6 @@@ livenessProbe
      timeoutSeconds: 10
      successThreshold: 1
      failureThreshold: 3
- mariadb:
-   nameOverride: so-mariadb
  ingress:
    enabled: false
  nodeSelector: {}

diff --combined kubernetes/so/charts/so-catalog-db-adapter/values.yaml
index 1f807bd,438fd2d..e807317
--- 1/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
--- 2/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/charts/so-catalog-db-adapter/values.yaml
@@@ -19,7 -19,7 +19,7 @@@ global
    nodePortPrefixExt: 304
    repository: nexus3.onap.org:10001
    readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: readiness-check:2.0.2
    persistence:
      mountPath: /dockerdata-nfs
  
@@@ -27,7 -27,7 +27,7 @@@
  # Application configuration defaults.
  #################################################################
  repository: nexus3.onap.org:10001
 -image: onap/so/catalog-db-adapter:1.3.3
 +image: onap/so/catalog-db-adapter:1.4.0-STAGING-latest
  pullPolicy: Always
  
  replicaCount: 1
@@@ -72,8 -72,6 +72,6 @@@ livenessProbe
      timeoutSeconds: 10
      successThreshold: 1
      failureThreshold: 3
- mariadb:
-   nameOverride: so-mariadb
  ingress:
    enabled: false
  config:

diff --combined kubernetes/so/charts/so-monitoring/values.yaml
index 1f49eb9,73ce6ad..9550926
--- 1/kubernetes/so/charts/so-monitoring/values.yaml
--- 2/kubernetes/so/charts/so-monitoring/values.yaml
+++ b/kubernetes/so/charts/so-monitoring/values.yaml
@@@ -24,7 -24,7 +24,7 @@@ global
    nodePortPrefixExt: 304
    repository: nexus3.onap.org:10001
    readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: readiness-check:2.0.2
    persistence:
      mountPath: /dockerdata-nfs
  
@@@ -32,7 -32,7 +32,7 @@@
  # Application configuration defaults.
  #################################################################
  repository: nexus3.onap.org:10001
 -image: onap/so/so-monitoring:1.3.3
 +image: onap/so/so-monitoring:1.4.0-STAGING-latest
  pullPolicy: Always
  
  replicaCount: 1

diff --combined kubernetes/so/charts/so-openstack-adapter/values.yaml
index 387f399,93aa5f4..b139ac7
--- 1/kubernetes/so/charts/so-openstack-adapter/values.yaml
--- 2/kubernetes/so/charts/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/charts/so-openstack-adapter/values.yaml
@@@ -19,14 -19,14 +19,14 @@@ global
    nodePortPrefixExt: 304
    repository: nexus3.onap.org:10001
    readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: readiness-check:2.0.2
    persistence:
      mountPath: /dockerdata-nfs
  
  #################################################################
  # Application configuration defaults.
  #################################################################
 -image: onap/so/openstack-adapter:1.3.3
 +image: onap/so/openstack-adapter:1.4.0-STAGING-latest
  pullPolicy: Always
  repository: nexus3.onap.org:10001
  
@@@ -72,8 -72,6 +72,6 @@@ livenessProbe
      timeoutSeconds: 10
      successThreshold: 1
      failureThreshold: 3
- mariadb:
-   nameOverride: so-mariadb
  ingress:
    enabled: false
  config:

diff --combined kubernetes/so/charts/so-request-db-adapter/values.yaml
index 9a1a170,1bbc26f..7a40fac
--- 1/kubernetes/so/charts/so-request-db-adapter/values.yaml
--- 2/kubernetes/so/charts/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/charts/so-request-db-adapter/values.yaml
@@@ -19,7 -19,7 +19,7 @@@ global
    nodePortPrefixExt: 304
    repository: nexus3.onap.org:10001
    readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: readiness-check:2.0.2
    persistence:
      mountPath: /dockerdata-nfs
  
@@@ -27,7 -27,7 +27,7 @@@
  # Application configuration defaults.
  #################################################################
  repository: nexus3.onap.org:10001
 -image: onap/so/request-db-adapter:1.3.3
 +image: onap/so/request-db-adapter:1.4.0-STAGING-latest
  pullPolicy: Always
  
  replicaCount: 1
@@@ -72,8 -72,6 +72,6 @@@ livenessProbe
      timeoutSeconds: 10
      successThreshold: 1
      failureThreshold: 3
- mariadb:
-   nameOverride: so-mariadb
  ingress:
    enabled: false
  nodeSelector: {}

diff --combined kubernetes/so/charts/so-sdc-controller/values.yaml
index ca9cc04,3c1b5e4..c330f9d
--- 1/kubernetes/so/charts/so-sdc-controller/values.yaml
--- 2/kubernetes/so/charts/so-sdc-controller/values.yaml
+++ b/kubernetes/so/charts/so-sdc-controller/values.yaml
@@@ -19,7 -19,7 +19,7 @@@ global
    nodePortPrefixExt: 304
    repository: nexus3.onap.org:10001
    readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: readiness-check:2.0.2
    persistence:
      mountPath: /dockerdata-nfs
  
@@@ -27,7 -27,7 +27,7 @@@
  # Application configuration defaults.
  #################################################################
  repository: nexus3.onap.org:10001
 -image: onap/so/sdc-controller:1.3.3
 +image: onap/so/sdc-controller:1.4.0-STAGING-latest
  pullPolicy: Always
  
  replicaCount: 1
@@@ -72,8 -72,6 +72,6 @@@ livenessProbe
      timeoutSeconds: 10
      successThreshold: 1
      failureThreshold: 3
- mariadb:
-   nameOverride: so-mariadb
  ingress:
    enabled: false
  nodeSelector: {}

diff --combined kubernetes/so/charts/so-sdnc-adapter/values.yaml
index d1540d7,d51ed74..8296c69
--- 1/kubernetes/so/charts/so-sdnc-adapter/values.yaml
--- 2/kubernetes/so/charts/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/values.yaml
@@@ -19,7 -19,7 +19,7 @@@ global
    nodePortPrefixExt: 304
    repository: nexus3.onap.org:10001
    readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: readiness-check:2.0.2
    persistence:
      mountPath: /dockerdata-nfs
  
@@@ -27,7 -27,7 +27,7 @@@
  # Application configuration defaults.
  #################################################################
  repository: nexus3.onap.org:10001
 -image: onap/so/sdnc-adapter:1.3.3
 +image: onap/so/sdnc-adapter:1.4.0-STAGING-latest
  pullPolicy: Always
  
  replicaCount: 1

diff --combined kubernetes/so/charts/so-vfc-adapter/values.yaml
index 55a7bd3,efe9472..22c3f12
--- 1/kubernetes/so/charts/so-vfc-adapter/values.yaml
--- 2/kubernetes/so/charts/so-vfc-adapter/values.yaml
+++ b/kubernetes/so/charts/so-vfc-adapter/values.yaml
@@@ -19,7 -19,7 +19,7 @@@ global
    nodePortPrefixExt: 304
    repository: nexus3.onap.org:10001
    readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: readiness-check:2.0.2
    persistence:
      mountPath: /dockerdata-nfs
  
@@@ -27,7 -27,7 +27,7 @@@
  # Application configuration defaults.
  #################################################################
  repository: nexus3.onap.org:10001
 -image: onap/so/vfc-adapter:1.3.3
 +image: onap/so/vfc-adapter:1.4.0-STAGING-latest
  pullPolicy: Always
  
  replicaCount: 1
@@@ -72,8 -72,6 +72,6 @@@ livenessProbe
      timeoutSeconds: 10
      successThreshold: 1
      failureThreshold: 3
- mariadb:
-   nameOverride: so-mariadb
  ingress:
    enabled: false
  nodeSelector: {}

diff --combined kubernetes/so/values.yaml
index c32b55b,b2c0161..b096b55
--- 1/kubernetes/so/values.yaml
--- 2/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@@ -19,15 -19,31 +19,31 @@@ global
    nodePortPrefixExt: 304
    repository: nexus3.onap.org:10001
    readinessRepository: oomk8s
-   readinessImage: readiness-check:2.0.0
+   readinessImage: readiness-check:2.0.2
+   mariadbGalera:
+     nameOverride: mariadb-galera
+     serviceName: mariadb-galera
+     servicePort: "3306"
+     mariadbRootPassword: secretpassword
+     #This flag allows SO to instantiate its own mariadb-galera cluster, 
+     #serviceName and nameOverride should be so-mariadb-galera if this flag is enabled
+     localCluster: false
    persistence:
      mountPath: /dockerdata-nfs
- 
+   #This configuration will run the migration. The configurations are for backing up the data
+   #from DB and then restoring it to the present versions preferred DB.
+   migration:
+     enabled: false
+     dbHost: mariadb-galera
+     dbPort: 3306
+     dbUser: root
+     dbPassword: secretpassword
+     
  #################################################################
  # Application configuration defaults.
  #################################################################
  repository: nexus3.onap.org:10001
 -image: onap/so/api-handler-infra:1.3.3
 +image: onap/so/api-handler-infra:1.4.0-STAGING-latest
  pullPolicy: Always
  
  replicaCount: 1
@@@ -72,25 -88,20 +88,20 @@@ livenessProbe
      timeoutSeconds: 10
      successThreshold: 1
      failureThreshold: 3
- mariadb:
-   nameOverride: so-mariadb
- so-bpmn-infra:
-   mariadb:
-     nameOverride: so-mariadb
- so-catalog-db-adapter:
-   mariadb:
-     nameOverride: so-mariadb
- so-openstack-adapter:
-   mariadb:
-     nameOverride: so-mariadb
- so-request-db-adapter:
-   mariadb:
-     nameOverride: so-mariadb
- so-sdc-controller:
-   mariadb:
-     nameOverride: so-mariadb
- so-vfc-adapter:
-   mariadb:
-     nameOverride: so-mariadb
+ 
  nodeSelector: {}
  affinity: {}
+ 
+ #Used only if localCluster is enabled. Instantiates SO's own cassandra cluster
+ #helm deploy demo local/onap --namespace onap --verbose --set so.enabled=true \
+ #                                                       --set so.global.mariadbGalera.localCluster=true \
+ #                                                       --set so.global.mariadbGalera.nameOverride=so-mariadb-galera \
+ #                                                       --set so.global.mariadbGalera.serviceName=so-mariadb-galera
+ mariadb-galera:
+   nameOverride: so-mariadb-galera
+   replicaCount: 1
+   service:
+     name: so-mariadb-galera
+   persistence:
+     mountSubPath: so/mariadb-galera/data
+     enabled: true