Skip to content

Promote BackupVault to beta #5418

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
merged 2 commits into from
Oct 22, 2025
+946 −299
Merged

Promote BackupVault to beta #5418

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
9ba4a6f
Promote BackupVault to Beta
yuwenma Oct 22, 2025
1ceb99e
feat: Support GCP labels for BackupDRBackupVault
yuwenma Oct 21, 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
3 changes: 1 addition & 2 deletions apis/backupdr/v1alpha1/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ cd ${REPO_ROOT}/dev/tools/controllerbuilder
go run . generate-types \
--service google.cloud.backupdr.v1 \
--api-version backupdr.cnrm.cloud.google.com/v1alpha1 \
--resource BackupDRManagementServer:ManagementServer \
--resource BackupDRBackupVault:BackupVault
--resource BackupDRManagementServer:ManagementServer

go run . generate-mapper \
--multiversion \
Expand Down
1 change: 0 additions & 1 deletion apis/backupdr/v1alpha1/types.generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

257 changes: 0 additions & 257 deletions apis/backupdr/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apis/backupdr/v1beta1/backupplan_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ type BackupDRBackupPlanSpec struct {
// location for backups.
// +kcc:proto:field=google.cloud.backupdr.v1.BackupPlan.backup_vault
// +required
BackupVaultRef *v1alpha1.BackupVaultRef `json:"backupVaultRef,omitempty"`
BackupVaultRef *BackupVaultRef `json:"backupVaultRef,omitempty"`
}

// BackupDRBackupPlanStatus defines the config connector machine state of BackupDRBackupPlan
Expand Down
2 changes: 1 addition & 1 deletion ...backupdr/v1alpha1/backupvault_identity.go → .../backupdr/v1beta1/backupvault_identity.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package v1alpha1
package v1beta1

import (
"context"
Expand Down
2 changes: 1 addition & 1 deletion ...ackupdr/v1alpha1/backupvault_reference.go → ...backupdr/v1beta1/backupvault_reference.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package v1alpha1
package v1beta1

import (
"context"
Expand Down
16 changes: 14 additions & 2 deletions apis/backupdr/v1alpha1/backupvault_types.go → apis/backupdr/v1beta1/backupvault_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,26 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package v1alpha1
package v1beta1

import (
refsv1beta1 "github.com/GoogleCloudPlatform/k8s-config-connector/apis/refs/v1beta1"
"github.com/GoogleCloudPlatform/k8s-config-connector/pkg/apis/k8s/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)

var BackupDRBackupVaultGVK = GroupVersion.WithKind("BackupDRBackupVault")

type Parent struct {
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An improvement is to use the parent.ProjectAndLocation. I have a gemini guide to do it (and other resources). I plan to track that as a separate effort.

// +required
ProjectRef *refsv1beta1.ProjectRef `json:"projectRef"`

// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="Location field is immutable"
// Immutable.
// +required
Location string `json:"location"`
}

// BackupDRBackupVaultSpec defines the desired state of BackupDRBackupVault
// +kcc:spec:proto=google.cloud.backupdr.v1.BackupVault
type BackupDRBackupVaultSpec struct {
Expand Down Expand Up @@ -140,14 +151,15 @@ type BackupDRBackupVaultObservedState struct {
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +kubebuilder:resource:categories=gcp,shortName=gcpbackupdrbackupvault;gcpbackupdrbackupvaults
// +kubebuilder:subresource:status
// +kubebuilder:metadata:labels="cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/system=true"
// +kubebuilder:metadata:labels="cnrm.cloud.google.com/managed-by-kcc=true";"cnrm.cloud.google.com/system=true";"internal.cloud.google.com/additional-versions=v1alpha1"
// +kubebuilder:printcolumn:name="Age",JSONPath=".metadata.creationTimestamp",type="date"
// +kubebuilder:printcolumn:name="Ready",JSONPath=".status.conditions[?(@.type=='Ready')].status",type="string",description="When 'True', the most recent reconcile of the resource succeeded"
// +kubebuilder:printcolumn:name="Status",JSONPath=".status.conditions[?(@.type=='Ready')].reason",type="string",description="The reason for the value in 'Ready'"
// +kubebuilder:printcolumn:name="Status Age",JSONPath=".status.conditions[?(@.type=='Ready')].lastTransitionTime",type="date",description="The last transition time for the value in 'Status'"

// BackupDRBackupVault is the Schema for the BackupDRBackupVault API
// +k8s:openapi-gen=true
// +kubebuilder:storageversion
type BackupDRBackupVault struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`
Expand Down
4 changes: 3 additions & 1 deletion apis/backupdr/v1beta1/generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ go run . generate-types \
--service google.cloud.backupdr.v1 \
--api-version backupdr.cnrm.cloud.google.com/v1beta1 \
--resource BackupDRBackupPlanAssociation:BackupPlanAssociation \
--resource BackupDRBackupPlan:BackupPlan
--resource BackupDRBackupPlan:BackupPlan \
--resource BackupDRBackupVault:BackupVault \


go run . generate-mapper \
--multiversion \
Expand Down
1 change: 1 addition & 0 deletions apis/backupdr/v1beta1/types.generated.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading