Merge pull request #608 from cybozu-go/change_served_mark

api: add unservedversion marker
cybozu-go · Nov 14, 2023 · 76a8e80 · 76a8e80
2 parents 413bf19 + 4585648
commit 76a8e80
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 9 deletions.
diff --git a/api/v1beta1/backuppolicy_types.go b/api/v1beta1/backuppolicy_types.go
@@ -84,6 +84,7 @@ type BackupPolicySpec struct {
 
 //+kubebuilder:object:root=true
 //+kubebuilder:deprecatedversion
+//+kubebuilder:unservedversion
 
 // 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
@@ -346,6 +346,7 @@ type ReconcileInfo struct {
 // +kubebuilder:object:root=true
 // +kubebuilder:subresource:status
 // +kubebuilder:deprecatedversion
+// +kubebuilder:unservedversion
 // +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
@@ -2050,7 +2050,7 @@ spec:
           required:
             - spec
           type: object
-      served: true
+      served: false
       storage: false
     - name: v1beta2
       schema:
@@ -9732,7 +9732,7 @@ spec:
                 - currentPrimaryIndex
               type: object
           type: object
-      served: true
+      served: false
       storage: false
       subresources:
         status: {}

diff --git a/config/crd/bases/moco.cybozu.com_backuppolicies.yaml b/config/crd/bases/moco.cybozu.com_backuppolicies.yaml
@@ -2204,7 +2204,7 @@ spec:
         required:
         - spec
         type: object
-    served: true
+    served: false
     storage: false
   - name: v1beta2
     schema:

diff --git a/config/crd/bases/moco.cybozu.com_mysqlclusters.yaml b/config/crd/bases/moco.cybozu.com_mysqlclusters.yaml
@@ -6160,7 +6160,7 @@ spec:
             - currentPrimaryIndex
             type: object
         type: object
-    served: true
+    served: false
     storage: false
     subresources:
       status: {}

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
@@ -2203,7 +2203,7 @@ spec:
         required:
         - spec
         type: object
-    served: true
+    served: false
     storage: false
   - name: v1beta2
     schema:

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
@@ -6170,7 +6170,7 @@ spec:
             - currentPrimaryIndex
             type: object
         type: object
-    served: true
+    served: false
     storage: false
     subresources:
       status: {}

diff --git a/e2e/testdata/backup.yaml b/e2e/testdata/backup.yaml
@@ -17,7 +17,7 @@ metadata:
   namespace: backup
   name: backup-owner
 ---
-apiVersion: moco.cybozu.com/v1beta1
+apiVersion: moco.cybozu.com/v1beta2
 kind: BackupPolicy
 metadata:
   namespace: backup

diff --git a/e2e/testdata/backup_gcs.yaml b/e2e/testdata/backup_gcs.yaml
@@ -17,7 +17,7 @@ metadata:
   namespace: backup-gcs
   name: backup-owner
 ---
-apiVersion: moco.cybozu.com/v1beta1
+apiVersion: moco.cybozu.com/v1beta2
 kind: BackupPolicy
 metadata:
   namespace: backup-gcs

diff --git a/e2e/testdata/backup_tls.yaml b/e2e/testdata/backup_tls.yaml
@@ -17,7 +17,7 @@ metadata:
   namespace: backup-tls
   name: backup-owner
 ---
-apiVersion: moco.cybozu.com/v1beta1
+apiVersion: moco.cybozu.com/v1beta2
 kind: BackupPolicy
 metadata:
   namespace: backup-tls