Skip to content

Test KUTTL tests (breaking) #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lpiwowar wants to merge 2 commits into from
Closed

Test KUTTL tests (breaking) #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bedc31e
Test KUTTL tests (breaking)
lpiwowar Dec 5, 2025
ffb65b7
Overwrite images from quay.io in CI
lpiwowar Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion bundle.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
FROM scratch
FROM registry.redhat.io/ubi9/ubi-minimal:9.7 as builder
ARG RELATED_IMAGE_FILE=related_images.json
ARG CSV_FILE=bundle/manifests/openstack-lightspeed-operator.clusterserviceversion.yaml
ARG OPERATOR_IMAGE_ORIGINAL=quay.io/openstack-lightspeed/operator:latest

RUN microdnf install -y jq

COPY ${CSV_FILE} /manifests/openstack-lightspeed-operator.clusterserviceversion.yaml
COPY ${RELATED_IMAGE_FILE} /${RELATED_IMAGE_FILE}

RUN OPERATOR_IMAGE=$(jq -r '.[] | select(.name == "openstack-lightspeed-operator") | .image' /${RELATED_IMAGE_FILE}) && sed -i "s|${OPERATOR_IMAGE_ORIGINAL}|${OPERATOR_IMAGE}|g" /manifests/openstack-lightspeed-operator.clusterserviceversion.yaml

FROM registry.redhat.io/ubi9/ubi-minimal:9.7

# Core bundle labels.
LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
LABEL operators.operatorframework.io.bundle.package.v1=openstack-lightspeed-operator
LABEL operators.operatorframework.io.bundle.channels.v1=alpha
LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha
LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.38.0
LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1
LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4
Expand All @@ -18,3 +31,6 @@ LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/
COPY bundle/manifests /manifests/
COPY bundle/metadata /metadata/
COPY bundle/tests/scorecard /tests/scorecard/

# Copy the CSV file with replaced image references
COPY --from=builder /manifests/openstack-lightspeed-operator.clusterserviceversion.yaml /manifests/openstack-lightspeed-operator.clusterserviceversion.yaml
8 changes: 0 additions & 8 deletions internal/controller/openstacklightspeed_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,14 +268,6 @@ func (r *OpenStackLightspeedReconciler) reconcileDelete(
return ctrl.Result{RequeueAfter: time.Second * 10}, nil
}

isUninstalled, err := UninstallInstanceOwnedOLSOperator(ctx, helper, instance)
if err != nil {
return ctrl.Result{}, err
} else if !isUninstalled {
Log.Info("OLS Operator uninstallation in progress ...")
return ctrl.Result{RequeueAfter: time.Second * 10}, nil
}

controllerutil.RemoveFinalizer(instance, helper.GetFinalizer())

Log.Info("OpenStackLightspeed Reconciling Delete completed")
Expand Down
6 changes: 6 additions & 0 deletions related_images.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"name": "openstack-lightspeed-operator",
"image": "quay.io/openstack-lightspeed/operator:latest"
}
]
Loading