Skip to content

Commit 5168fc9

Browse files
committed
add CloudController capability annotation
1 parent b06bfa1 commit 5168fc9

17 files changed

+39
-7
lines changed

manifests/0000_26_cloud-controller-manager-operator_00_namespace.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ apiVersion: v1
22
kind: Namespace
33
metadata:
44
annotations:
5+
capability.openshift.io/name: CloudControllerManager
56
include.release.openshift.io/single-node-developer: "true"
67
include.release.openshift.io/self-managed-high-availability: "true"
78
openshift.io/node-selector: ""
@@ -18,6 +19,7 @@ apiVersion: v1
1819
kind: Namespace
1920
metadata:
2021
annotations:
22+
capability.openshift.io/name: CloudControllerManager
2123
include.release.openshift.io/single-node-developer: "true"
2224
include.release.openshift.io/self-managed-high-availability: "true"
2325
openshift.io/node-selector: ""

manifests/0000_26_cloud-controller-manager-operator_01_images.configmap.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ metadata:
44
name: cloud-controller-manager-images
55
namespace: openshift-cloud-controller-manager-operator
66
annotations:
7+
capability.openshift.io/name: CloudControllerManager
78
include.release.openshift.io/self-managed-high-availability: "true"
89
include.release.openshift.io/single-node-developer: "true"
910
data:

manifests/0000_26_cloud-controller-manager-operator_02_rbac_operator.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
namespace: openshift-cloud-controller-manager-operator
66
name: cluster-cloud-controller-manager
77
annotations:
8+
capability.openshift.io/name: CloudControllerManager
89
include.release.openshift.io/self-managed-high-availability: "true"
910
include.release.openshift.io/single-node-developer: "true"
1011

@@ -14,6 +15,7 @@ kind: ClusterRole
1415
metadata:
1516
name: system:openshift:operator:cloud-controller-manager
1617
annotations:
18+
capability.openshift.io/name: CloudControllerManager
1719
include.release.openshift.io/self-managed-high-availability: "true"
1820
include.release.openshift.io/single-node-developer: "true"
1921
rules:
@@ -166,6 +168,7 @@ metadata:
166168
name: cluster-cloud-controller-manager
167169
namespace: openshift-cloud-controller-manager-operator
168170
annotations:
171+
capability.openshift.io/name: CloudControllerManager
169172
include.release.openshift.io/self-managed-high-availability: "true"
170173
include.release.openshift.io/single-node-developer: "true"
171174
rules:
@@ -209,6 +212,7 @@ metadata:
209212
name: cluster-cloud-controller-manager
210213
namespace: openshift-config
211214
annotations:
215+
capability.openshift.io/name: CloudControllerManager
212216
include.release.openshift.io/self-managed-high-availability: "true"
213217
include.release.openshift.io/single-node-developer: "true"
214218
rules:
@@ -228,6 +232,7 @@ metadata:
228232
name: cluster-cloud-controller-manager
229233
namespace: openshift-config
230234
annotations:
235+
capability.openshift.io/name: CloudControllerManager
231236
include.release.openshift.io/self-managed-high-availability: "true"
232237
include.release.openshift.io/single-node-developer: "true"
233238
roleRef:
@@ -246,6 +251,7 @@ metadata:
246251
name: cluster-cloud-controller-manager
247252
namespace: openshift-config-managed
248253
annotations:
254+
capability.openshift.io/name: CloudControllerManager
249255
include.release.openshift.io/self-managed-high-availability: "true"
250256
include.release.openshift.io/single-node-developer: "true"
251257
rules:
@@ -265,6 +271,7 @@ metadata:
265271
name: cluster-cloud-controller-manager
266272
namespace: openshift-config-managed
267273
annotations:
274+
capability.openshift.io/name: CloudControllerManager
268275
include.release.openshift.io/self-managed-high-availability: "true"
269276
include.release.openshift.io/single-node-developer: "true"
270277
roleRef:
@@ -282,6 +289,7 @@ kind: ClusterRoleBinding
282289
metadata:
283290
name: system:openshift:operator:cloud-controller-manager
284291
annotations:
292+
capability.openshift.io/name: CloudControllerManager
285293
include.release.openshift.io/self-managed-high-availability: "true"
286294
include.release.openshift.io/single-node-developer: "true"
287295
roleRef:
@@ -300,6 +308,7 @@ metadata:
300308
name: cluster-cloud-controller-manager
301309
namespace: openshift-cloud-controller-manager-operator
302310
annotations:
311+
capability.openshift.io/name: CloudControllerManager
303312
include.release.openshift.io/self-managed-high-availability: "true"
304313
include.release.openshift.io/single-node-developer: "true"
305314
roleRef:
@@ -318,6 +327,7 @@ metadata:
318327
name: cluster-cloud-controller-manager
319328
namespace: openshift-cloud-controller-manager
320329
annotations:
330+
capability.openshift.io/name: CloudControllerManager
321331
include.release.openshift.io/self-managed-high-availability: "true"
322332
include.release.openshift.io/single-node-developer: "true"
323333
roleRef:

manifests/0000_26_cloud-controller-manager-operator_03_rbac_provider.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
namespace: openshift-cloud-controller-manager
66
name: cloud-controller-manager
77
annotations:
8+
capability.openshift.io/name: CloudControllerManager
89
include.release.openshift.io/self-managed-high-availability: "true"
910
include.release.openshift.io/single-node-developer: "true"
1011

@@ -15,6 +16,7 @@ metadata:
1516
name: cloud-controller-manager
1617
namespace: openshift-cloud-controller-manager
1718
annotations:
19+
capability.openshift.io/name: CloudControllerManager
1820
include.release.openshift.io/self-managed-high-availability: "true"
1921
include.release.openshift.io/single-node-developer: "true"
2022
roleRef:
@@ -33,6 +35,7 @@ metadata:
3335
name: cloud-controller-manager
3436
namespace: openshift-cloud-controller-manager
3537
annotations:
38+
capability.openshift.io/name: CloudControllerManager
3639
include.release.openshift.io/self-managed-high-availability: "true"
3740
include.release.openshift.io/single-node-developer: "true"
3841
rules:
@@ -61,6 +64,7 @@ metadata:
6164
name: cloud-controller-manager
6265
namespace: kube-system
6366
annotations:
67+
capability.openshift.io/name: CloudControllerManager
6468
include.release.openshift.io/self-managed-high-availability: "true"
6569
include.release.openshift.io/single-node-developer: "true"
6670
roleRef:
@@ -79,6 +83,7 @@ metadata:
7983
name: cloud-controller-manager
8084
namespace: kube-system
8185
annotations:
86+
capability.openshift.io/name: CloudControllerManager
8287
include.release.openshift.io/self-managed-high-availability: "true"
8388
include.release.openshift.io/single-node-developer: "true"
8489
rules:
@@ -102,6 +107,7 @@ kind: ClusterRole
102107
metadata:
103108
name: cloud-controller-manager
104109
annotations:
110+
capability.openshift.io/name: CloudControllerManager
105111
include.release.openshift.io/self-managed-high-availability: "true"
106112
include.release.openshift.io/single-node-developer: "true"
107113
rules:
@@ -128,6 +134,7 @@ kind: ClusterRoleBinding
128134
metadata:
129135
name: cloud-controller-manager
130136
annotations:
137+
capability.openshift.io/name: CloudControllerManager
131138
include.release.openshift.io/self-managed-high-availability: "true"
132139
include.release.openshift.io/single-node-developer: "true"
133140
roleRef:
@@ -146,6 +153,7 @@ metadata:
146153
name: cloud-controller-manager:apiserver-authentication-reader
147154
namespace: kube-system
148155
annotations:
156+
capability.openshift.io/name: CloudControllerManager
149157
include.release.openshift.io/self-managed-high-availability: "true"
150158
include.release.openshift.io/single-node-developer: "true"
151159
roleRef:
@@ -162,6 +170,7 @@ apiVersion: v1
162170
kind: ServiceAccount
163171
metadata:
164172
annotations:
173+
capability.openshift.io/name: CloudControllerManager
165174
include.release.openshift.io/self-managed-high-availability: "true"
166175
include.release.openshift.io/single-node-developer: "true"
167176
name: cloud-node-manager
@@ -173,6 +182,7 @@ apiVersion: rbac.authorization.k8s.io/v1
173182
metadata:
174183
name: cloud-node-manager
175184
annotations:
185+
capability.openshift.io/name: CloudControllerManager
176186
include.release.openshift.io/self-managed-high-availability: "true"
177187
include.release.openshift.io/single-node-developer: "true"
178188
rules:
@@ -189,6 +199,7 @@ kind: ClusterRoleBinding
189199
metadata:
190200
name: cloud-node-manager
191201
annotations:
202+
capability.openshift.io/name: CloudControllerManager
192203
include.release.openshift.io/self-managed-high-availability: "true"
193204
include.release.openshift.io/single-node-developer: "true"
194205
roleRef:

manifests/0000_26_cloud-controller-manager-operator_04_rbac_provider_openstack.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
namespace: kube-system
66
name: cloud-controller-manager
77
annotations:
8+
capability.openshift.io/name: CloudControllerManager
89
include.release.openshift.io/self-managed-high-availability: "true"
910
include.release.openshift.io/single-node-developer: "true"
1011

@@ -14,6 +15,7 @@ kind: ClusterRole
1415
metadata:
1516
name: openstack-cloud-controller-manager
1617
annotations:
18+
capability.openshift.io/name: CloudControllerManager
1719
include.release.openshift.io/self-managed-high-availability: "true"
1820
include.release.openshift.io/single-node-developer: "true"
1921
rules:
@@ -38,6 +40,7 @@ kind: ClusterRoleBinding
3840
metadata:
3941
name: openstack-cloud-controller-manager
4042
annotations:
43+
capability.openshift.io/name: CloudControllerManager
4144
include.release.openshift.io/self-managed-high-availability: "true"
4245
include.release.openshift.io/single-node-developer: "true"
4346
roleRef:

manifests/0000_26_cloud-controller-manager-operator_05_metrics-service.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ metadata:
44
name: cloud-controller-manager-operator
55
namespace: openshift-cloud-controller-manager-operator
66
annotations:
7+
capability.openshift.io/name: CloudControllerManager
78
include.release.openshift.io/self-managed-high-availability: "true"
89
include.release.openshift.io/single-node-developer: "true"
910
service.alpha.openshift.io/serving-cert-secret-name: cloud-controller-manager-operator-tls

manifests/0000_26_cloud-controller-manager-operator_06_kube-rbac-proxy-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
name: kube-rbac-proxy
66
namespace: openshift-cloud-controller-manager-operator
77
annotations:
8+
capability.openshift.io/name: CloudControllerManager
89
include.release.openshift.io/self-managed-high-availability: "true"
910
include.release.openshift.io/single-node-developer: "true"
1011
data:

manifests/0000_26_cloud-controller-manager-operator_10_deployment_tombstone.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ metadata:
44
name: cluster-cloud-controller-manager
55
namespace: openshift-cloud-controller-manager-operator
66
annotations:
7+
capability.openshift.io/name: CloudControllerManager
78
include.release.openshift.io/self-managed-high-availability: "true"
89
include.release.openshift.io/single-node-developer: "true"
910
release.openshift.io/delete: "true"

manifests/0000_26_cloud-controller-manager-operator_11_deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ metadata:
44
name: cluster-cloud-controller-manager-operator
55
namespace: openshift-cloud-controller-manager-operator
66
annotations:
7+
capability.openshift.io/name: CloudControllerManager
78
include.release.openshift.io/self-managed-high-availability: "true"
89
include.release.openshift.io/single-node-developer: "true"
910
labels:

manifests/0000_26_cloud-controller-manager-operator_12_clusteroperator.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ kind: ClusterOperator
33
metadata:
44
name: cloud-controller-manager
55
annotations:
6+
capability.openshift.io/name: CloudControllerManager
67
include.release.openshift.io/self-managed-high-availability: "true"
78
include.release.openshift.io/single-node-developer: "true"
89
exclude.release.openshift.io/internal-openshift-hosted: "true"

0 commit comments

Comments
 (0)