From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Wed, 8 Jul 2020 06:18:06 +0000 (+0000)
Subject: Merge "Make COMMON/ETCD compatible with Kubernetes v1.17"
X-Git-Tag: 7.0.0~366
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=70960464b7c11352f258e17d981a6f14f19bd07e;hp=c03c318d3848792a313d67ecfec255ad5090073f;p=oom.git

Merge "Make COMMON/ETCD compatible with Kubernetes v1.17"
---

diff --git a/kubernetes/common/postgres/templates/_deployment.tpl b/kubernetes/common/postgres/templates/_deployment.tpl
index b1aae5f50d..456aa32bc0 100644
--- a/kubernetes/common/postgres/templates/_deployment.tpl
+++ b/kubernetes/common/postgres/templates/_deployment.tpl
@@ -18,7 +18,7 @@
 {{- define "common.postgres.deployment" -}}
   {{- $dot := .dot }}
   {{- $pgMode := .pgMode }}
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "common.fullname" $dot }}-{{ $pgMode }}
@@ -32,6 +32,9 @@ metadata:
 spec:
   serviceName: {{ $dot.Values.service.name }}
   replicas: 1
+  selector:
+    matchLabels:
+      app: {{ include "common.name" $dot }}-{{ $pgMode }}
   template:
     metadata:
       labels:
diff --git a/kubernetes/sdc/charts/sdc-wfd-be/values.yaml b/kubernetes/sdc/charts/sdc-wfd-be/values.yaml
index 05793d4f5b..8bab2c84ea 100644
--- a/kubernetes/sdc/charts/sdc-wfd-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-be/values.yaml
@@ -28,8 +28,8 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdc-workflow-backend:1.7.0
-configInitImage: onap/sdc-workflow-init:1.7.0
+image: onap/workflow-backend:1.6.4
+configInitImage: onap/workflow-init:1.6.4
 pullPolicy: Always
 
 initJob:
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
index aaa7795709..359c33ab61 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/sdc-workflow-frontend:1.7.0
+image: onap/workflow-frontend:1.6.4
 pullPolicy: Always
 
 # flag to enable debugging - application support required