From 2c10d2411342990eea1fe1ce26779ea0889c0ef6 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 10 Feb 2018 23:51:55 -0800 Subject: [PATCH] addons: Switch to apps/v1 workload APIs * Deployments now belong to the apps/v1 API group * DaemonSets now belong to the apps/v1 API group * RBAC types now belong to the rbac.authorization.k8s.io/v1 API group --- CHANGES.md | 3 ++- addons/cluo/cluster-role-binding.yaml | 2 +- addons/cluo/cluster-role.yaml | 2 +- addons/cluo/update-agent.yaml | 5 ++++- addons/cluo/update-operator.yaml | 5 ++++- addons/grafana/deployment.yaml | 2 +- addons/heapster/deployment.yaml | 2 +- addons/nginx-ingress/aws/default-backend/deployment.yaml | 6 +++++- addons/nginx-ingress/aws/deployment.yaml | 6 +++++- addons/nginx-ingress/aws/rbac/cluster-role-binding.yaml | 2 +- addons/nginx-ingress/aws/rbac/cluster-role.yaml | 2 +- addons/nginx-ingress/aws/rbac/role-binding.yaml | 2 +- addons/nginx-ingress/aws/rbac/role.yaml | 2 +- addons/nginx-ingress/digital-ocean/daemonset.yaml | 6 +++++- .../digital-ocean/default-backend/deployment.yaml | 6 +++++- .../digital-ocean/rbac/cluster-role-binding.yaml | 2 +- .../nginx-ingress/digital-ocean/rbac/cluster-role.yaml | 2 +- .../nginx-ingress/digital-ocean/rbac/role-binding.yaml | 2 +- addons/nginx-ingress/digital-ocean/rbac/role.yaml | 2 +- .../google-cloud/default-backend/deployment.yaml | 6 +++++- addons/nginx-ingress/google-cloud/deployment.yaml | 6 +++++- .../google-cloud/rbac/cluster-role-binding.yaml | 2 +- addons/nginx-ingress/google-cloud/rbac/cluster-role.yaml | 2 +- addons/nginx-ingress/google-cloud/rbac/role-binding.yaml | 2 +- addons/nginx-ingress/google-cloud/rbac/role.yaml | 2 +- addons/prometheus/deployment.yaml | 9 +++++---- .../exporters/kube-state-metrics/deployment.yaml | 2 +- addons/prometheus/exporters/node-exporter/daemonset.yaml | 2 +- addons/prometheus/rbac/cluster-role-binding.yaml | 2 +- addons/prometheus/rbac/cluster-role.yaml | 2 +- 30 files changed, 65 insertions(+), 33 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 50a2fd1d..1aef4330 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -22,7 +22,8 @@ Notable changes between versions. * Include Grafana dashboards for Kubernetes admins * Add grafana-watcher to load bundled upstream dashboards * Update nginx-ingress from 0.9.0 to 0.10.2 -* Update CLUO from v0.5.0 to v0.6.0 +* Update CLUO from v0.5.0 to v0.6.0 +* Switch manifests to use `apps/v1` Deployments and Daemonsets #### Digital Ocean diff --git a/addons/cluo/cluster-role-binding.yaml b/addons/cluo/cluster-role-binding.yaml index e243ffd0..adf8f83b 100644 --- a/addons/cluo/cluster-role-binding.yaml +++ b/addons/cluo/cluster-role-binding.yaml @@ -1,5 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: reboot-coordinator roleRef: diff --git a/addons/cluo/cluster-role.yaml b/addons/cluo/cluster-role.yaml index b7afcce2..bbd86dd0 100644 --- a/addons/cluo/cluster-role.yaml +++ b/addons/cluo/cluster-role.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: reboot-coordinator diff --git a/addons/cluo/update-agent.yaml b/addons/cluo/update-agent.yaml index 3ebe292c..12c6eefd 100644 --- a/addons/cluo/update-agent.yaml +++ b/addons/cluo/update-agent.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: container-linux-update-agent @@ -8,6 +8,9 @@ spec: type: RollingUpdate rollingUpdate: maxUnavailable: 1 + selector: + matchLabels: + app: container-linux-update-agent template: metadata: labels: diff --git a/addons/cluo/update-operator.yaml b/addons/cluo/update-operator.yaml index 71c21164..5bb727ec 100644 --- a/addons/cluo/update-operator.yaml +++ b/addons/cluo/update-operator.yaml @@ -1,10 +1,13 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: container-linux-update-operator namespace: reboot-coordinator spec: replicas: 1 + selector: + matchLabels: + app: container-linux-update-operator template: metadata: labels: diff --git a/addons/grafana/deployment.yaml b/addons/grafana/deployment.yaml index 3adf9ac3..01c53404 100644 --- a/addons/grafana/deployment.yaml +++ b/addons/grafana/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: grafana diff --git a/addons/heapster/deployment.yaml b/addons/heapster/deployment.yaml index 7177628b..e856ad0f 100644 --- a/addons/heapster/deployment.yaml +++ b/addons/heapster/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: heapster diff --git a/addons/nginx-ingress/aws/default-backend/deployment.yaml b/addons/nginx-ingress/aws/default-backend/deployment.yaml index c08c1f46..4f5b3b8e 100644 --- a/addons/nginx-ingress/aws/default-backend/deployment.yaml +++ b/addons/nginx-ingress/aws/default-backend/deployment.yaml @@ -1,10 +1,14 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: default-backend namespace: ingress spec: replicas: 1 + selector: + matchLabels: + name: default-backend + phase: prod template: metadata: labels: diff --git a/addons/nginx-ingress/aws/deployment.yaml b/addons/nginx-ingress/aws/deployment.yaml index 32a5f7aa..5deaece4 100644 --- a/addons/nginx-ingress/aws/deployment.yaml +++ b/addons/nginx-ingress/aws/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx-ingress-controller @@ -8,6 +8,10 @@ spec: strategy: rollingUpdate: maxUnavailable: 1 + selector: + matchLabels: + name: nginx-ingress-controller + phase: prod template: metadata: labels: diff --git a/addons/nginx-ingress/aws/rbac/cluster-role-binding.yaml b/addons/nginx-ingress/aws/rbac/cluster-role-binding.yaml index 20494d2f..3be57109 100644 --- a/addons/nginx-ingress/aws/rbac/cluster-role-binding.yaml +++ b/addons/nginx-ingress/aws/rbac/cluster-role-binding.yaml @@ -1,5 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: ingress roleRef: diff --git a/addons/nginx-ingress/aws/rbac/cluster-role.yaml b/addons/nginx-ingress/aws/rbac/cluster-role.yaml index 696a6920..9fee9fde 100644 --- a/addons/nginx-ingress/aws/rbac/cluster-role.yaml +++ b/addons/nginx-ingress/aws/rbac/cluster-role.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: ingress diff --git a/addons/nginx-ingress/aws/rbac/role-binding.yaml b/addons/nginx-ingress/aws/rbac/role-binding.yaml index ecd04049..46b5cece 100644 --- a/addons/nginx-ingress/aws/rbac/role-binding.yaml +++ b/addons/nginx-ingress/aws/rbac/role-binding.yaml @@ -1,5 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: ingress namespace: ingress diff --git a/addons/nginx-ingress/aws/rbac/role.yaml b/addons/nginx-ingress/aws/rbac/role.yaml index 366251ae..84a6065f 100644 --- a/addons/nginx-ingress/aws/rbac/role.yaml +++ b/addons/nginx-ingress/aws/rbac/role.yaml @@ -1,5 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 kind: Role -apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: ingress namespace: ingress diff --git a/addons/nginx-ingress/digital-ocean/daemonset.yaml b/addons/nginx-ingress/digital-ocean/daemonset.yaml index 6c1cbaf5..0804430e 100644 --- a/addons/nginx-ingress/digital-ocean/daemonset.yaml +++ b/addons/nginx-ingress/digital-ocean/daemonset.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: nginx-ingress-controller @@ -8,6 +8,10 @@ spec: type: RollingUpdate rollingUpdate: maxUnavailable: 1 + selector: + matchLabels: + name: nginx-ingress-controller + phase: prod template: metadata: labels: diff --git a/addons/nginx-ingress/digital-ocean/default-backend/deployment.yaml b/addons/nginx-ingress/digital-ocean/default-backend/deployment.yaml index c08c1f46..4f5b3b8e 100644 --- a/addons/nginx-ingress/digital-ocean/default-backend/deployment.yaml +++ b/addons/nginx-ingress/digital-ocean/default-backend/deployment.yaml @@ -1,10 +1,14 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: default-backend namespace: ingress spec: replicas: 1 + selector: + matchLabels: + name: default-backend + phase: prod template: metadata: labels: diff --git a/addons/nginx-ingress/digital-ocean/rbac/cluster-role-binding.yaml b/addons/nginx-ingress/digital-ocean/rbac/cluster-role-binding.yaml index 20494d2f..3be57109 100644 --- a/addons/nginx-ingress/digital-ocean/rbac/cluster-role-binding.yaml +++ b/addons/nginx-ingress/digital-ocean/rbac/cluster-role-binding.yaml @@ -1,5 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: ingress roleRef: diff --git a/addons/nginx-ingress/digital-ocean/rbac/cluster-role.yaml b/addons/nginx-ingress/digital-ocean/rbac/cluster-role.yaml index 696a6920..9fee9fde 100644 --- a/addons/nginx-ingress/digital-ocean/rbac/cluster-role.yaml +++ b/addons/nginx-ingress/digital-ocean/rbac/cluster-role.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: ingress diff --git a/addons/nginx-ingress/digital-ocean/rbac/role-binding.yaml b/addons/nginx-ingress/digital-ocean/rbac/role-binding.yaml index ecd04049..46b5cece 100644 --- a/addons/nginx-ingress/digital-ocean/rbac/role-binding.yaml +++ b/addons/nginx-ingress/digital-ocean/rbac/role-binding.yaml @@ -1,5 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: ingress namespace: ingress diff --git a/addons/nginx-ingress/digital-ocean/rbac/role.yaml b/addons/nginx-ingress/digital-ocean/rbac/role.yaml index 366251ae..84a6065f 100644 --- a/addons/nginx-ingress/digital-ocean/rbac/role.yaml +++ b/addons/nginx-ingress/digital-ocean/rbac/role.yaml @@ -1,5 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 kind: Role -apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: ingress namespace: ingress diff --git a/addons/nginx-ingress/google-cloud/default-backend/deployment.yaml b/addons/nginx-ingress/google-cloud/default-backend/deployment.yaml index c08c1f46..4f5b3b8e 100644 --- a/addons/nginx-ingress/google-cloud/default-backend/deployment.yaml +++ b/addons/nginx-ingress/google-cloud/default-backend/deployment.yaml @@ -1,10 +1,14 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: default-backend namespace: ingress spec: replicas: 1 + selector: + matchLabels: + name: default-backend + phase: prod template: metadata: labels: diff --git a/addons/nginx-ingress/google-cloud/deployment.yaml b/addons/nginx-ingress/google-cloud/deployment.yaml index 32a5f7aa..4e6943aa 100644 --- a/addons/nginx-ingress/google-cloud/deployment.yaml +++ b/addons/nginx-ingress/google-cloud/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx-ingress-controller @@ -8,6 +8,10 @@ spec: strategy: rollingUpdate: maxUnavailable: 1 + selector: + matchLabels: + name: nginx-ingess-controller + phase: prod template: metadata: labels: diff --git a/addons/nginx-ingress/google-cloud/rbac/cluster-role-binding.yaml b/addons/nginx-ingress/google-cloud/rbac/cluster-role-binding.yaml index 20494d2f..3be57109 100644 --- a/addons/nginx-ingress/google-cloud/rbac/cluster-role-binding.yaml +++ b/addons/nginx-ingress/google-cloud/rbac/cluster-role-binding.yaml @@ -1,5 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding -apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: ingress roleRef: diff --git a/addons/nginx-ingress/google-cloud/rbac/cluster-role.yaml b/addons/nginx-ingress/google-cloud/rbac/cluster-role.yaml index 696a6920..9fee9fde 100644 --- a/addons/nginx-ingress/google-cloud/rbac/cluster-role.yaml +++ b/addons/nginx-ingress/google-cloud/rbac/cluster-role.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: ingress diff --git a/addons/nginx-ingress/google-cloud/rbac/role-binding.yaml b/addons/nginx-ingress/google-cloud/rbac/role-binding.yaml index ecd04049..46b5cece 100644 --- a/addons/nginx-ingress/google-cloud/rbac/role-binding.yaml +++ b/addons/nginx-ingress/google-cloud/rbac/role-binding.yaml @@ -1,5 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding -apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: ingress namespace: ingress diff --git a/addons/nginx-ingress/google-cloud/rbac/role.yaml b/addons/nginx-ingress/google-cloud/rbac/role.yaml index 366251ae..84a6065f 100644 --- a/addons/nginx-ingress/google-cloud/rbac/role.yaml +++ b/addons/nginx-ingress/google-cloud/rbac/role.yaml @@ -1,5 +1,5 @@ +apiVersion: rbac.authorization.k8s.io/v1 kind: Role -apiVersion: rbac.authorization.k8s.io/v1beta1 metadata: name: ingress namespace: ingress diff --git a/addons/prometheus/deployment.yaml b/addons/prometheus/deployment.yaml index 648fcc93..2a2b7b15 100644 --- a/addons/prometheus/deployment.yaml +++ b/addons/prometheus/deployment.yaml @@ -1,13 +1,14 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: prometheus namespace: monitoring spec: replicas: 1 - strategy: - rollingUpdate: - maxUnavailable: 1 + selector: + matchLabels: + name: prometheus + phase: prod template: metadata: labels: diff --git a/addons/prometheus/exporters/kube-state-metrics/deployment.yaml b/addons/prometheus/exporters/kube-state-metrics/deployment.yaml index 118e648d..33ff72ee 100644 --- a/addons/prometheus/exporters/kube-state-metrics/deployment.yaml +++ b/addons/prometheus/exporters/kube-state-metrics/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: Deployment metadata: name: kube-state-metrics diff --git a/addons/prometheus/exporters/node-exporter/daemonset.yaml b/addons/prometheus/exporters/node-exporter/daemonset.yaml index 279f37d0..5f31657b 100644 --- a/addons/prometheus/exporters/node-exporter/daemonset.yaml +++ b/addons/prometheus/exporters/node-exporter/daemonset.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta2 +apiVersion: apps/v1 kind: DaemonSet metadata: name: node-exporter diff --git a/addons/prometheus/rbac/cluster-role-binding.yaml b/addons/prometheus/rbac/cluster-role-binding.yaml index db4dd2a7..127f83a6 100644 --- a/addons/prometheus/rbac/cluster-role-binding.yaml +++ b/addons/prometheus/rbac/cluster-role-binding.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: name: prometheus diff --git a/addons/prometheus/rbac/cluster-role.yaml b/addons/prometheus/rbac/cluster-role.yaml index bf56d91b..0390a92b 100644 --- a/addons/prometheus/rbac/cluster-role.yaml +++ b/addons/prometheus/rbac/cluster-role.yaml @@ -1,4 +1,4 @@ -apiVersion: rbac.authorization.k8s.io/v1beta1 +apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: prometheus