Skip to content

Commit 328f233

Browse files
stuggiclaude
stuggi
and
claude
committed
[b/r] Rename backup labels to backup.openstack.org/ prefix
Update kubebuilder CRD annotations, generated manifests, bindata, and tests from openstack.org/backup-* to backup.openstack.org/*: - backup.openstack.org/restore (was openstack.org/backup-restore) - backup.openstack.org/category (was openstack.org/backup-category) - backup.openstack.org/restore-order (was openstack.org/backup-restore-order) - backup.openstack.org/backup (was openstack.org/backup) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent e11d10b commit 328f233

33 files changed

Lines changed: 144 additions & 102 deletions

‎api/backup/v1beta1/openstackbackupconfig_types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@ type ResourceCounts struct {
109109
// +kubebuilder:printcolumn:name="Secrets",type="integer",JSONPath=".status.labeledResources.secrets",description="Labeled Secrets"
110110
// +kubebuilder:printcolumn:name="ConfigMaps",type="integer",JSONPath=".status.labeledResources.configMaps",description="Labeled ConfigMaps"
111111
// +kubebuilder:printcolumn:name="NADs",type="integer",JSONPath=".status.labeledResources.networkAttachmentDefinitions",description="Labeled NADs"
112-
// +kubebuilder:metadata:labels=openstack.org/backup-restore=true
113-
// +kubebuilder:metadata:labels=openstack.org/backup-category=controlplane
114-
// +kubebuilder:metadata:labels=openstack.org/backup-restore-order=20
112+
// +kubebuilder:metadata:labels=backup.openstack.org/restore=true
113+
// +kubebuilder:metadata:labels=backup.openstack.org/category=controlplane
114+
// +kubebuilder:metadata:labels=backup.openstack.org/restore-order=20
115115

116116
// OpenStackBackupConfig is the Schema for the openstackbackupconfigs API.
117117
// It configures automatic backup labeling for user-provided resources (without ownerReferences).

‎api/bases/backup.openstack.org_openstackbackupconfigs.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.18.0
77
labels:
8-
openstack.org/backup-category: controlplane
9-
openstack.org/backup-restore: "true"
10-
openstack.org/backup-restore-order: "20"
8+
backup.openstack.org/category: controlplane
9+
backup.openstack.org/restore: "true"
10+
backup.openstack.org/restore-order: "20"
1111
name: openstackbackupconfigs.backup.openstack.org
1212
spec:
1313
group: backup.openstack.org

‎api/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.18.0
77
labels:
8-
openstack.org/backup-category: controlplane
9-
openstack.org/backup-restore: "true"
10-
openstack.org/backup-restore-order: "30"
8+
backup.openstack.org/category: controlplane
9+
backup.openstack.org/restore: "true"
10+
backup.openstack.org/restore-order: "30"
1111
name: openstackcontrolplanes.core.openstack.org
1212
spec:
1313
group: core.openstack.org

‎api/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.18.0
77
labels:
8-
openstack.org/backup-category: controlplane
9-
openstack.org/backup-restore: "true"
10-
openstack.org/backup-restore-order: "20"
8+
backup.openstack.org/category: controlplane
9+
backup.openstack.org/restore: "true"
10+
backup.openstack.org/restore-order: "20"
1111
name: openstackversions.core.openstack.org
1212
spec:
1313
group: core.openstack.org

‎api/bases/dataplane.openstack.org_openstackdataplanenodesets.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.18.0
77
labels:
8-
openstack.org/backup-category: dataplane
9-
openstack.org/backup-restore: "true"
10-
openstack.org/backup-restore-order: "60"
8+
backup.openstack.org/category: dataplane
9+
backup.openstack.org/restore: "true"
10+
backup.openstack.org/restore-order: "60"
1111
name: openstackdataplanenodesets.dataplane.openstack.org
1212
spec:
1313
group: dataplane.openstack.org

‎api/bases/dataplane.openstack.org_openstackdataplaneservices.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.18.0
77
labels:
8-
openstack.org/backup-category: dataplane
9-
openstack.org/backup-restore: "true"
10-
openstack.org/backup-restore-order: "40"
8+
backup.openstack.org/category: dataplane
9+
backup.openstack.org/restore: "true"
10+
backup.openstack.org/restore-order: "40"
1111
name: openstackdataplaneservices.dataplane.openstack.org
1212
spec:
1313
group: dataplane.openstack.org

‎api/core/v1beta1/openstackcontrolplane_types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,9 +1118,9 @@ type TLSCAStatus struct {
11181118
// +kubebuilder:resource:shortName=osctlplane;osctlplanes;oscp;oscps
11191119
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[0].status",description="Status"
11201120
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.conditions[0].message",description="Message"
1121-
// +kubebuilder:metadata:labels=openstack.org/backup-restore=true
1122-
// +kubebuilder:metadata:labels=openstack.org/backup-category=controlplane
1123-
// +kubebuilder:metadata:labels=openstack.org/backup-restore-order=30
1121+
// +kubebuilder:metadata:labels=backup.openstack.org/restore=true
1122+
// +kubebuilder:metadata:labels=backup.openstack.org/category=controlplane
1123+
// +kubebuilder:metadata:labels=backup.openstack.org/restore-order=30
11241124

11251125
// OpenStackControlPlane is the Schema for the openstackcontrolplanes API
11261126
type OpenStackControlPlane struct {

‎api/core/v1beta1/openstackversion_types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -215,9 +215,9 @@ type OpenStackVersionStatus struct {
215215
// +kubebuilder:printcolumn:name="Target Version",type=string,JSONPath=`.spec.targetVersion`
216216
// +kubebuilder:printcolumn:name="Available Version",type=string,JSONPath=`.status.availableVersion`
217217
// +kubebuilder:printcolumn:name="Deployed Version",type=string,JSONPath=`.status.deployedVersion`
218-
// +kubebuilder:metadata:labels=openstack.org/backup-restore=true
219-
// +kubebuilder:metadata:labels=openstack.org/backup-category=controlplane
220-
// +kubebuilder:metadata:labels=openstack.org/backup-restore-order=20
218+
// +kubebuilder:metadata:labels=backup.openstack.org/restore=true
219+
// +kubebuilder:metadata:labels=backup.openstack.org/category=controlplane
220+
// +kubebuilder:metadata:labels=backup.openstack.org/restore-order=20
221221

222222
// OpenStackVersion defines the Schema for the openstackversionupdates API
223223
type OpenStackVersion struct {

‎api/dataplane/v1beta1/openstackdataplanenodeset_types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ type OpenStackDataPlaneNodeSetSpec struct {
9494
// +kubebuilder:resource:shortName=osdpns;osdpnodeset;osdpnodesets
9595
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[0].status",description="Status"
9696
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.conditions[0].message",description="Message"
97-
// +kubebuilder:metadata:labels=openstack.org/backup-restore=true
98-
// +kubebuilder:metadata:labels=openstack.org/backup-category=dataplane
99-
// +kubebuilder:metadata:labels=openstack.org/backup-restore-order=60
97+
// +kubebuilder:metadata:labels=backup.openstack.org/restore=true
98+
// +kubebuilder:metadata:labels=backup.openstack.org/category=dataplane
99+
// +kubebuilder:metadata:labels=backup.openstack.org/restore-order=60
100100

101101
// OpenStackDataPlaneNodeSet is the Schema for the openstackdataplanenodesets API
102102
// OpenStackDataPlaneNodeSet name must be a valid RFC1123 as it is used in labels

‎api/dataplane/v1beta1/openstackdataplaneservice_types.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,9 @@ type OpenStackDataPlaneServiceStatus struct {
130130
// +kubebuilder:subresource:status
131131
// +kubebuilder:resource:shortName=osdps;osdpservice;osdpservices
132132
// +operator-sdk:csv:customresourcedefinitions:displayName="OpenStack Data Plane Service"
133-
// +kubebuilder:metadata:labels=openstack.org/backup-restore=true
134-
// +kubebuilder:metadata:labels=openstack.org/backup-category=dataplane
135-
// +kubebuilder:metadata:labels=openstack.org/backup-restore-order=40
133+
// +kubebuilder:metadata:labels=backup.openstack.org/restore=true
134+
// +kubebuilder:metadata:labels=backup.openstack.org/category=dataplane
135+
// +kubebuilder:metadata:labels=backup.openstack.org/restore-order=40
136136

137137
// OpenStackDataPlaneService defines the Schema for the openstackdataplaneservices API.
138138
// OpenStackDataPlaneService name must be a valid RFC1123 as it is used in labels

0 commit comments

Comments
 (0)