summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwasiel <katarzyna.wasiel@nokia.com>2020-07-23 10:09:57 +0000
committerkwasiel <katarzyna.wasiel@nokia.com>2020-07-23 10:09:57 +0000
commitd74d38fe135537822c955d24b79498b50bc0e487 (patch)
tree33a269ab1e13f4f5340d0b2f90a12d06eab4278c
parent59cc6a44df6a1807b72af9944f843c30d80f3c35 (diff)
[MULTICLOUD] Make MULTICLOUD compatible with Kubernetes v1.17
Issue-ID: OOM-2459 Signed-off-by: Katarzyna Wasiel <katarzyna.wasiel@nokia.com> Change-Id: I0c52e0c0de799cd90270794f51ad000f05122265
-rw-r--r--kubernetes/multicloud/charts/multicloud-azure/templates/deployment.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-k8s/templates/deployment.yaml5
-rw-r--r--kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml2
-rw-r--r--kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml4
-rw-r--r--kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml2
-rw-r--r--kubernetes/multicloud/templates/deployment.yaml2
11 files changed, 20 insertions, 17 deletions
diff --git a/kubernetes/multicloud/charts/multicloud-azure/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-azure/templates/deployment.yaml
index 1a6d0b7b6a..312c46651b 100644
--- a/kubernetes/multicloud/charts/multicloud-azure/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-azure/templates/deployment.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
*/}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@ -29,7 +29,7 @@ spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
- app: multicloud-azure
+ app: {{ include "common.name" . }}
template:
metadata:
labels:
diff --git a/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml
index 30d521ac2a..110f9aa84f 100644
--- a/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-fcaps/templates/deployment.yaml
@@ -14,7 +14,7 @@
# limitations under the License.
*/}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@ -114,4 +114,4 @@ spec:
name: {{ include "common.fullname" . }}-log-configmap
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
- restartPolicy: Always \ No newline at end of file
+ restartPolicy: Always
diff --git a/kubernetes/multicloud/charts/multicloud-k8s/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-k8s/templates/deployment.yaml
index bf4a9445aa..a64324a86e 100644
--- a/kubernetes/multicloud/charts/multicloud-k8s/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-k8s/templates/deployment.yaml
@@ -14,7 +14,7 @@
# limitations under the License.
*/}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@ -25,6 +25,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/multicloud/charts/multicloud-pike/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml
index 4f6b0382e8..76f3e8cbdc 100644
--- a/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-pike/templates/deployment.yaml
@@ -14,7 +14,7 @@
# limitations under the License.
*/}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml
index 0e500df123..d81d638731 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-alertmanager/templates/deployment.yaml
@@ -16,7 +16,7 @@
{{- if .Values.global.alertmanager.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@ -97,4 +97,4 @@ spec:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
restartPolicy: Always
-{{- end -}} \ No newline at end of file
+{{- end -}}
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml
index 176a79ba0a..7fc8ac8c1e 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/charts/prometheus-grafana/templates/deployment.yaml
@@ -16,7 +16,7 @@
{{- if .Values.global.grafana.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@ -136,4 +136,4 @@ spec:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
restartPolicy: Always
-{{- end -}} \ No newline at end of file
+{{- end -}}
diff --git a/kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml
index c60237d6a7..cb76bace9c 100644
--- a/kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-prometheus/templates/deployment.yaml
@@ -16,7 +16,7 @@
{{- if .Values.global.prometheus.enabled -}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@ -122,4 +122,4 @@ spec:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
restartPolicy: Always
-{{- end -}} \ No newline at end of file
+{{- end -}}
diff --git a/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml
index f132cc73b2..80e9a97f3b 100644
--- a/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-starlingx/templates/deployment.yaml
@@ -14,7 +14,7 @@
# limitations under the License.
*/}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
diff --git a/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
index 93908e9023..5cab1ad205 100644
--- a/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-vio/templates/deployment.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
*/}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
@@ -29,7 +29,7 @@ spec:
replicas: {{ .Values.replicaCount }}
selector:
matchLabels:
- app: multicloud-vio
+ app: {{ include "common.name" . }}
template:
metadata:
labels:
diff --git a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
index dc8744cb9e..b6773a5a6a 100644
--- a/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
+++ b/kubernetes/multicloud/charts/multicloud-windriver/templates/deployment.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
*/}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}
diff --git a/kubernetes/multicloud/templates/deployment.yaml b/kubernetes/multicloud/templates/deployment.yaml
index 3d75b78187..8cae0b66cd 100644
--- a/kubernetes/multicloud/templates/deployment.yaml
+++ b/kubernetes/multicloud/templates/deployment.yaml
@@ -15,7 +15,7 @@
# limitations under the License.
*/}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "common.fullname" . }}