Skip to content
This repository was archived by the owner on Jul 30, 2021. It is now read-only.

Commit 45b6740

Browse files
authored
Merge pull request #120 from SataQiu/fix-20190813
Update control-plane label value as cabpk-controller-manager
2 parents 5c77b24 + 7f4669d commit 45b6740

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

config-capi/manager/manager.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ metadata:
1111
name: controller-manager-service
1212
namespace: system
1313
labels:
14-
control-plane: controller-manager
14+
control-plane: cabpk-controller-manager
1515
controller-tools.k8s.io: "1.0"
1616
spec:
1717
selector:
18-
control-plane: controller-manager
18+
control-plane: cabpk-controller-manager
1919
controller-tools.k8s.io: "1.0"
2020
ports:
2121
- port: 443
@@ -26,18 +26,18 @@ metadata:
2626
name: controller-manager
2727
namespace: system
2828
labels:
29-
control-plane: controller-manager
29+
control-plane: cabpk-controller-manager
3030
controller-tools.k8s.io: "1.0"
3131
spec:
3232
selector:
3333
matchLabels:
34-
control-plane: controller-manager
34+
control-plane: cabpk-controller-manager
3535
controller-tools.k8s.io: "1.0"
3636
serviceName: controller-manager-service
3737
template:
3838
metadata:
3939
labels:
40-
control-plane: controller-manager
40+
control-plane: cabpk-controller-manager
4141
controller-tools.k8s.io: "1.0"
4242
spec:
4343
tolerations:

config/manager/manager.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
kind: Namespace
33
metadata:
44
labels:
5-
control-plane: controller-manager
5+
control-plane: cabpk-controller-manager
66
name: system
77
---
88
apiVersion: apps/v1
@@ -11,16 +11,16 @@ metadata:
1111
name: controller-manager
1212
namespace: system
1313
labels:
14-
control-plane: controller-manager
14+
control-plane: cabpk-controller-manager
1515
spec:
1616
selector:
1717
matchLabels:
18-
control-plane: controller-manager
18+
control-plane: cabpk-controller-manager
1919
replicas: 1
2020
template:
2121
metadata:
2222
labels:
23-
control-plane: controller-manager
23+
control-plane: cabpk-controller-manager
2424
spec:
2525
containers:
2626
- args:

config/rbac/auth_proxy_service.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
prometheus.io/scheme: https
77
prometheus.io/scrape: "true"
88
labels:
9-
control-plane: controller-manager
9+
control-plane: cabpk-controller-manager
1010
name: controller-manager-metrics-service
1111
namespace: system
1212
spec:
@@ -15,4 +15,4 @@ spec:
1515
port: 8443
1616
targetPort: https
1717
selector:
18-
control-plane: controller-manager
18+
control-plane: cabpk-controller-manager

config/webhook/service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ spec:
99
- port: 443
1010
targetPort: 443
1111
selector:
12-
control-plane: controller-manager
12+
control-plane: cabpk-controller-manager

0 commit comments

Comments
 (0)