Skip to content

Commit e1fd841

Browse files
committed
Get that dang name prefixing out of the way
Signed-off-by: Mike Spreitzer <mspreitz@us.ibm.com>
1 parent 38156c6 commit e1fd841

File tree

5 files changed

+35
-14
lines changed

5 files changed

+35
-14
lines changed

chart/templates/operator.yaml

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,8 @@ spec:
241241
- --agent-vmodule={{.Values.agent.vmodule}}
242242
env:
243243
- name: STATUS_ADDDON_IMAGE_NAME
244-
value: ko.local/ocm-status-addon:39e5223
245-
image: ko.local/ocm-status-addon:39e5223
244+
value: ko.local/ocm-status-addon:38156c6
245+
image: ko.local/ocm-status-addon:38156c6
246246
imagePullPolicy: IfNotPresent
247247
name: status-controller
248248
ports:
@@ -287,7 +287,10 @@ spec:
287287
description: status addon provides full status on applied resources
288288
displayName: addon-status
289289
installStrategy:
290-
type: Manual
290+
type: Placements
291+
placements:
292+
- name: global
293+
namespace: {{ .Release.Namespace }}
291294
supportedConfigs:
292295
- group: addon.open-cluster-management.io
293296
resource: addondeploymentconfigs
@@ -300,3 +303,23 @@ spec:
300303
securityContext:
301304
runAsNonRoot: true
302305
serviceAccountName: addon-status-sa
306+
---
307+
apiVersion: cluster.open-cluster-management.io/v1beta1
308+
kind: Placement
309+
metadata:
310+
name: global
311+
namespace: open-cluster-management
312+
spec:
313+
clusterSets:
314+
- global
315+
predicates:
316+
- requiredClusterSelector:
317+
labelSelector: {}
318+
---
319+
apiVersion: cluster.open-cluster-management.io/v1beta2
320+
kind: ManagedClusterSetBinding
321+
metadata:
322+
name: global
323+
namespace: open-cluster-management
324+
spec:
325+
clusterSet: global

config/default/kustomization.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
# Adds namespace to all resources.
22
namespace: open-cluster-management
33

4-
# Value of this field is prepended to the
5-
# names of all resources, e.g. a deployment named
6-
# "wordpress" becomes "alices-wordpress".
7-
# Note that it should also match with the prefix (text before '-') of the namespace
8-
# field above.
9-
namePrefix: addon-
10-
114
# Labels to add to all resources and selectors.
125
#labels:
136
#- includeSelectors: true

config/manager/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ replacements:
1515
fieldPath: spec.template.spec.containers.[name=status-controller].image
1616
group: apps
1717
kind: Deployment
18-
name: status-controller
18+
name: addon-status-controller
1919
version: v1
2020
targets:
2121
- fieldPaths:
2222
- spec.template.spec.containers.0.env.0.value
2323
select:
2424
group: apps
2525
kind: Deployment
26-
name: status-controller
26+
name: addon-status-controller
2727
version: v1

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
kind: Deployment
22
apiVersion: apps/v1
33
metadata:
4-
name: status-controller
4+
name: addon-status-controller
55
labels:
66
control-plane: controller-manager
77
app.kubernetes.io/name: deployment

config/rbac/kustomization.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,9 @@ resources:
55
- role.yaml
66
- role_binding.yaml
77

8-
8+
# Value of this field is prepended to the
9+
# names of all resources, e.g. a deployment named
10+
# "wordpress" becomes "alices-wordpress".
11+
# Note that it should also match with the prefix (text before '-') of the namespace
12+
# field above.
13+
namePrefix: addon-

0 commit comments

Comments
 (0)