From: Sylwia_Jakubek <sylwia.jakubek@nokia.com>
Date: Mon, 20 Jul 2020 12:31:10 +0000 (+0200)
Subject: [ESR] Add Kubernetes v1.17 compatibility
X-Git-Tag: 7.0.0~337
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=19bb8f1daf9c3ebd3977ccb2d2ecf6383f569a13;p=oom.git

[ESR] Add Kubernetes v1.17 compatibility

Issue-ID: OOM-2456
Signed-off-by: Sylwia Jakubek <sylwia.jakubek@nokia.com>
Change-Id: Ic544e839f27f72c45b53f8993678c2f51eeaa321
---

diff --git a/kubernetes/esr/charts/esr-gui/templates/deployment.yaml b/kubernetes/esr/charts/esr-gui/templates/deployment.yaml
index 9c70d327d7..4dee376dee 100644
--- a/kubernetes/esr/charts/esr-gui/templates/deployment.yaml
+++ b/kubernetes/esr/charts/esr-gui/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "common.fullname" . }}
@@ -24,6 +24,9 @@ metadata:
     release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
+  selector:
+    matchLabels:
+      app: {{ include "common.name" . }}
   replicas: {{ .Values.replicaCount }}
   template:
     metadata:
diff --git a/kubernetes/esr/charts/esr-server/templates/deployment.yaml b/kubernetes/esr/charts/esr-server/templates/deployment.yaml
index 995a409d8a..6a98fe6059 100644
--- a/kubernetes/esr/charts/esr-server/templates/deployment.yaml
+++ b/kubernetes/esr/charts/esr-server/templates/deployment.yaml
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "common.fullname" . }}
@@ -24,6 +24,9 @@ metadata:
     release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
+  selector:
+    matchLabels:
+      app: {{ include "common.name" . }}
   replicas: {{ .Values.replicaCount }}
   template:
     metadata: