From 0ec6eb617726272340898a42b3967cb7b87bdbb6 Mon Sep 17 00:00:00 2001 From: ramnar Date: Sun, 24 Mar 2019 09:41:47 +0530 Subject: [PATCH] Bug fix 72757.Removed deprecated label kubernetes.io/cluster-service --- .../kube-apiserver-kubelet-api-admin-binding.yaml | 1 - .../addons/rbac/kubelet-api-auth/kubelet-api-admin-role.yaml | 1 - .../kubelet-cert-rotation/kubelet-certificate-management.yaml | 4 ---- .../rbac/legacy-kubelet-user-disable/kubelet-binding.yaml | 2 -- cluster/addons/rbac/legacy-kubelet-user/kubelet-binding.yaml | 1 - cluster/addons/storage-class/aws/default.yaml | 1 - cluster/addons/storage-class/azure/default.yaml | 1 - cluster/addons/storage-class/gce/default.yaml | 1 - cluster/addons/storage-class/openstack/default.yaml | 1 - cluster/addons/storage-class/vsphere/default.yaml | 1 - 10 files changed, 14 deletions(-) diff --git a/cluster/addons/rbac/kubelet-api-auth/kube-apiserver-kubelet-api-admin-binding.yaml b/cluster/addons/rbac/kubelet-api-auth/kube-apiserver-kubelet-api-admin-binding.yaml index 43af6488263..be74a793d3d 100644 --- a/cluster/addons/rbac/kubelet-api-auth/kube-apiserver-kubelet-api-admin-binding.yaml +++ b/cluster/addons/rbac/kubelet-api-auth/kube-apiserver-kubelet-api-admin-binding.yaml @@ -4,7 +4,6 @@ kind: ClusterRoleBinding metadata: name: kube-apiserver-kubelet-api-admin labels: - kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/cluster/addons/rbac/kubelet-api-auth/kubelet-api-admin-role.yaml b/cluster/addons/rbac/kubelet-api-auth/kubelet-api-admin-role.yaml index aab3dfd83f9..4eeb7672871 100644 --- a/cluster/addons/rbac/kubelet-api-auth/kubelet-api-admin-role.yaml +++ b/cluster/addons/rbac/kubelet-api-auth/kubelet-api-admin-role.yaml @@ -4,7 +4,6 @@ kind: ClusterRole metadata: name: kubelet-api-admin labels: - kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile rules: - apiGroups: diff --git a/cluster/addons/rbac/kubelet-cert-rotation/kubelet-certificate-management.yaml b/cluster/addons/rbac/kubelet-cert-rotation/kubelet-certificate-management.yaml index 611aaea400f..0d3733594dc 100644 --- a/cluster/addons/rbac/kubelet-cert-rotation/kubelet-certificate-management.yaml +++ b/cluster/addons/rbac/kubelet-cert-rotation/kubelet-certificate-management.yaml @@ -3,7 +3,6 @@ kind: ClusterRoleBinding metadata: name: gce:beta:kubelet-certificate-bootstrap labels: - kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile roleRef: apiGroup: rbac.authorization.k8s.io @@ -19,7 +18,6 @@ kind: ClusterRoleBinding metadata: name: gce:beta:kubelet-certificate-rotation labels: - kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile roleRef: apiGroup: rbac.authorization.k8s.io @@ -35,7 +33,6 @@ kind: ClusterRole metadata: name: gce:beta:kubelet-certificate-bootstrap labels: - kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile rules: - apiGroups: @@ -50,7 +47,6 @@ kind: ClusterRole metadata: name: gce:beta:kubelet-certificate-rotation labels: - kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile rules: - apiGroups: diff --git a/cluster/addons/rbac/legacy-kubelet-user-disable/kubelet-binding.yaml b/cluster/addons/rbac/legacy-kubelet-user-disable/kubelet-binding.yaml index 4cd7174eafc..4da74eb3b48 100644 --- a/cluster/addons/rbac/legacy-kubelet-user-disable/kubelet-binding.yaml +++ b/cluster/addons/rbac/legacy-kubelet-user-disable/kubelet-binding.yaml @@ -5,7 +5,6 @@ kind: ClusterRoleBinding metadata: name: kubelet-cluster-admin labels: - kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: EnsureExists roleRef: apiGroup: rbac.authorization.k8s.io @@ -19,7 +18,6 @@ kind: ClusterRoleBinding metadata: name: kubelet-bootstrap labels: - kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/cluster/addons/rbac/legacy-kubelet-user/kubelet-binding.yaml b/cluster/addons/rbac/legacy-kubelet-user/kubelet-binding.yaml index 91b978fb49c..9fac3e5288c 100644 --- a/cluster/addons/rbac/legacy-kubelet-user/kubelet-binding.yaml +++ b/cluster/addons/rbac/legacy-kubelet-user/kubelet-binding.yaml @@ -7,7 +7,6 @@ kind: ClusterRoleBinding metadata: name: kubelet-cluster-admin labels: - kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile roleRef: apiGroup: rbac.authorization.k8s.io diff --git a/cluster/addons/storage-class/aws/default.yaml b/cluster/addons/storage-class/aws/default.yaml index 4191684a71c..c5a7d0a231f 100644 --- a/cluster/addons/storage-class/aws/default.yaml +++ b/cluster/addons/storage-class/aws/default.yaml @@ -5,7 +5,6 @@ metadata: annotations: storageclass.kubernetes.io/is-default-class: "true" labels: - kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: EnsureExists provisioner: kubernetes.io/aws-ebs parameters: diff --git a/cluster/addons/storage-class/azure/default.yaml b/cluster/addons/storage-class/azure/default.yaml index 371e9292849..9e5c8dbb328 100644 --- a/cluster/addons/storage-class/azure/default.yaml +++ b/cluster/addons/storage-class/azure/default.yaml @@ -5,6 +5,5 @@ metadata: annotations: storageclass.kubernetes.io/is-default-class: "true" labels: - kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: EnsureExists provisioner: kubernetes.io/azure-disk diff --git a/cluster/addons/storage-class/gce/default.yaml b/cluster/addons/storage-class/gce/default.yaml index e4629183bb7..d320fc5be10 100644 --- a/cluster/addons/storage-class/gce/default.yaml +++ b/cluster/addons/storage-class/gce/default.yaml @@ -5,7 +5,6 @@ metadata: annotations: storageclass.kubernetes.io/is-default-class: "true" labels: - kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: EnsureExists provisioner: kubernetes.io/gce-pd parameters: diff --git a/cluster/addons/storage-class/openstack/default.yaml b/cluster/addons/storage-class/openstack/default.yaml index 7b37d5517bb..435b31d222b 100644 --- a/cluster/addons/storage-class/openstack/default.yaml +++ b/cluster/addons/storage-class/openstack/default.yaml @@ -5,6 +5,5 @@ metadata: annotations: storageclass.kubernetes.io/is-default-class: "true" labels: - kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: EnsureExists provisioner: kubernetes.io/cinder diff --git a/cluster/addons/storage-class/vsphere/default.yaml b/cluster/addons/storage-class/vsphere/default.yaml index 88f84d6ecd0..aabc896c31c 100644 --- a/cluster/addons/storage-class/vsphere/default.yaml +++ b/cluster/addons/storage-class/vsphere/default.yaml @@ -5,7 +5,6 @@ metadata: annotations: storageclass.kubernetes.io/is-default-class: "true" labels: - kubernetes.io/cluster-service: "true" provisioner: kubernetes.io/vsphere-volume parameters: diskformat: thin