From dceb913fa262d4d1112ae734e6f9768b0354f9be Mon Sep 17 00:00:00 2001 From: Grzegorz-Lis Date: Tue, 28 Jul 2020 10:52:55 +0200 Subject: [PATCH] [AAI] Make AAI compatible with Kubernetes v1.17 Issue-ID: OOM-2445 Signed-off-by: Grzegorz Lis Change-Id: I68624a283b9f3e0cb3f300defefd1ff0130a0b9c --- components/aai-babel/templates/deployment.yaml | 5 ++++- components/aai-data-router/templates/deployment.yaml | 2 +- components/aai-elasticsearch/templates/deployment.yaml | 2 +- components/aai-graphadmin/templates/deployment.yaml | 2 +- components/aai-modelloader/templates/deployment.yaml | 2 +- components/aai-resources/templates/deployment.yaml | 2 +- components/aai-schema-service/templates/deployment.yaml | 2 +- components/aai-search-data/templates/deployment.yaml | 2 +- components/aai-sparky-be/templates/deployment.yaml | 2 +- components/aai-traversal/templates/deployment.yaml | 2 +- templates/deployment.yaml | 5 ++++- 11 files changed, 17 insertions(+), 11 deletions(-) diff --git a/components/aai-babel/templates/deployment.yaml b/components/aai-babel/templates/deployment.yaml index 71fbd94..70ed7bf 100644 --- a/components/aai-babel/templates/deployment.yaml +++ b/components/aai-babel/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/components/aai-data-router/templates/deployment.yaml b/components/aai-data-router/templates/deployment.yaml index d8c5165..01efcd0 100644 --- a/components/aai-data-router/templates/deployment.yaml +++ b/components/aai-data-router/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" . }} diff --git a/components/aai-elasticsearch/templates/deployment.yaml b/components/aai-elasticsearch/templates/deployment.yaml index 1f864e4..8fa165a 100644 --- a/components/aai-elasticsearch/templates/deployment.yaml +++ b/components/aai-elasticsearch/templates/deployment.yaml @@ -12,7 +12,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" . }} diff --git a/components/aai-graphadmin/templates/deployment.yaml b/components/aai-graphadmin/templates/deployment.yaml index a86fefa..3630d6a 100644 --- a/components/aai-graphadmin/templates/deployment.yaml +++ b/components/aai-graphadmin/templates/deployment.yaml @@ -16,7 +16,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "common.fullname" . }} diff --git a/components/aai-modelloader/templates/deployment.yaml b/components/aai-modelloader/templates/deployment.yaml index 820a797..8cfad20 100644 --- a/components/aai-modelloader/templates/deployment.yaml +++ b/components/aai-modelloader/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" . }} diff --git a/components/aai-resources/templates/deployment.yaml b/components/aai-resources/templates/deployment.yaml index 3d12f4e..5f8b638 100644 --- a/components/aai-resources/templates/deployment.yaml +++ b/components/aai-resources/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" . }} diff --git a/components/aai-schema-service/templates/deployment.yaml b/components/aai-schema-service/templates/deployment.yaml index 95849f8..c6e8e1b 100644 --- a/components/aai-schema-service/templates/deployment.yaml +++ b/components/aai-schema-service/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" . }} diff --git a/components/aai-search-data/templates/deployment.yaml b/components/aai-search-data/templates/deployment.yaml index 4209c55..83e8f1f 100644 --- a/components/aai-search-data/templates/deployment.yaml +++ b/components/aai-search-data/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" . }} diff --git a/components/aai-sparky-be/templates/deployment.yaml b/components/aai-sparky-be/templates/deployment.yaml index 93919c1..fedb0da 100644 --- a/components/aai-sparky-be/templates/deployment.yaml +++ b/components/aai-sparky-be/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" . }} diff --git a/components/aai-traversal/templates/deployment.yaml b/components/aai-traversal/templates/deployment.yaml index 0ce5114..8adb49d 100644 --- a/components/aai-traversal/templates/deployment.yaml +++ b/components/aai-traversal/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" . }} diff --git a/templates/deployment.yaml b/templates/deployment.yaml index b842261..24b8f10 100644 --- a/templates/deployment.yaml +++ b/templates/deployment.yaml @@ -13,7 +13,7 @@ # 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: -- 2.16.6