Skip to content

Commit 73411c1

Browse files
Merge pull request #108 from umago/pvc-follow-ups
Follow up on persistent storage changes (PR#107)
2 parents 0f8b424 + fa63694 commit 73411c1

9 files changed

Lines changed: 13 additions & 9 deletions

api/v1beta1/openstacklightspeed_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ type OpenStackLightspeedStatus struct {
173173
// +operator-sdk:csv:customresourcedefinitions:resources={{ServiceAccount,v1,lightspeed-app-server}}
174174
// +operator-sdk:csv:customresourcedefinitions:resources={{NetworkPolicy,v1,lightspeed-app-server}}
175175
// +operator-sdk:csv:customresourcedefinitions:resources={{NetworkPolicy,v1,lightspeed-postgres-server}}
176-
// +operator-sdk:csv:customresourcedefinitions:resources={{PersistentVolumeClaim,v1,openstack-lightspeed-data}}
176+
// +operator-sdk:csv:customresourcedefinitions:resources={{PersistentVolumeClaim,v1,openstack-lightspeed-database}}
177177
// +operator-sdk:csv:customresourcedefinitions:resources={{ClusterRole,v1,lightspeed-app-server-sar-role}}
178178
// +operator-sdk:csv:customresourcedefinitions:resources={{ClusterRoleBinding,v1,lightspeed-app-server-sar-role-binding}}
179179
// +operator-sdk:csv:customresourcedefinitions:resources={{Subscription,v1alpha1}}

bundle/manifests/openstack-lightspeed-operator.clusterserviceversion.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ metadata:
2525
]
2626
capabilities: Basic Install
2727
categories: AI/Machine Learning
28-
createdAt: "2026-05-27T08:37:10Z"
28+
createdAt: "2026-05-27T13:26:52Z"
2929
description: AI-powered virtual assistant for Red Hat OpenStack Services on OpenShift
3030
features.operators.openshift.io/cnf: "false"
3131
features.operators.openshift.io/cni: "false"
@@ -114,7 +114,7 @@ spec:
114114
name: metrics-reader-token
115115
version: v1
116116
- kind: PersistentVolumeClaim
117-
name: openstack-lightspeed-data
117+
name: openstack-lightspeed-database
118118
version: v1
119119
specDescriptors:
120120
- description: |-

config/manifests/bases/openstack-lightspeed-operator.clusterserviceversion.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ spec:
9191
name: metrics-reader-token
9292
version: v1
9393
- kind: PersistentVolumeClaim
94-
name: openstack-lightspeed-data
94+
name: openstack-lightspeed-database
9595
version: v1
9696
specDescriptors:
9797
- description: |-

internal/controller/constants.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const (
7272
PostgresConfigVolumeMountPath = "/usr/share/pgsql/postgresql.conf.sample"
7373
PostgresDataVolume = "postgres-data"
7474
PostgresDataVolumeMountPath = "/var/lib/pgsql"
75-
PostgresDataPVCName = "openstack-lightspeed-data"
75+
PostgresDataPVCName = "openstack-lightspeed-database"
7676
PostgresDataPVCDefaultSize = "1Gi"
7777
PostgresVarRunVolumeName = "lightspeed-postgres-var-run"
7878
PostgresVarRunVolumeMountPath = "/var/run/postgresql"

internal/controller/postgres_reconciler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ func reconcilePostgresPVC(h *common_helper.Helper, ctx context.Context, instance
252252
return fmt.Errorf("%w: requested size %s but existing PVC has %s",
253253
ErrPostgresPVCSizeMismatch, requestedQty.String(), existingQty.String())
254254
}
255-
h.GetLogger().Info("Postgres PVC already exists with matching size", "name", pvc.Name)
255+
h.GetLogger().Info("Reusing the existing PostgreSQL PVC with a matching size", "name", pvc.Name)
256256
return nil
257257
}
258258

test/kuttl/common/openstack-lightspeed-instance/assert-openstack-lightspeed-instance.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
apiVersion: v1
88
kind: PersistentVolumeClaim
99
metadata:
10-
name: openstack-lightspeed-data
10+
name: openstack-lightspeed-database
1111
namespace: openstack-lightspeed
1212
spec:
1313
accessModes:

test/kuttl/common/openstack-lightspeed-instance/cleanup-openstack-lightspeed-instance.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,8 @@ delete:
66
kind: OpenStackLightspeed
77
name: openstack-lightspeed
88
namespace: openstack-lightspeed
9+
- apiVersion: v1
10+
kind: PersistentVolumeClaim
11+
name: openstack-lightspeed-database
12+
namespace: openstack-lightspeed
913

test/kuttl/tests/persistent-database/02-cleanup-leftover-pvc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ kind: TestStep
44
delete:
55
- apiVersion: v1
66
kind: PersistentVolumeClaim
7-
name: openstack-lightspeed-data
7+
name: openstack-lightspeed-database
88
namespace: openstack-lightspeed

test/kuttl/tests/persistent-database/04-assert-openstack-lightspeed-instance.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
apiVersion: v1
88
kind: PersistentVolumeClaim
99
metadata:
10-
name: openstack-lightspeed-data
10+
name: openstack-lightspeed-database
1111
namespace: openstack-lightspeed
1212
spec:
1313
accessModes:

0 commit comments

Comments
 (0)