Updated deployment yamls and config to SDC v1.1

Changed the yamls to pull the v1.1 image and updated config files for dockerdata

Issue-ID: OOM-67
Change-Id: I2c51486a610f3187e200e5e08c59b132a5d7ffb5
Signed-off-by: Dusan Rozman <dusan.rozman@amdocs.com>

diff --git a/kubernetes/config/docker/init/src/config/sdc/jetty/keystore b/kubernetes/config/docker/init/src/config/sdc/jetty/keystore
index d6592f9..08f6cda 100755 (executable)
Binary files a/kubernetes/config/docker/init/src/config/sdc/jetty/keystore and b/kubernetes/config/docker/init/src/config/sdc/jetty/keystore differ

diff --git a/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb b/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb
index 89f94fb..9fc662e 100755 (executable)
--- a/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb
+++ b/kubernetes/config/docker/init/src/config/sdc/sdc-fe/FE_2_setup_configuration.rb
@@ -1,5 +1,6 @@
+jetty_base="/var/lib/jetty"
 template "catalog-fe-config" do
-   path "/var/lib/jetty/config/catalog-fe/configuration.yaml"
+   path "#{jetty_base}/config/catalog-fe/configuration.yaml"
    source "FE-configuration.yaml.erb"
    owner "jetty"
    group "jetty"
@@ -11,3 +12,16 @@ template "catalog-fe-config" do
       :ssl_port     => node['BE'][:https_port]
    })
 end
+
+template "onboarding-fe-config" do
+ path "#{jetty_base}/config/onboarding-fe/onboarding_configuration.yaml"
+ source "FE-onboarding-configuration.yaml.erb"
+ owner "jetty"
+ group "jetty"
+ mode "0755"
+ variables({
+    :catalog_ip   => node['HOST_IP'],
+    :catalog_port => node['BE'][:http_port],
+    :ssl_port     => node['BE'][:https_port]
+})
+end

diff --git a/kubernetes/sdc/sdc-be.yaml b/kubernetes/sdc/sdc-be.yaml
index f23db77..ac2378c 100644 (file)
--- a/kubernetes/sdc/sdc-be.yaml
+++ b/kubernetes/sdc/sdc-be.yaml
@@ -70,7 +70,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: nexus3.onap.org:10001/openecomp/sdc-backend:1.0-STAGING-latest
+        image: nexus3.onap.org:10001/openecomp/sdc-backend:1.1-STAGING-latest
         name: sdc-be
         volumeMounts:
         - mountPath: /usr/share/elasticsearch/data/

diff --git a/kubernetes/sdc/sdc-cs.yaml b/kubernetes/sdc/sdc-cs.yaml
index 74874f9..081bae4 100644 (file)
--- a/kubernetes/sdc/sdc-cs.yaml
+++ b/kubernetes/sdc/sdc-cs.yaml
@@ -50,7 +50,7 @@ spec:
               fieldPath: status.podIP
         - name: ES_HEAP_SIZE
           value: "1024M"
-        image: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.0-STAGING-latest
+        image: nexus3.onap.org:10001/openecomp/sdc-cassandra:1.1-STAGING-latest
         name: sdc-cs
         volumeMounts:
         - mountPath: /var/lib/cassandra/

diff --git a/kubernetes/sdc/sdc-es.yaml b/kubernetes/sdc/sdc-es.yaml
index 5176b93..cfb5242 100644 (file)
--- a/kubernetes/sdc/sdc-es.yaml
+++ b/kubernetes/sdc/sdc-es.yaml
@@ -15,7 +15,7 @@ spec:
       name: sdc-es
     spec:
       containers:
-      - image: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.0-STAGING-latest
+      - image: nexus3.onap.org:10001/openecomp/sdc-elasticsearch:1.1-STAGING-latest
         name: sdc-es
         env:
         - name: ENVNAME

diff --git a/kubernetes/sdc/sdc-fe.yaml b/kubernetes/sdc/sdc-fe.yaml
index d984bbe..0711aa9 100644 (file)
--- a/kubernetes/sdc/sdc-fe.yaml
+++ b/kubernetes/sdc/sdc-fe.yaml
@@ -55,7 +55,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: status.podIP
-        image: nexus3.onap.org:10001/openecomp/sdc-frontend:1.0-STAGING-latest
+        image: nexus3.onap.org:10001/openecomp/sdc-frontend:1.1-STAGING-latest
         volumeMounts:
         - mountPath: /usr/share/elasticsearch/data/
           name: sdc-sdc-es-es

diff --git a/kubernetes/sdc/sdc-kb.yaml b/kubernetes/sdc/sdc-kb.yaml
index b79f4ca..83483f7 100644 (file)
--- a/kubernetes/sdc/sdc-kb.yaml
+++ b/kubernetes/sdc/sdc-kb.yaml
@@ -48,7 +48,7 @@ spec:
           value: AUTO
         - name: ELASTICSEARCH_URL
           value: http://sdc-es:9200
-        image: nexus3.onap.org:10001/openecomp/sdc-kibana:1.0-STAGING-latest
+        image: nexus3.onap.org:10001/openecomp/sdc-kibana:1.1-STAGING-latest
         name: sdc-kb
         volumeMounts:
         - mountPath: /root/chef-solo/environments/