aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrzegorz-Lis <grzegorz.lis@nokia.com>2020-07-27 15:22:28 +0200
committerGrzegorz-Lis <grzegorz.lis@nokia.com>2020-07-27 15:22:28 +0200
commit9bd9878e4c8711c42d45b3d5dc99195c25d927ba (patch)
treecfd43652674e91befcdf1ca9ec1d3aba1b61285d
parent806261be61b881504671d5a260caf194f9e650b8 (diff)
[CDS] Make CDS compatible with Kubernetes v1.17
Issue-ID: OOM-2448 Signed-off-by: Grzegorz Lis <grzegorz.lis@nokia.com> Change-Id: If64ebf0bf986d6230eb576a2cfcbf7d282aff276
-rwxr-xr-xkubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml5
-rwxr-xr-xkubernetes/cds/charts/cds-command-executor/templates/deployment.yaml5
-rw-r--r--kubernetes/cds/charts/cds-sdc-listener/templates/deployment.yaml7
-rw-r--r--kubernetes/cds/charts/cds-ui/templates/deployment.yaml5
4 files changed, 17 insertions, 5 deletions
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml b/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
index c2b6d520b5..dbf531796d 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/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 }}
strategy:
type: RollingUpdate
diff --git a/kubernetes/cds/charts/cds-command-executor/templates/deployment.yaml b/kubernetes/cds/charts/cds-command-executor/templates/deployment.yaml
index 79738b075c..39f37a4fe8 100755
--- a/kubernetes/cds/charts/cds-command-executor/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-command-executor/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" . }}
@@ -23,6 +23,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/cds/charts/cds-sdc-listener/templates/deployment.yaml b/kubernetes/cds/charts/cds-sdc-listener/templates/deployment.yaml
index 3e71181a47..f0db9faf5e 100644
--- a/kubernetes/cds/charts/cds-sdc-listener/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-sdc-listener/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" . }}
@@ -23,6 +23,9 @@ metadata:
release: {{ include "common.release" . }}
heritage: {{ .Release.Service }}
spec:
+ selector:
+ matchLabels:
+ app: {{ include "common.name" . }}
replicas: {{ .Values.replicaCount }}
template:
metadata:
@@ -99,4 +102,4 @@ spec:
- key: logback.xml
path: logback.xml
imagePullSecrets:
- - name: {{ include "common.namespace" . }}-docker-registry-key \ No newline at end of file
+ - name: {{ include "common.namespace" . }}-docker-registry-key
diff --git a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml b/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
index d7aad4d0c3..7832f0f374 100644
--- a/kubernetes/cds/charts/cds-ui/templates/deployment.yaml
+++ b/kubernetes/cds/charts/cds-ui/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: