Skip to content

Commit c32eb24

Browse files
Merge pull request openstack-k8s-operators#397 from abays/br_restore_order
[b/r] Add restore labels to OSBMS and OSProvServer CRDs
2 parents ae42c89 + 5282978 commit c32eb24

6 files changed

Lines changed: 22 additions & 0 deletions

api/bases/baremetal.openstack.org_openstackbaremetalsets.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.18.0
7+
labels:
8+
backup.openstack.org/category: dataplane
9+
backup.openstack.org/restore: "true"
10+
backup.openstack.org/restore-order: "55"
711
name: openstackbaremetalsets.baremetal.openstack.org
812
spec:
913
group: baremetal.openstack.org

api/bases/baremetal.openstack.org_openstackprovisionservers.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.18.0
7+
labels:
8+
backup.openstack.org/category: dataplane
9+
backup.openstack.org/restore: "true"
10+
backup.openstack.org/restore-order: "55"
711
name: openstackprovisionservers.baremetal.openstack.org
812
spec:
913
group: baremetal.openstack.org

api/v1beta1/openstackbaremetalset_types.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@ type OpenStackBaremetalSetStatus struct {
186186
// +operator-sdk:csv:customresourcedefinitions:displayName="OpenStack BaremetalSet"
187187
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[0].status",description="Status"
188188
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.conditions[0].message",description="Message"
189+
// +kubebuilder:metadata:labels=backup.openstack.org/restore=true
190+
// +kubebuilder:metadata:labels=backup.openstack.org/category=dataplane
191+
// +kubebuilder:metadata:labels=backup.openstack.org/restore-order=55
189192

190193
// OpenStackBaremetalSet is the Schema for the openstackbaremetalsets API
191194
type OpenStackBaremetalSet struct {

api/v1beta1/openstackprovisionserver_types.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ func (instance *OpenStackProvisionServer) IsReady() bool {
119119
// +operator-sdk:csv:customresourcedefinitions:displayName="OpenStackProvisionServer"
120120
// +kubebuilder:printcolumn:name="Status",type="string",JSONPath=".status.conditions[0].status",description="Status"
121121
// +kubebuilder:printcolumn:name="Message",type="string",JSONPath=".status.conditions[0].message",description="Message"
122+
// +kubebuilder:metadata:labels=backup.openstack.org/restore=true
123+
// +kubebuilder:metadata:labels=backup.openstack.org/category=dataplane
124+
// +kubebuilder:metadata:labels=backup.openstack.org/restore-order=55
122125

123126
// OpenStackProvisionServer used to serve custom images for baremetal provisioning with Metal3
124127
type OpenStackProvisionServer struct {

config/crd/bases/baremetal.openstack.org_openstackbaremetalsets.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.18.0
7+
labels:
8+
backup.openstack.org/category: dataplane
9+
backup.openstack.org/restore: "true"
10+
backup.openstack.org/restore-order: "55"
711
name: openstackbaremetalsets.baremetal.openstack.org
812
spec:
913
group: baremetal.openstack.org

config/crd/bases/baremetal.openstack.org_openstackprovisionservers.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.18.0
7+
labels:
8+
backup.openstack.org/category: dataplane
9+
backup.openstack.org/restore: "true"
10+
backup.openstack.org/restore-order: "55"
711
name: openstackprovisionservers.baremetal.openstack.org
812
spec:
913
group: baremetal.openstack.org

0 commit comments

Comments
 (0)