Merge pull request #592 from shunki-fujita/add_deprecatedversion_marker

api: add deprecatedversion marker
cybozu-go · Oct 25, 2023 · 54db676 · 54db676
2 parents 50fb210 + c47a8e8
commit 54db676
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 3 deletions.
diff --git a/api/v1beta1/backuppolicy_types.go b/api/v1beta1/backuppolicy_types.go
@@ -83,6 +83,7 @@ type BackupPolicySpec struct {
 }
 
 //+kubebuilder:object:root=true
+//+kubebuilder:deprecatedversion
 
 // BackupPolicy is a namespaced resource that should be referenced from MySQLCluster.
 type BackupPolicy struct {

diff --git a/api/v1beta1/mysqlcluster_types.go b/api/v1beta1/mysqlcluster_types.go
@@ -345,6 +345,7 @@ type ReconcileInfo struct {
 
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
+// +kubebuilder:deprecatedversion
 // +kubebuilder:printcolumn:name="Available",type="string",JSONPath=".status.conditions[?(@.type=='Available')].status"
 // +kubebuilder:printcolumn:name="Healthy",type="string",JSONPath=".status.conditions[?(@.type=='Healthy')].status"
 // +kubebuilder:printcolumn:name="Primary",type="integer",JSONPath=".status.currentPrimaryIndex"

diff --git a/charts/moco/templates/generated/crds/moco_crds.yaml b/charts/moco/templates/generated/crds/moco_crds.yaml
@@ -18,7 +18,8 @@ spec:
     singular: backuppolicy
   scope: Namespaced
   versions:
-    - name: v1beta1
+    - deprecated: true
+      name: v1beta1
       schema:
         openAPIV3Schema:
           description: 'BackupPolicy is a namespaced resource that should '
@@ -4129,6 +4130,7 @@ spec:
         - jsonPath: .status.backup.time
           name: Last backup
           type: string
+      deprecated: true
       name: v1beta1
       schema:
         openAPIV3Schema:

diff --git a/config/crd/bases/moco.cybozu.com_backuppolicies.yaml b/config/crd/bases/moco.cybozu.com_backuppolicies.yaml
@@ -14,7 +14,8 @@ spec:
     singular: backuppolicy
   scope: Namespaced
   versions:
-  - name: v1beta1
+  - deprecated: true
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: 'BackupPolicy is a namespaced resource that should '

diff --git a/config/crd/bases/moco.cybozu.com_mysqlclusters.yaml b/config/crd/bases/moco.cybozu.com_mysqlclusters.yaml
@@ -33,6 +33,7 @@ spec:
     - jsonPath: .status.backup.time
       name: Last backup
       type: string
+    deprecated: true
     name: v1beta1
     schema:
       openAPIV3Schema:

diff --git a/...ests/apiextensions.k8s.io_v1_customresourcedefinition_backuppolicies.moco.cybozu.com.yaml b/...ests/apiextensions.k8s.io_v1_customresourcedefinition_backuppolicies.moco.cybozu.com.yaml
@@ -13,7 +13,8 @@ spec:
     singular: backuppolicy
   scope: Namespaced
   versions:
-  - name: v1beta1
+  - deprecated: true
+    name: v1beta1
     schema:
       openAPIV3Schema:
         description: 'BackupPolicy is a namespaced resource that should '

diff --git a/...tests/apiextensions.k8s.io_v1_customresourcedefinition_mysqlclusters.moco.cybozu.com.yaml b/...tests/apiextensions.k8s.io_v1_customresourcedefinition_mysqlclusters.moco.cybozu.com.yaml
@@ -43,6 +43,7 @@ spec:
     - jsonPath: .status.backup.time
       name: Last backup
       type: string
+    deprecated: true
     name: v1beta1
     schema:
       openAPIV3Schema: