Use DeletionPolicy in etcd

Signed-off-by: Arnob kumar saha <[email protected]>
kubedb · Jul 15, 2024 · 11a0ae7 · 11a0ae7
1 parent c028472
commit 11a0ae7
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 21 deletions.
diff --git a/apis/kubedb/v1alpha1/conversion.go b/apis/kubedb/v1alpha1/conversion.go
@@ -280,7 +280,7 @@ func Convert_v1alpha1_EtcdSpec_To_v1alpha2_EtcdSpec(in *EtcdSpec, out *v1alpha2.
 		})
 	}
 	// WARNING: in.UpdateStrategy requires manual conversion: does not exist in peer-type
-	out.TerminationPolicy = v1alpha2.TerminationPolicy(in.TerminationPolicy)
+	out.DeletionPolicy = v1alpha2.TerminationPolicy(in.TerminationPolicy)
 	return nil
 }
 
@@ -304,7 +304,7 @@ func Convert_v1alpha2_EtcdSpec_To_v1alpha1_EtcdSpec(in *v1alpha2.EtcdSpec, out *
 	out.PodTemplate = in.PodTemplate
 	// WARNING: in.ServiceTemplates requires manual conversion: does not exist in peer-type
 	// WARNING: in.Halted requires manual conversion: does not exist in peer-type
-	out.TerminationPolicy = TerminationPolicy(in.TerminationPolicy)
+	out.TerminationPolicy = TerminationPolicy(in.DeletionPolicy)
 	return nil
 }
 

diff --git a/apis/kubedb/v1alpha1/zz_generated.conversion.go b/apis/kubedb/v1alpha1/zz_generated.conversion.go
diff --git a/apis/kubedb/v1alpha2/etcd_helpers.go b/apis/kubedb/v1alpha2/etcd_helpers.go
@@ -181,8 +181,8 @@ func (e *Etcd) SetDefaults() {
 	if e.Spec.StorageType == "" {
 		e.Spec.StorageType = StorageTypeDurable
 	}
-	if e.Spec.TerminationPolicy == "" {
-		e.Spec.TerminationPolicy = TerminationPolicyDelete
+	if e.Spec.DeletionPolicy == "" {
+		e.Spec.DeletionPolicy = TerminationPolicyDelete
 	}
 
 	e.Spec.Monitor.SetDefaults()

diff --git a/apis/kubedb/v1alpha2/etcd_types.go b/apis/kubedb/v1alpha2/etcd_types.go
@@ -90,9 +90,9 @@ type EtcdSpec struct {
 	// +optional
 	Halted bool `json:"halted,omitempty"`
 
-	// TerminationPolicy controls the delete operation for database
+	// DeletionPolicy controls the delete operation for database
 	// +optional
-	TerminationPolicy TerminationPolicy `json:"terminationPolicy,omitempty"`
+	DeletionPolicy TerminationPolicy `json:"deletionPolicy,omitempty"`
 }
 
 type TLSPolicy struct {

diff --git a/apis/kubedb/v1alpha2/openapi_generated.go b/apis/kubedb/v1alpha2/openapi_generated.go
diff --git a/crds/kubedb.com_etcds.yaml b/crds/kubedb.com_etcds.yaml
@@ -57,6 +57,13 @@ spec:
                     type: string
                 type: object
                 x-kubernetes-map-type: atomic
+              deletionPolicy:
+                enum:
+                - Halt
+                - Delete
+                - WipeOut
+                - DoNotTerminate
+                type: string
               halted:
                 type: boolean
               init:
@@ -4064,13 +4071,6 @@ spec:
                 - Durable
                 - Ephemeral
                 type: string
-              terminationPolicy:
-                enum:
-                - Halt
-                - Delete
-                - WipeOut
-                - DoNotTerminate
-                type: string
               tls:
                 properties:
                   member:

diff --git a/openapi/swagger.json b/openapi/swagger.json
@@ -23640,6 +23640,10 @@
           "description": "Database authentication secret",
           "$ref": "#/definitions/dev.kubedb.apimachinery.apis.kubedb.v1alpha2.SecretReference"
         },
+        "deletionPolicy": {
+          "description": "DeletionPolicy controls the delete operation for database",
+          "type": "string"
+        },
         "halted": {
           "description": "Indicates that the database is halted and all offshoot Kubernetes resources except PVCs are deleted.",
           "type": "boolean"
@@ -23678,10 +23682,6 @@
           "description": "StorageType can be durable (default) or ephemeral",
           "type": "string"
         },
-        "terminationPolicy": {
-          "description": "TerminationPolicy controls the delete operation for database",
-          "type": "string"
-        },
         "tls": {
           "description": "etcd cluster TLS configuration",
           "$ref": "#/definitions/dev.kubedb.apimachinery.apis.kubedb.v1alpha2.TLSPolicy"