Promote Backupvault to beta

Author: yuwenma

apis/backupdr/v1alpha1/generate.sh

@@ -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 \

apis/backupdr/v1alpha1/types.generated.go

@@ -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

apis/backupdr/v1alpha1/zz_generated.deepcopy.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha1
+package v1beta1
 
 import (
 	"context"

apis/backupdr/v1beta1/backupplan_types.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package v1alpha1
+package v1beta1
 
 import (
 	"context"

apis/backupdr/v1alpha1/backupvault_identity.go renamed to apis/backupdr/v1beta1/backupvault_identity.go

@@ -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 {
+	// +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 {
@@ -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"`

apis/backupdr/v1alpha1/backupvault_reference.go renamed to apis/backupdr/v1beta1/backupvault_reference.go

@@ -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 \

apis/backupdr/v1alpha1/backupvault_types.go renamed to apis/backupdr/v1beta1/backupvault_types.go

@@ -23,7 +23,7 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "backupdr.cnrm.cloud.google.com", Version: "v1beta1"}
+	GroupVersion = schema.GroupVersion{Group: "backupdr.cnrm.cloud.google.com", Version: "v1alpha1"}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
 	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}