Skip to content

Commit 4ff76ce

Browse files
committed
update fbcs with TP bundles and fix dup in makefile
1 parent 19b8799 commit 4ff76ce

File tree

6 files changed

+29
-47
lines changed

6 files changed

+29
-47
lines changed

Makefile

-18
Original file line numberDiff line numberDiff line change
@@ -230,24 +230,6 @@ e2e-upstream-test: get-kueue-image wait-for-image deploy-cert-manager wait-for-c
230230
@rm -f .kueue_image
231231

232232

233-
.PHONY: e2e-tech-preview-test
234-
e2e-tech-preview-test: wait-for-image deploy-cert-manager ginkgo
235-
@echo "Running operator e2e tests with released images..."
236-
export KUEUE_IMAGE=registry.redhat.io/kueue-tech-preview/kueue-rhel9@sha256:d0d6c34952e3d60be62fe7add33aa7ae2b0ac5c1bd2592e319f4cc28b2a2783e
237-
$(GINKGO) -v ./test/e2e/...
238-
make undeploy-ocp
239-
@rm -f .kueue_image
240-
241-
.PHONY: e2e-tech-preview-upstream-test
242-
e2e-tech-preview-upstream-test: wait-for-image deploy-cert-manager wait-for-cert-manager deploy-ocp
243-
@echo "Running upstream e2e tests with released images..."
244-
export KUEUE_IMAGE=registry.redhat.io/kueue-tech-preview/kueue-rhel9@sha256:d0d6c34952e3d60be62fe7add33aa7ae2b0ac5c1bd2592e319f4cc28b2a2783e
245-
cd $(TEMP_DIR) && KUEUE_NAMESPACE="openshift-kueue-operator" make -f Makefile-test-ocp.mk test-e2e-upstream-ocp
246-
@echo "Cleaning up TEMP_DIR: $(TEMP_DIR)"
247-
@rm -rf $(TEMP_DIR)
248-
make undeploy-ocp
249-
@rm -f .kueue_image
250-
251233
.PHONY: e2e-tech-preview-test
252234
e2e-tech-preview-test: wait-for-image deploy-cert-manager ginkgo
253235
@echo "Running operator e2e tests with released images..."

fbc/v4.18/catalog-template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ GenerateMinorChannels: true
44
DefaultChannelTypePreference: "minor"
55
Stable:
66
Bundles:
7-
- Image: quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:ce10c13a9dfd0267630b1e53b80515739c38d36b0323176d69a522500e1f4b7b
7+
- Image: quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:f2a9b5c73dada8854786fe08e8576d8fab4b109617138822b95b262bec0d2ae0

fbc/v4.18/catalog/kueue-operator/catalog.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"schema": "olm.package",
33
"name": "kueue-operator",
4-
"defaultChannel": "stable-v0.0"
4+
"defaultChannel": "stable-v0.1"
55
}
66
{
77
"schema": "olm.channel",
8-
"name": "stable-v0.0",
8+
"name": "stable-v0.1",
99
"package": "kueue-operator",
1010
"entries": [
1111
{
12-
"name": "kueue-operator.v0.0.1"
12+
"name": "kueue-operator.v0.1.0"
1313
}
1414
]
1515
}
1616
{
1717
"schema": "olm.bundle",
18-
"name": "kueue-operator.v0.0.1",
18+
"name": "kueue-operator.v0.1.0",
1919
"package": "kueue-operator",
20-
"image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:a006ae12d6af7218f820ecc595af287bef0284fd69fb6b223dc284d685c66114",
20+
"image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:f2a9b5c73dada8854786fe08e8576d8fab4b109617138822b95b262bec0d2ae0",
2121
"properties": [
2222
{
2323
"type": "olm.gvk",
@@ -31,17 +31,17 @@
3131
"type": "olm.package",
3232
"value": {
3333
"packageName": "kueue-operator",
34-
"version": "0.0.1"
34+
"version": "0.1.0"
3535
}
3636
},
3737
{
3838
"type": "olm.csv.metadata",
3939
"value": {
4040
"annotations": {
41-
"alm-examples": "[\n {\n \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n \"kind\": \"Kueue\",\n \"metadata\": {\n \"labels\": {\n \"app.kubernetes.io/managed-by\": \"kustomize\",\n \"app.kubernetes.io/name\": \"kueue-operator\"\n },\n \"name\": \"cluster\",\n \"namespace\": \"openshift-kueue-operator\"\n },\n \"spec\": {\n \"config\": {\n \"integrations\": {\n \"frameworks\": [\n \"BatchJob\",\n \"Pod\",\n \"Deployment\",\n \"StatefulSet\"\n ]\n }\n },\n \"managementState\": \"Managed\"\n }\n },\n {\n \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n \"kind\": \"Kueue\",\n \"metadata\": {\n \"labels\": {\n \"app.kubernetes.io/managed-by\": \"kustomize\",\n \"app.kubernetes.io/name\": \"kueue-operator\"\n },\n \"name\": \"cluster\",\n \"namespace\": \"openshift-kueue-operator\"\n },\n \"spec\": {\n \"config\": {\n \"integrations\": {\n \"externalFrameworks\": [\n \"AppWrapper\"\n ],\n \"frameworks\": [\n \"BatchJob\",\n \"RayJob\",\n \"RayCluster\"\n ]\n }\n }\n }\n }\n]",
41+
"alm-examples": "[\n {\n \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n \"kind\": \"Kueue\",\n \"metadata\": {\n \"labels\": {\n \"app.kubernetes.io/managed-by\": \"kustomize\",\n \"app.kubernetes.io/name\": \"kueue-operator\"\n },\n \"name\": \"cluster\",\n \"namespace\": \"openshift-kueue-operator\"\n },\n \"spec\": {\n \"config\": {\n \"integrations\": {\n \"frameworks\": [\n \"AppWrapper\"\n ]\n },\n \"kueueGangSchedulingPolicy\": {\n \"policy\": \"Disabled\"\n },\n \"preemption\": {\n \"preemptionStrategy\": \"FairSharing\"\n },\n \"queueLabelPolicy\": {\n \"queueLabelPolicy\": \"QueueNameOptional\"\n }\n },\n \"managementState\": \"Managed\"\n }\n },\n {\n \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n \"kind\": \"Kueue\",\n \"metadata\": {\n \"labels\": {\n \"app.kubernetes.io/managed-by\": \"kustomize\",\n \"app.kubernetes.io/name\": \"kueue-operator\"\n },\n \"name\": \"cluster\",\n \"namespace\": \"openshift-kueue-operator\"\n },\n \"spec\": {\n \"config\": {\n \"integrations\": {\n \"frameworks\": [\n \"BatchJob\",\n \"Pod\",\n \"Deployment\",\n \"StatefulSet\"\n ]\n }\n },\n \"managementState\": \"Managed\"\n }\n },\n {\n \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n \"kind\": \"Kueue\",\n \"metadata\": {\n \"labels\": {\n \"app.kubernetes.io/managed-by\": \"kustomize\",\n \"app.kubernetes.io/name\": \"kueue-operator\"\n },\n \"name\": \"cluster\",\n \"namespace\": \"openshift-kueue-operator\"\n },\n \"spec\": {\n \"config\": {\n \"integrations\": {\n \"frameworks\": [\n \"BatchJob\",\n \"RayJob\",\n \"RayCluster\",\n \"AppWrapper\",\n \"PyTorchJob\"\n ]\n },\n \"kueueGangSchedulingPolicy\": {\n \"byWorkload\": \"Parallel\",\n \"policy\": \"ByWorkload\"\n },\n \"preemption\": {\n \"preemptionStrategy\": \"Classical\"\n },\n \"queueLabelPolicy\": {\n \"queueLabelPolicy\": \"QueueNameRequired\"\n }\n },\n \"managementState\": \"Managed\"\n }\n }\n]",
4242
"capabilities": "Basic Install",
4343
"console.openshift.io/operator-monitoring-default": "true",
44-
"createdAt": "2025-04-03T17:38:12Z",
44+
"createdAt": "2025-05-01T17:14:19Z",
4545
"features.operators.openshift.io/cnf": "false",
4646
"features.operators.openshift.io/cni": "false",
4747
"features.operators.openshift.io/csi": "false",
@@ -114,16 +114,16 @@
114114
],
115115
"relatedImages": [
116116
{
117-
"name": "operand-image",
118-
"image": "registry.redhat.io/kueue-tech-preview/kueue-rhel9@sha256:d0d6c34952e3d60be62fe7add33aa7ae2b0ac5c1bd2592e319f4cc28b2a2783e"
117+
"name": "",
118+
"image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:f2a9b5c73dada8854786fe08e8576d8fab4b109617138822b95b262bec0d2ae0"
119119
},
120120
{
121121
"name": "",
122-
"image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:a006ae12d6af7218f820ecc595af287bef0284fd69fb6b223dc284d685c66114"
122+
"image": "registry.redhat.io/kueue-tech-preview/kueue-rhel9-operator@sha256:dab9b8733300df86380ad15fc79fbe86c7dc7cfe1c643dbbdd3c650bcd64da43"
123123
},
124124
{
125-
"name": "operator-image",
126-
"image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-operator@sha256:d90da026cf2633ee1a02e2f5674808088f5acd0c54c987941ccb39c214842adb"
125+
"name": "operand-image",
126+
"image": "registry.redhat.io/kueue-tech-preview/kueue-rhel9@sha256:5e1c44d2a931df99c9d068720b787fffd0dfa9afee5b6c85a63fcddee0dcbd38"
127127
}
128128
]
129129
}

fbc/v4.19/Containerfile.catalog

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# The base image is expected to contain /bin/opm (with a serve subcommand) and /bin/grpc_health_probe
2-
FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.19
2+
FROM brew.registry.redhat.io/rh-osbs/openshift-ose-operator-registry-rhel9:v4.19
33

44
ENTRYPOINT ["/bin/opm"]
55
CMD ["serve", "/configs", "--cache-dir=/tmp/cache"]

fbc/v4.19/catalog-template.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ GenerateMinorChannels: true
44
DefaultChannelTypePreference: "minor"
55
Stable:
66
Bundles:
7-
- Image: quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:ce10c13a9dfd0267630b1e53b80515739c38d36b0323176d69a522500e1f4b7b
7+
- Image: quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:f2a9b5c73dada8854786fe08e8576d8fab4b109617138822b95b262bec0d2ae0

fbc/v4.19/catalog/kueue-operator/catalog.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
{
22
"schema": "olm.package",
33
"name": "kueue-operator",
4-
"defaultChannel": "stable-v0.0"
4+
"defaultChannel": "stable-v0.1"
55
}
66
{
77
"schema": "olm.channel",
8-
"name": "stable-v0.0",
8+
"name": "stable-v0.1",
99
"package": "kueue-operator",
1010
"entries": [
1111
{
12-
"name": "kueue-operator.v0.0.1"
12+
"name": "kueue-operator.v0.1.0"
1313
}
1414
]
1515
}
1616
{
1717
"schema": "olm.bundle",
18-
"name": "kueue-operator.v0.0.1",
18+
"name": "kueue-operator.v0.1.0",
1919
"package": "kueue-operator",
20-
"image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:a006ae12d6af7218f820ecc595af287bef0284fd69fb6b223dc284d685c66114",
20+
"image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:f2a9b5c73dada8854786fe08e8576d8fab4b109617138822b95b262bec0d2ae0",
2121
"properties": [
2222
{
2323
"type": "olm.gvk",
@@ -31,17 +31,17 @@
3131
"type": "olm.package",
3232
"value": {
3333
"packageName": "kueue-operator",
34-
"version": "0.0.1"
34+
"version": "0.1.0"
3535
}
3636
},
3737
{
3838
"type": "olm.csv.metadata",
3939
"value": {
4040
"annotations": {
41-
"alm-examples": "[\n {\n \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n \"kind\": \"Kueue\",\n \"metadata\": {\n \"labels\": {\n \"app.kubernetes.io/managed-by\": \"kustomize\",\n \"app.kubernetes.io/name\": \"kueue-operator\"\n },\n \"name\": \"cluster\",\n \"namespace\": \"openshift-kueue-operator\"\n },\n \"spec\": {\n \"config\": {\n \"integrations\": {\n \"frameworks\": [\n \"BatchJob\",\n \"Pod\",\n \"Deployment\",\n \"StatefulSet\"\n ]\n }\n },\n \"managementState\": \"Managed\"\n }\n },\n {\n \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n \"kind\": \"Kueue\",\n \"metadata\": {\n \"labels\": {\n \"app.kubernetes.io/managed-by\": \"kustomize\",\n \"app.kubernetes.io/name\": \"kueue-operator\"\n },\n \"name\": \"cluster\",\n \"namespace\": \"openshift-kueue-operator\"\n },\n \"spec\": {\n \"config\": {\n \"integrations\": {\n \"externalFrameworks\": [\n \"AppWrapper\"\n ],\n \"frameworks\": [\n \"BatchJob\",\n \"RayJob\",\n \"RayCluster\"\n ]\n }\n }\n }\n }\n]",
41+
"alm-examples": "[\n {\n \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n \"kind\": \"Kueue\",\n \"metadata\": {\n \"labels\": {\n \"app.kubernetes.io/managed-by\": \"kustomize\",\n \"app.kubernetes.io/name\": \"kueue-operator\"\n },\n \"name\": \"cluster\",\n \"namespace\": \"openshift-kueue-operator\"\n },\n \"spec\": {\n \"config\": {\n \"integrations\": {\n \"frameworks\": [\n \"AppWrapper\"\n ]\n },\n \"kueueGangSchedulingPolicy\": {\n \"policy\": \"Disabled\"\n },\n \"preemption\": {\n \"preemptionStrategy\": \"FairSharing\"\n },\n \"queueLabelPolicy\": {\n \"queueLabelPolicy\": \"QueueNameOptional\"\n }\n },\n \"managementState\": \"Managed\"\n }\n },\n {\n \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n \"kind\": \"Kueue\",\n \"metadata\": {\n \"labels\": {\n \"app.kubernetes.io/managed-by\": \"kustomize\",\n \"app.kubernetes.io/name\": \"kueue-operator\"\n },\n \"name\": \"cluster\",\n \"namespace\": \"openshift-kueue-operator\"\n },\n \"spec\": {\n \"config\": {\n \"integrations\": {\n \"frameworks\": [\n \"BatchJob\",\n \"Pod\",\n \"Deployment\",\n \"StatefulSet\"\n ]\n }\n },\n \"managementState\": \"Managed\"\n }\n },\n {\n \"apiVersion\": \"operator.openshift.io/v1alpha1\",\n \"kind\": \"Kueue\",\n \"metadata\": {\n \"labels\": {\n \"app.kubernetes.io/managed-by\": \"kustomize\",\n \"app.kubernetes.io/name\": \"kueue-operator\"\n },\n \"name\": \"cluster\",\n \"namespace\": \"openshift-kueue-operator\"\n },\n \"spec\": {\n \"config\": {\n \"integrations\": {\n \"frameworks\": [\n \"BatchJob\",\n \"RayJob\",\n \"RayCluster\",\n \"AppWrapper\",\n \"PyTorchJob\"\n ]\n },\n \"kueueGangSchedulingPolicy\": {\n \"byWorkload\": \"Parallel\",\n \"policy\": \"ByWorkload\"\n },\n \"preemption\": {\n \"preemptionStrategy\": \"Classical\"\n },\n \"queueLabelPolicy\": {\n \"queueLabelPolicy\": \"QueueNameRequired\"\n }\n },\n \"managementState\": \"Managed\"\n }\n }\n]",
4242
"capabilities": "Basic Install",
4343
"console.openshift.io/operator-monitoring-default": "true",
44-
"createdAt": "2025-04-03T17:38:12Z",
44+
"createdAt": "2025-05-01T17:14:19Z",
4545
"features.operators.openshift.io/cnf": "false",
4646
"features.operators.openshift.io/cni": "false",
4747
"features.operators.openshift.io/csi": "false",
@@ -114,16 +114,16 @@
114114
],
115115
"relatedImages": [
116116
{
117-
"name": "operand-image",
118-
"image": "registry.redhat.io/kueue-tech-preview/kueue-rhel9@sha256:d0d6c34952e3d60be62fe7add33aa7ae2b0ac5c1bd2592e319f4cc28b2a2783e"
117+
"name": "",
118+
"image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:f2a9b5c73dada8854786fe08e8576d8fab4b109617138822b95b262bec0d2ae0"
119119
},
120120
{
121121
"name": "",
122-
"image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-bundle-1-0@sha256:a006ae12d6af7218f820ecc595af287bef0284fd69fb6b223dc284d685c66114"
122+
"image": "registry.redhat.io/kueue-tech-preview/kueue-rhel9-operator@sha256:dab9b8733300df86380ad15fc79fbe86c7dc7cfe1c643dbbdd3c650bcd64da43"
123123
},
124124
{
125-
"name": "operator-image",
126-
"image": "quay.io/redhat-user-workloads/kueue-operator-tenant/kueue-operator@sha256:d90da026cf2633ee1a02e2f5674808088f5acd0c54c987941ccb39c214842adb"
125+
"name": "operand-image",
126+
"image": "registry.redhat.io/kueue-tech-preview/kueue-rhel9@sha256:5e1c44d2a931df99c9d068720b787fffd0dfa9afee5b6c85a63fcddee0dcbd38"
127127
}
128128
]
129129
}

0 commit comments

Comments
 (0)