From b4ee00b7328e90275fedf4a0d423c11005866245 Mon Sep 17 00:00:00 2001 From: Ricardo Rocha Date: Tue, 27 Aug 2019 18:04:22 +0200 Subject: [PATCH] Drop deprecated APIs for kube v1.16 support Kubernetes v1.16 is dropping support for beta extensions/apps APIs for Deployment, DaemonSet and ReplicaSet - as described in: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.15.md#deprecations-and-removals Replace all occurrences with apps/v1. Story: 2006459 Task: 36385 (cherry picked from commit 646b60fe246c4491b24156295f7e4fb55e79a2eb) Change-Id: Ib1d8b7672318538be7f0066832add29f7d066b92 --- .../templates/kubernetes/fragments/calico-service.sh | 7 +++++-- .../kubernetes/fragments/enable-helm-tiller.sh | 6 +++++- .../kubernetes/fragments/enable-ingress-traefik.sh | 2 +- .../kubernetes/fragments/enable-keystone-auth.sh | 5 ++++- .../fragments/enable-prometheus-monitoring.sh | 9 +++++++-- .../kubernetes/fragments/flannel-service.sh | 1 + .../kubernetes/fragments/kube-dashboard-service.sh | 12 ++++++++---- .../templates/fragments/enable-coredns.yaml | 2 +- 8 files changed, 32 insertions(+), 12 deletions(-) diff --git a/magnum/drivers/common/templates/kubernetes/fragments/calico-service.sh b/magnum/drivers/common/templates/kubernetes/fragments/calico-service.sh index 0d041e481b..76b0057a1d 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/calico-service.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/calico-service.sh @@ -206,7 +206,7 @@ spec: # This manifest creates a Deployment of Typha to back the above service. -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: calico-typha @@ -222,6 +222,9 @@ spec: # production, we recommend running at least 3 replicas to reduce the impact of rolling upgrade. replicas: 0 revisionHistoryLimit: 2 + selector: + matchLabels: + k8s-app: calico-typha template: metadata: labels: @@ -312,7 +315,7 @@ spec: # as the Calico CNI plugins and network config on # each master and worker node in a Kubernetes cluster. kind: DaemonSet -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 metadata: name: calico-node namespace: kube-system diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-helm-tiller.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-helm-tiller.sh index 20ebb77048..d958d84153 100755 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-helm-tiller.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-helm-tiller.sh @@ -76,7 +76,7 @@ EOF mkdir -p $(dirname ${TILLER_DEPLOYER}) cat << EOF > ${TILLER_DEPLOYER} --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: creationTimestamp: null @@ -88,6 +88,10 @@ metadata: spec: replicas: 1 strategy: {} + selector: + matchLabels: + app: helm + name: tiller template: metadata: creationTimestamp: null diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik.sh index d5df11e986..4170feab70 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik.sh @@ -41,7 +41,7 @@ data: ] --- kind: DaemonSet -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 metadata: name: ingress-traefik namespace: kube-system diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-keystone-auth.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-keystone-auth.sh index 59f9d92f4a..350c7cd707 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-keystone-auth.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-keystone-auth.sh @@ -77,7 +77,7 @@ EOF mkdir -p $(dirname ${KEYSTONE_AUTH_DEPLOY}) cat << EOF > ${KEYSTONE_AUTH_DEPLOY} --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: labels: @@ -87,6 +87,9 @@ metadata: namespace: kube-system spec: # The controllers can only have a single active instance. + selector: + matchLabels: + k8s-app: k8s-keystone-auth template: metadata: name: k8s-keystone-auth diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh index 396984856e..019a9a937c 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh @@ -203,7 +203,7 @@ spec: protocol: TCP port: 9090 --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: prometheus @@ -313,13 +313,18 @@ spec: selector: grafana: "true" --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: grafana namespace: prometheus-monitoring spec: replicas: 1 + selector: + matchLabels: + name: grafana + grafana: "true" + role: db template: metadata: labels: diff --git a/magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh b/magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh index 01e9077d76..04aa15de33 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/flannel-service.sh @@ -166,6 +166,7 @@ metadata: spec: selector: matchLabels: + tier: node app: flannel template: metadata: diff --git a/magnum/drivers/common/templates/kubernetes/fragments/kube-dashboard-service.sh b/magnum/drivers/common/templates/kubernetes/fragments/kube-dashboard-service.sh index 0a22f660c4..5720760261 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/kube-dashboard-service.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/kube-dashboard-service.sh @@ -112,7 +112,7 @@ subjects: # ------------------- Dashboard Deployment ------------------- # kind: Deployment -apiVersion: apps/v1beta2 +apiVersion: apps/v1 metadata: labels: k8s-app: kubernetes-dashboard @@ -213,7 +213,7 @@ EOF echo "Writing File: $INFLUX_DEPLOY" mkdir -p $(dirname ${INFLUX_DEPLOY}) cat << EOF > ${INFLUX_DEPLOY} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: monitoring-influxdb @@ -260,7 +260,7 @@ EOF echo "Writing File: $GRAFANA_DEPLOY" mkdir -p $(dirname ${GRAFANA_DEPLOY}) cat << EOF > ${GRAFANA_DEPLOY} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: monitoring-grafana @@ -358,13 +358,17 @@ metadata: name: heapster namespace: kube-system --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: heapster namespace: kube-system spec: replicas: 1 + selector: + matchLabels: + task: monitoring + k8s-app: heapster template: metadata: labels: diff --git a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-coredns.yaml b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-coredns.yaml index 9afd620d04..7ca08d9326 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-coredns.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/fragments/enable-coredns.yaml @@ -90,7 +90,7 @@ write_files: TEMPLATE=/etc/kubernetes/addons/coredns-de.yaml mkdir -p $(dirname ${TEMPLATE}) cat > $TEMPLATE <