Skip to content

Commit 353a850

Browse files
zhiweiyin318zhiweiyin318
authored
✨ Cherry pick enable-sync-lables to 0.13 (#515)
* sync labels from klusterlet to all agent resources (#475) Signed-off-by: Zhiwei Yin <zyin@redhat.com> * add enable-sync-labels flag to klusterlet operator (#505) Signed-off-by: Zhiwei Yin <zyin@redhat.com> * fix issue that pull secret and ns are synced labels when enable-sync-labels is disabled (#511) Signed-off-by: Zhiwei Yin <zyin@redhat.com> --------- Signed-off-by: Zhiwei Yin <zyin@redhat.com>
1 parent c41fe8c commit 353a850

File tree

43 files changed

+571
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+571
-190
lines changed

‎manifests/klusterlet/managed/klusterlet-registration-clusterrole-addon-management.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ apiVersion: rbac.authorization.k8s.io/v1
77
kind: ClusterRole
88
metadata:
99
name: open-cluster-management:{{ .KlusterletName }}-registration:addon-management
10+
labels:
11+
{{ if gt (len .Labels) 0 }}
12+
{{ range $key, $value := .Labels }}
13+
{{ $key }}: {{ $value }}
14+
{{ end }}
15+
{{ end }}
1016
rules:
1117
# Allow agent to get/list/watch/create/delete/update/patch secrets.
1218
- apiGroups: [""]

‎manifests/klusterlet/managed/klusterlet-registration-clusterrole.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRole
55
metadata:
66
name: open-cluster-management:{{ .KlusterletName }}-registration:agent
7+
labels:
8+
{{ if gt (len .Labels) 0 }}
9+
{{ range $key, $value := .Labels }}
10+
{{ $key }}: {{ $value }}
11+
{{ end }}
12+
{{ end }}
713
rules:
814
# Allow agent to get/list/watch nodes
915
# list nodes to calculates the capacity and allocatable resources of the managed cluster

‎manifests/klusterlet/managed/klusterlet-registration-clusterrolebinding-addon-management.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ apiVersion: rbac.authorization.k8s.io/v1
77
kind: ClusterRoleBinding
88
metadata:
99
name: open-cluster-management:{{ .KlusterletName }}-registration:addon-management
10+
labels:
11+
{{ if gt (len .Labels) 0 }}
12+
{{ range $key, $value := .Labels }}
13+
{{ $key }}: {{ $value }}
14+
{{ end }}
15+
{{ end }}
1016
roleRef:
1117
apiGroup: rbac.authorization.k8s.io
1218
kind: ClusterRole

‎manifests/klusterlet/managed/klusterlet-registration-clusterrolebinding.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
55
name: open-cluster-management:{{ .KlusterletName }}-registration:agent
6+
labels:
7+
{{ if gt (len .Labels) 0 }}
8+
{{ range $key, $value := .Labels }}
9+
{{ $key }}: {{ $value }}
10+
{{ end }}
11+
{{ end }}
612
roleRef:
713
apiGroup: rbac.authorization.k8s.io
814
kind: ClusterRole

‎manifests/klusterlet/managed/klusterlet-registration-serviceaccount.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,11 @@ kind: ServiceAccount
33
metadata:
44
name: {{ .RegistrationServiceAccount }}
55
namespace: {{ .KlusterletNamespace }}
6+
labels:
7+
{{ if gt (len .Labels) 0 }}
8+
{{ range $key, $value := .Labels }}
9+
{{ $key }}: {{ $value }}
10+
{{ end }}
11+
{{ end }}
612
imagePullSecrets:
713
- name: open-cluster-management-image-pull-credentials

‎manifests/klusterlet/managed/klusterlet-work-clusterrole-execution.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ metadata:
66
name: open-cluster-management:{{ .KlusterletName }}-work:execution
77
labels:
88
open-cluster-management.io/aggregate-to-work: "true"
9+
{{ if gt (len .Labels) 0 }}
10+
{{ range $key, $value := .Labels }}
11+
{{ $key }}: {{ $value }}
12+
{{ end }}
13+
{{ end }}
914
rules:
1015
# Allow agent to get/list/watch/create/delete crds.
1116
- apiGroups: ["apiextensions.k8s.io"]

‎manifests/klusterlet/managed/klusterlet-work-clusterrole.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRole
55
metadata:
66
name: open-cluster-management:{{ .KlusterletName }}-work:agent
7+
labels:
8+
{{ if gt (len .Labels) 0 }}
9+
{{ range $key, $value := .Labels }}
10+
{{ $key }}: {{ $value }}
11+
{{ end }}
12+
{{ end }}
713
rules:
814
# Allow agent to managed appliedmanifestworks
915
- apiGroups: ["work.open-cluster-management.io"]

‎manifests/klusterlet/managed/klusterlet-work-clusterrolebinding-aggregate.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRoleBinding
55
metadata:
66
name: open-cluster-management:{{ .KlusterletName }}-work:aggregate
7+
labels:
8+
{{ if gt (len .Labels) 0 }}
9+
{{ range $key, $value := .Labels }}
10+
{{ $key }}: {{ $value }}
11+
{{ end }}
12+
{{ end }}
713
roleRef:
814
apiGroup: rbac.authorization.k8s.io
915
kind: ClusterRole

‎manifests/klusterlet/managed/klusterlet-work-clusterrolebinding-execution-admin.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRoleBinding
55
metadata:
66
name: open-cluster-management:{{ .KlusterletName }}-work:execution-admin
7+
labels:
8+
{{ if gt (len .Labels) 0 }}
9+
{{ range $key, $value := .Labels }}
10+
{{ $key }}: {{ $value }}
11+
{{ end }}
12+
{{ end }}
713
roleRef:
814
apiGroup: rbac.authorization.k8s.io
915
kind: ClusterRole

‎manifests/klusterlet/managed/klusterlet-work-clusterrolebinding-execution.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
55
name: open-cluster-management:{{ .KlusterletName }}-work:execution
6+
labels:
7+
{{ if gt (len .Labels) 0 }}
8+
{{ range $key, $value := .Labels }}
9+
{{ $key }}: {{ $value }}
10+
{{ end }}
11+
{{ end }}
612
roleRef:
713
apiGroup: rbac.authorization.k8s.io
814
kind: ClusterRole

‎manifests/klusterlet/managed/klusterlet-work-clusterrolebinding.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
55
name: open-cluster-management:{{ .KlusterletName }}-work:agent
6+
labels:
7+
{{ if gt (len .Labels) 0 }}
8+
{{ range $key, $value := .Labels }}
9+
{{ $key }}: {{ $value }}
10+
{{ end }}
11+
{{ end }}
612
roleRef:
713
apiGroup: rbac.authorization.k8s.io
814
kind: ClusterRole

‎manifests/klusterlet/managed/klusterlet-work-serviceaccount.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,11 @@ kind: ServiceAccount
33
metadata:
44
name: {{ .WorkServiceAccount }}
55
namespace: {{ .KlusterletNamespace }}
6+
labels:
7+
{{ if gt (len .Labels) 0 }}
8+
{{ range $key, $value := .Labels }}
9+
{{ $key }}: {{ $value }}
10+
{{ end }}
11+
{{ end }}
612
imagePullSecrets:
713
- name: open-cluster-management-image-pull-credentials

‎manifests/klusterlet/management/klusterlet-agent-deployment.yaml

+10-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ metadata:
55
namespace: {{ .AgentNamespace }}
66
labels:
77
app: klusterlet-agent
8-
createdBy: klusterlet
8+
{{ if gt (len .Labels) 0 }}
9+
{{ range $key, $value := .Labels }}
10+
{{ $key }}: {{ $value }}
11+
{{ end }}
12+
{{ end }}
913
spec:
1014
replicas: {{ .Replica }}
1115
selector:
@@ -17,6 +21,11 @@ spec:
1721
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
1822
labels:
1923
app: klusterlet-agent
24+
{{ if gt (len .Labels) 0 }}
25+
{{ range $key, $value := .Labels }}
26+
{{ $key }}: {{ $value }}
27+
{{ end }}
28+
{{ end }}
2029
spec:
2130
{{if .HubApiServerHostAlias }}
2231
hostAliases:

‎manifests/klusterlet/management/klusterlet-registration-clusterrole-addon-management.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRole
55
metadata:
66
name: open-cluster-management:management:{{ .KlusterletName }}-registration:addon-management
7+
labels:
8+
{{ if gt (len .Labels) 0 }}
9+
{{ range $key, $value := .Labels }}
10+
{{ $key }}: {{ $value }}
11+
{{ end }}
12+
{{ end }}
713
rules:
814
# Allow agent to get/list/watch/create/delete/update/patch secrets, registration agent needs secret permission for an
915
# arbitrary namespace to create hub-kubeconfig secret for an addon

‎manifests/klusterlet/management/klusterlet-registration-clusterrolebinding-addon-management.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ apiVersion: rbac.authorization.k8s.io/v1
55
kind: ClusterRoleBinding
66
metadata:
77
name: open-cluster-management:management:{{ .KlusterletName }}-registration:addon-management
8+
labels:
9+
{{ if gt (len .Labels) 0 }}
10+
{{ range $key, $value := .Labels }}
11+
{{ $key }}: {{ $value }}
12+
{{ end }}
13+
{{ end }}
814
roleRef:
915
apiGroup: rbac.authorization.k8s.io
1016
kind: ClusterRole

‎manifests/klusterlet/management/klusterlet-registration-deployment.yaml

+10-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ metadata:
55
namespace: {{ .AgentNamespace }}
66
labels:
77
app: klusterlet-registration-agent
8-
createdBy: klusterlet
8+
{{ if gt (len .Labels) 0 }}
9+
{{ range $key, $value := .Labels }}
10+
{{ $key }}: {{ $value }}
11+
{{ end }}
12+
{{ end }}
913
spec:
1014
replicas: {{ .Replica }}
1115
selector:
@@ -17,6 +21,11 @@ spec:
1721
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
1822
labels:
1923
app: klusterlet-registration-agent
24+
{{ if gt (len .Labels) 0 }}
25+
{{ range $key, $value := .Labels }}
26+
{{ $key }}: {{ $value }}
27+
{{ end }}
28+
{{ end }}
2029
spec:
2130
{{if .HubApiServerHostAlias }}
2231
hostAliases:

‎manifests/klusterlet/management/klusterlet-registration-role.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ kind: Role
55
metadata:
66
name: open-cluster-management:management:{{ .KlusterletName }}-registration:agent
77
namespace: {{ .AgentNamespace }}
8+
labels:
9+
{{ if gt (len .Labels) 0 }}
10+
{{ range $key, $value := .Labels }}
11+
{{ $key }}: {{ $value }}
12+
{{ end }}
13+
{{ end }}
814
rules:
915
# leader election needs to operate configmaps and leases
1016
- apiGroups: [""]

‎manifests/klusterlet/management/klusterlet-registration-rolebinding-extension-apiserver.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ kind: RoleBinding
33
metadata:
44
name: open-cluster-management:management:{{ .KlusterletName }}-registration:agent
55
namespace: kube-system
6+
labels:
7+
{{ if gt (len .Labels) 0 }}
8+
{{ range $key, $value := .Labels }}
9+
{{ $key }}: {{ $value }}
10+
{{ end }}
11+
{{ end }}
612
roleRef:
713
apiGroup: rbac.authorization.k8s.io
814
kind: Role

‎manifests/klusterlet/management/klusterlet-registration-rolebinding.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ kind: RoleBinding
44
metadata:
55
name: open-cluster-management:management:{{ .KlusterletName }}-registration:agent
66
namespace: {{ .AgentNamespace }}
7+
labels:
8+
{{ if gt (len .Labels) 0 }}
9+
{{ range $key, $value := .Labels }}
10+
{{ $key }}: {{ $value }}
11+
{{ end }}
12+
{{ end }}
713
roleRef:
814
apiGroup: rbac.authorization.k8s.io
915
kind: Role

‎manifests/klusterlet/management/klusterlet-registration-serviceaccount.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,11 @@ kind: ServiceAccount
33
metadata:
44
name: {{ .RegistrationServiceAccount }}
55
namespace: {{ .AgentNamespace }}
6+
labels:
7+
{{ if gt (len .Labels) 0 }}
8+
{{ range $key, $value := .Labels }}
9+
{{ $key }}: {{ $value }}
10+
{{ end }}
11+
{{ end }}
612
imagePullSecrets:
713
- name: open-cluster-management-image-pull-credentials

‎manifests/klusterlet/management/klusterlet-role-extension-apiserver.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ kind: Role
77
metadata:
88
name: open-cluster-management:management:{{ .KlusterletName }}:extension-apiserver
99
namespace: kube-system
10+
labels:
11+
{{ if gt (len .Labels) 0 }}
12+
{{ range $key, $value := .Labels }}
13+
{{ $key }}: {{ $value }}
14+
{{ end }}
15+
{{ end }}
1016
rules:
1117
- apiGroups: [""]
1218
resources: ["configmaps"]

‎manifests/klusterlet/management/klusterlet-work-deployment.yaml

+10-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ metadata:
55
namespace: {{ .AgentNamespace }}
66
labels:
77
app: klusterlet-manifestwork-agent
8-
createdBy: klusterlet
8+
{{ if gt (len .Labels) 0 }}
9+
{{ range $key, $value := .Labels }}
10+
{{ $key }}: {{ $value }}
11+
{{ end }}
12+
{{ end }}
913
spec:
1014
replicas: {{ .Replica }}
1115
selector:
@@ -17,6 +21,11 @@ spec:
1721
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
1822
labels:
1923
app: klusterlet-manifestwork-agent
24+
{{ if gt (len .Labels) 0 }}
25+
{{ range $key, $value := .Labels }}
26+
{{ $key }}: {{ $value }}
27+
{{ end }}
28+
{{ end }}
2029
spec:
2130
{{if .HubApiServerHostAlias }}
2231
hostAliases:

‎manifests/klusterlet/management/klusterlet-work-role.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ kind: Role
55
metadata:
66
name: open-cluster-management:management:{{ .KlusterletName }}-work:agent
77
namespace: {{ .AgentNamespace }}
8+
labels:
9+
{{ if gt (len .Labels) 0 }}
10+
{{ range $key, $value := .Labels }}
11+
{{ $key }}: {{ $value }}
12+
{{ end }}
13+
{{ end }}
814
rules:
915
# leader election needs to operate configmaps and leases
1016
- apiGroups: [""]

‎manifests/klusterlet/management/klusterlet-work-rolebinding-extension-apiserver.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ kind: RoleBinding
33
metadata:
44
name: open-cluster-management:management:{{ .KlusterletName }}-work:agent
55
namespace: kube-system
6+
labels:
7+
{{ if gt (len .Labels) 0 }}
8+
{{ range $key, $value := .Labels }}
9+
{{ $key }}: {{ $value }}
10+
{{ end }}
11+
{{ end }}
612
roleRef:
713
apiGroup: rbac.authorization.k8s.io
814
kind: Role

‎manifests/klusterlet/management/klusterlet-work-rolebinding.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@ kind: RoleBinding
44
metadata:
55
name: open-cluster-management:management:{{ .KlusterletName }}-work:agent
66
namespace: {{ .AgentNamespace }}
7+
labels:
8+
{{ if gt (len .Labels) 0 }}
9+
{{ range $key, $value := .Labels }}
10+
{{ $key }}: {{ $value }}
11+
{{ end }}
12+
{{ end }}
713
roleRef:
814
apiGroup: rbac.authorization.k8s.io
915
kind: Role

‎manifests/klusterlet/management/klusterlet-work-serviceaccount.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,11 @@ kind: ServiceAccount
33
metadata:
44
name: {{ .WorkServiceAccount }}
55
namespace: {{ .AgentNamespace }}
6+
labels:
7+
{{ if gt (len .Labels) 0 }}
8+
{{ range $key, $value := .Labels }}
9+
{{ $key }}: {{ $value }}
10+
{{ end }}
11+
{{ end }}
612
imagePullSecrets:
713
- name: open-cluster-management-image-pull-credentials

‎manifests/klusterletkube111/klusterlet-registration-operator-clusterrolebinding.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
55
name: open-cluster-management:{{ .KlusterletName }}-registration-operator:operator-kube111
6+
labels:
7+
{{ if gt (len .Labels) 0 }}
8+
{{ range $key, $value := .Labels }}
9+
{{ $key }}: {{ $value }}
10+
{{ end }}
11+
{{ end }}
612
roleRef:
713
apiGroup: rbac.authorization.k8s.io
814
kind: ClusterRole

‎manifests/klusterletkube111/klusterlet-work-clusterrolebinding.yaml

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: ClusterRoleBinding
44
metadata:
55
name: open-cluster-management:{{ .KlusterletName }}-work:agent-kube111
6+
labels:
7+
{{ if gt (len .Labels) 0 }}
8+
{{ range $key, $value := .Labels }}
9+
{{ $key }}: {{ $value }}
10+
{{ end }}
11+
{{ end }}
612
roleRef:
713
apiGroup: rbac.authorization.k8s.io
814
kind: ClusterRole

0 commit comments

Comments
 (0)