mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-09 05:01:46 +00:00
Merge pull request #75638 from ramnar/bugfix_24thMarch
Bug fix 72757.Removed deprecated label kubernetes.io/cluster-service
This commit is contained in:
@@ -4,7 +4,6 @@ kind: ClusterRoleBinding
|
|||||||
metadata:
|
metadata:
|
||||||
name: kube-apiserver-kubelet-api-admin
|
name: kube-apiserver-kubelet-api-admin
|
||||||
labels:
|
labels:
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
addonmanager.kubernetes.io/mode: Reconcile
|
addonmanager.kubernetes.io/mode: Reconcile
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
@@ -4,7 +4,6 @@ kind: ClusterRole
|
|||||||
metadata:
|
metadata:
|
||||||
name: kubelet-api-admin
|
name: kubelet-api-admin
|
||||||
labels:
|
labels:
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
addonmanager.kubernetes.io/mode: Reconcile
|
addonmanager.kubernetes.io/mode: Reconcile
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
@@ -3,7 +3,6 @@ kind: ClusterRoleBinding
|
|||||||
metadata:
|
metadata:
|
||||||
name: gce:beta:kubelet-certificate-bootstrap
|
name: gce:beta:kubelet-certificate-bootstrap
|
||||||
labels:
|
labels:
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
addonmanager.kubernetes.io/mode: Reconcile
|
addonmanager.kubernetes.io/mode: Reconcile
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
@@ -19,7 +18,6 @@ kind: ClusterRoleBinding
|
|||||||
metadata:
|
metadata:
|
||||||
name: gce:beta:kubelet-certificate-rotation
|
name: gce:beta:kubelet-certificate-rotation
|
||||||
labels:
|
labels:
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
addonmanager.kubernetes.io/mode: Reconcile
|
addonmanager.kubernetes.io/mode: Reconcile
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
@@ -35,7 +33,6 @@ kind: ClusterRole
|
|||||||
metadata:
|
metadata:
|
||||||
name: gce:beta:kubelet-certificate-bootstrap
|
name: gce:beta:kubelet-certificate-bootstrap
|
||||||
labels:
|
labels:
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
addonmanager.kubernetes.io/mode: Reconcile
|
addonmanager.kubernetes.io/mode: Reconcile
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
@@ -50,7 +47,6 @@ kind: ClusterRole
|
|||||||
metadata:
|
metadata:
|
||||||
name: gce:beta:kubelet-certificate-rotation
|
name: gce:beta:kubelet-certificate-rotation
|
||||||
labels:
|
labels:
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
addonmanager.kubernetes.io/mode: Reconcile
|
addonmanager.kubernetes.io/mode: Reconcile
|
||||||
rules:
|
rules:
|
||||||
- apiGroups:
|
- apiGroups:
|
||||||
|
@@ -5,7 +5,6 @@ kind: ClusterRoleBinding
|
|||||||
metadata:
|
metadata:
|
||||||
name: kubelet-cluster-admin
|
name: kubelet-cluster-admin
|
||||||
labels:
|
labels:
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
addonmanager.kubernetes.io/mode: EnsureExists
|
addonmanager.kubernetes.io/mode: EnsureExists
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
@@ -19,7 +18,6 @@ kind: ClusterRoleBinding
|
|||||||
metadata:
|
metadata:
|
||||||
name: kubelet-bootstrap
|
name: kubelet-bootstrap
|
||||||
labels:
|
labels:
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
addonmanager.kubernetes.io/mode: Reconcile
|
addonmanager.kubernetes.io/mode: Reconcile
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
@@ -7,7 +7,6 @@ kind: ClusterRoleBinding
|
|||||||
metadata:
|
metadata:
|
||||||
name: kubelet-cluster-admin
|
name: kubelet-cluster-admin
|
||||||
labels:
|
labels:
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
addonmanager.kubernetes.io/mode: Reconcile
|
addonmanager.kubernetes.io/mode: Reconcile
|
||||||
roleRef:
|
roleRef:
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
|
@@ -5,7 +5,6 @@ metadata:
|
|||||||
annotations:
|
annotations:
|
||||||
storageclass.kubernetes.io/is-default-class: "true"
|
storageclass.kubernetes.io/is-default-class: "true"
|
||||||
labels:
|
labels:
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
addonmanager.kubernetes.io/mode: EnsureExists
|
addonmanager.kubernetes.io/mode: EnsureExists
|
||||||
provisioner: kubernetes.io/aws-ebs
|
provisioner: kubernetes.io/aws-ebs
|
||||||
parameters:
|
parameters:
|
||||||
|
@@ -5,6 +5,5 @@ metadata:
|
|||||||
annotations:
|
annotations:
|
||||||
storageclass.kubernetes.io/is-default-class: "true"
|
storageclass.kubernetes.io/is-default-class: "true"
|
||||||
labels:
|
labels:
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
addonmanager.kubernetes.io/mode: EnsureExists
|
addonmanager.kubernetes.io/mode: EnsureExists
|
||||||
provisioner: kubernetes.io/azure-disk
|
provisioner: kubernetes.io/azure-disk
|
||||||
|
@@ -5,7 +5,6 @@ metadata:
|
|||||||
annotations:
|
annotations:
|
||||||
storageclass.kubernetes.io/is-default-class: "true"
|
storageclass.kubernetes.io/is-default-class: "true"
|
||||||
labels:
|
labels:
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
addonmanager.kubernetes.io/mode: EnsureExists
|
addonmanager.kubernetes.io/mode: EnsureExists
|
||||||
provisioner: kubernetes.io/gce-pd
|
provisioner: kubernetes.io/gce-pd
|
||||||
parameters:
|
parameters:
|
||||||
|
@@ -5,6 +5,5 @@ metadata:
|
|||||||
annotations:
|
annotations:
|
||||||
storageclass.kubernetes.io/is-default-class: "true"
|
storageclass.kubernetes.io/is-default-class: "true"
|
||||||
labels:
|
labels:
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
addonmanager.kubernetes.io/mode: EnsureExists
|
addonmanager.kubernetes.io/mode: EnsureExists
|
||||||
provisioner: kubernetes.io/cinder
|
provisioner: kubernetes.io/cinder
|
||||||
|
@@ -5,7 +5,6 @@ metadata:
|
|||||||
annotations:
|
annotations:
|
||||||
storageclass.kubernetes.io/is-default-class: "true"
|
storageclass.kubernetes.io/is-default-class: "true"
|
||||||
labels:
|
labels:
|
||||||
kubernetes.io/cluster-service: "true"
|
|
||||||
provisioner: kubernetes.io/vsphere-volume
|
provisioner: kubernetes.io/vsphere-volume
|
||||||
parameters:
|
parameters:
|
||||||
diskformat: thin
|
diskformat: thin
|
||||||
|
Reference in New Issue
Block a user