Merge "[CPS] Update with latest CPS image for Honululu"

3 files changed, 15 insertions, 2 deletions

diff --git a/kubernetes/cps/resources/config/application.yml b/kubernetes/cps/resources/config/application.yml
index 983a75444b..3fa080e395 100644..100755
--- a/kubernetes/cps/resources/config/application.yml
+++ b/kubernetes/cps/resources/config/application.yml
@@ -1,6 +1,7 @@
 {{/*
   #  Copyright (C) 2021 Pantheon.tech
   #  Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
+  #  Modifications Copyright (C) 2021 Nordix Foundation. All rights reserved.
   #
   # Licensed under the Apache License, Version 2.0 (the "License");
   # you may not use this file except in compliance with the License.
@@ -46,6 +47,11 @@ spring:
     cache-names: yangSchema
     caffeine:
       spec: maximumSize=10000,expireAfterAccess=10m
+
+  liquibase:
+    change-log: classpath:changelog/changelog-master.yaml
+    labels: ${LIQUIBASE_LABELS}
+
 # Actuator
 management:
   endpoints:
diff --git a/kubernetes/cps/templates/deployment.yaml b/kubernetes/cps/templates/deployment.yaml
index e15ae7103f..4f87d206a7 100644..100755
--- a/kubernetes/cps/templates/deployment.yaml
+++ b/kubernetes/cps/templates/deployment.yaml
@@ -1,6 +1,7 @@
 {{/*
 # Copyright (C) 2021 Pantheon.tech, Orange
 # Modifications Copyright (C) 2020 Bell Canada. All rights reserved.
+# Modifications Copyright (C) 2021 Nordix Foundation. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,6 +41,8 @@ spec:
             {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "login") | indent 12 }}
           - name: DB_PASSWORD
             {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "pg-user-creds" "key" "password") | indent 12 }}
+          - name: LIQUIBASE_LABELS
+            value: {{ .Values.config.liquibaseLabels }}
         volumeMounts:
           - mountPath: /config-input
             name: init-data-input
diff --git a/kubernetes/cps/values.yaml b/kubernetes/cps/values.yaml
index ee797a5f04..2c28231490 100644..100755
--- a/kubernetes/cps/values.yaml
+++ b/kubernetes/cps/values.yaml
@@ -41,9 +41,13 @@ global:
     virtualhost:
       baseurl: "simpledemo.onap.org"
 
-image: onap/cps-and-nf-proxy:0.0.1
+image: onap/cps-and-nf-proxy:1.0.0
 containerPort: &svc_port 8080
 
+config:
+  # Set it for pre loading xnfdata, else set to null
+  liquibaseLabels: xnf-data-preload
+
 service:
   type: ClusterIP
   name: cps
@@ -140,4 +144,4 @@ postgres:
 
 readinessCheck:
   wait_for:
-    - cps-postgres
\ No newline at end of file
+    - cps-postgres