Skip to content

Commit 68f18d2

Browse files
authored
create placement in kueue installed namespace as default placement (open-cluster-management-io#71)
Signed-off-by: Qing Hao <qhao@redhat.com>
1 parent 6c841a0 commit 68f18d2

6 files changed

Lines changed: 11 additions & 14 deletions

File tree

kueue-addon/build/setup-env.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ install_kueue() {
104104
kubectl apply --server-side -k "$training_operator_kustomize" --context "$ctx" || true
105105
kubectl apply --server-side -k "$ray_operator_crd_manifest" --context "$ctx" || true
106106
done
107-
clusteradm clusterset bind global --namespace kueue-system --context ${hubctx}
108107
}
109108

110109
# Function to install OCM addons
@@ -141,14 +140,12 @@ install_ocm_addons() {
141140
helm upgrade --install \
142141
-n open-cluster-management-addon --create-namespace \
143142
kueue-addon ../charts/kueue-addon \
144-
--set image.tag=e2e \
145-
--set skipClusterSetBinding=true
143+
--set image.tag=e2e
146144
else
147145
echo "Install kueue-addon"
148146
helm upgrade --install \
149147
-n open-cluster-management-addon --create-namespace \
150-
kueue-addon ocm/kueue-addon \
151-
--set skipClusterSetBinding=true
148+
kueue-addon ocm/kueue-addon
152149
fi
153150

154151
echo "Install resource-usage-collect-addon"

kueue-addon/charts/kueue-addon/templates/cluster-management-addon.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
type: Placements
1414
placements:
1515
- name: {{ .Values.placement.name | default .Release.Name }}
16-
namespace: {{ .Release.Namespace }}
16+
namespace: {{ .Values.kueue.namespace }}
1717
configs:
1818
- name: kueue-addon-{{ .Chart.Version }}
1919
group: addon.open-cluster-management.io

kueue-addon/charts/kueue-addon/templates/placement.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: cluster.open-cluster-management.io/v1beta2
33
kind: ManagedClusterSetBinding
44
metadata:
55
name: global
6-
namespace: {{ .Release.Namespace }}
6+
namespace: {{ .Values.kueue.namespace }}
77
spec:
88
clusterSet: global
99
{{- end }}
@@ -14,7 +14,7 @@ apiVersion: cluster.open-cluster-management.io/v1beta1
1414
kind: Placement
1515
metadata:
1616
name: {{ .Values.placement.name | default .Release.Name }}
17-
namespace: {{ .Release.Namespace }}
17+
namespace: {{ .Values.kueue.namespace }}
1818
spec:
1919
clusterSets:
2020
- global

kueue-addon/charts/kueue-addon/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ skipClusterSetBinding: false
1212

1313
# Placement configuration
1414
placement:
15-
name: ""
15+
name: default
1616

1717
# Resource flavor
1818
resourceFlavor:

kueue-addon/deploy/resources/cluster-management-addon.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ spec:
1212
installStrategy:
1313
type: Placements
1414
placements:
15-
- name: spoke
16-
namespace: open-cluster-management-addon
15+
- name: default
16+
namespace: kueue-system
1717
configs:
1818
- name: kueue-addon
1919
group: addon.open-cluster-management.io

kueue-addon/deploy/resources/placement.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: cluster.open-cluster-management.io/v1beta2
22
kind: ManagedClusterSetBinding
33
metadata:
44
name: global
5-
namespace: open-cluster-management-addon
5+
namespace: kueue-system
66
spec:
77
clusterSet: global
88

@@ -11,8 +11,8 @@ spec:
1111
apiVersion: cluster.open-cluster-management.io/v1beta1
1212
kind: Placement
1313
metadata:
14-
name: spoke
15-
namespace: open-cluster-management-addon
14+
name: default
15+
namespace: kueue-system
1616
spec:
1717
clusterSets:
1818
- global

0 commit comments

Comments
 (0)