Skip to content

Fixup make bundle #1857 and add back safeguard from #1867 #1875

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

Merged
openshift-merge-bot merged 1 commit into from
Apr 8, 2026
Merged

Fixup make bundle #1857 and add back safeguard from #1867 #1875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions config/manifests/bases/openstack-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,9 @@ spec:
Resource
displayName: Template
path: openstackclient.template
- description: List of environment variables to set in the container.
displayName: Env
path: openstackclient.template.env
- description: Ovn - Overrides to use when creating the OVN Services
displayName: Ovn
path: ovn
Expand Down
16 changes: 13 additions & 3 deletions internal/openstack/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (

"github.com/openstack-k8s-operators/lib-common/modules/common/helper"
corev1beta1 "github.com/openstack-k8s-operators/openstack-operator/api/core/v1beta1"
k8s_errors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
ctrl "sigs.k8s.io/controller-runtime"
Expand Down Expand Up @@ -252,10 +253,19 @@ func ReconcileVersion(ctx context.Context, instance *corev1beta1.OpenStackContro
Name: instance.Name,
Namespace: instance.Namespace,
},
version); err == nil {
Log.Info(fmt.Sprintf("OpenStackVersion found. Name: %s", version.Name))
} else {
version); err != nil {
if !k8s_errors.IsNotFound(err) {
return ctrl.Result{}, nil, fmt.Errorf("failed to get OpenStackVersion %s: %w", instance.Name, err)
}
Log.Info(fmt.Sprintf("OpenStackVersion does not exist. Creating: %s", version.Name))
} else {
Log.Info(fmt.Sprintf("OpenStackVersion found. Name: %s", version.Name))
}

// If the controlplane is being deleted, skip CreateOrPatch to avoid
// re-creating the OpenStackVersion CR during cleanup.
if !instance.DeletionTimestamp.IsZero() {
return ctrl.Result{}, version, nil
}

op, err := controllerutil.CreateOrPatch(ctx, helper.GetClient(), version, func() error {
Expand Down
Loading