From 469497ed49f8d0632cfadf39eedfd9d9719550d0 Mon Sep 17 00:00:00 2001 From: Neaj Morshad Date: Mon, 11 Nov 2024 15:48:10 +0600 Subject: [PATCH] Update dbapi type TerminationPolicy -> DeletionPolicy Signed-off-by: Neaj Morshad --- apis/kubedb/v1alpha1/conversion.go | 18 +++++++-------- apis/kubedb/v1alpha2/cassandra_helpers.go | 2 +- apis/kubedb/v1alpha2/cassandra_types.go | 2 +- apis/kubedb/v1alpha2/cassandra_webhook.go | 2 +- apis/kubedb/v1alpha2/clickhouse_helpers.go | 2 +- apis/kubedb/v1alpha2/clickhouse_types.go | 2 +- apis/kubedb/v1alpha2/clickhouse_webhook.go | 2 +- apis/kubedb/v1alpha2/conversion.go | 22 +++++++++---------- apis/kubedb/v1alpha2/druid_helpers.go | 2 +- apis/kubedb/v1alpha2/druid_types.go | 2 +- apis/kubedb/v1alpha2/elasticsearch_helpers.go | 2 +- apis/kubedb/v1alpha2/elasticsearch_types.go | 2 +- apis/kubedb/v1alpha2/etcd_helpers.go | 2 +- apis/kubedb/v1alpha2/etcd_types.go | 2 +- apis/kubedb/v1alpha2/ferretdb_helpers.go | 2 +- apis/kubedb/v1alpha2/ferretdb_types.go | 2 +- apis/kubedb/v1alpha2/ferretdb_webhook.go | 4 ++-- apis/kubedb/v1alpha2/kafka_helpers.go | 6 ++--- apis/kubedb/v1alpha2/kafka_types.go | 2 +- apis/kubedb/v1alpha2/kafka_webhook.go | 6 ++--- apis/kubedb/v1alpha2/mariadb_helpers.go | 2 +- apis/kubedb/v1alpha2/mariadb_types.go | 2 +- apis/kubedb/v1alpha2/memcached_helpers.go | 2 +- apis/kubedb/v1alpha2/memcached_types.go | 2 +- apis/kubedb/v1alpha2/mongodb_helpers.go | 2 +- apis/kubedb/v1alpha2/mongodb_types.go | 2 +- apis/kubedb/v1alpha2/mssqlserver_helpers.go | 2 +- apis/kubedb/v1alpha2/mssqlserver_types.go | 2 +- apis/kubedb/v1alpha2/mssqlserver_webhook.go | 2 +- apis/kubedb/v1alpha2/mysql_helpers.go | 2 +- apis/kubedb/v1alpha2/mysql_types.go | 2 +- apis/kubedb/v1alpha2/perconaxtradb_helpers.go | 2 +- apis/kubedb/v1alpha2/perconaxtradb_types.go | 2 +- apis/kubedb/v1alpha2/pgbouncer_helpers.go | 2 +- apis/kubedb/v1alpha2/pgbouncer_types.go | 16 +------------- apis/kubedb/v1alpha2/pgpool_helpers.go | 2 +- apis/kubedb/v1alpha2/pgpool_types.go | 2 +- apis/kubedb/v1alpha2/pgpool_webhook.go | 2 +- apis/kubedb/v1alpha2/postgres_helpers.go | 2 +- apis/kubedb/v1alpha2/postgres_types.go | 2 +- apis/kubedb/v1alpha2/proxysql_types.go | 2 +- apis/kubedb/v1alpha2/rabbitmq_helpers.go | 2 +- apis/kubedb/v1alpha2/rabbitmq_types.go | 2 +- apis/kubedb/v1alpha2/rabbitmq_webhook.go | 4 ++-- apis/kubedb/v1alpha2/redis_helpers.go | 2 +- .../kubedb/v1alpha2/redis_sentinel_helpers.go | 2 +- apis/kubedb/v1alpha2/redis_sentinel_types.go | 2 +- apis/kubedb/v1alpha2/redis_types.go | 2 +- apis/kubedb/v1alpha2/singlestore_helpers.go | 2 +- apis/kubedb/v1alpha2/singlestore_types.go | 2 +- apis/kubedb/v1alpha2/singlestore_webhook.go | 2 +- apis/kubedb/v1alpha2/solr_helpers.go | 2 +- apis/kubedb/v1alpha2/solr_types.go | 2 +- apis/kubedb/v1alpha2/solr_webhook.go | 2 +- apis/kubedb/v1alpha2/types.go | 10 ++++----- apis/kubedb/v1alpha2/zookeeper_helpers.go | 6 ++--- apis/kubedb/v1alpha2/zookeeper_types.go | 2 +- apis/kubedb/v1alpha2/zookeeper_webhook.go | 2 +- .../v1alpha2/zz_generated.conversion.go | 2 +- pkg/admission/namespace/admission.go | 4 ++-- 60 files changed, 91 insertions(+), 105 deletions(-) diff --git a/apis/kubedb/v1alpha1/conversion.go b/apis/kubedb/v1alpha1/conversion.go index b5a0a2b13f..f08f5ed43f 100644 --- a/apis/kubedb/v1alpha1/conversion.go +++ b/apis/kubedb/v1alpha1/conversion.go @@ -134,7 +134,7 @@ func Convert_v1alpha1_ElasticsearchSpec_To_v1alpha2_ElasticsearchSpec(in *Elasti } out.MaxUnavailable = (*intstr.IntOrString)(unsafe.Pointer(in.MaxUnavailable)) // WARNING: in.UpdateStrategy requires manual conversion: does not exist in peer-type - out.TerminationPolicy = v1alpha2.TerminationPolicy(in.TerminationPolicy) + out.TerminationPolicy = v1alpha2.DeletionPolicy(in.TerminationPolicy) return nil } @@ -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.DeletionPolicy = v1alpha2.TerminationPolicy(in.TerminationPolicy) + out.DeletionPolicy = v1alpha2.DeletionPolicy(in.TerminationPolicy) return nil } @@ -365,7 +365,7 @@ func Convert_v1alpha1_MariaDBSpec_To_v1alpha2_MariaDBSpec(in *MariaDBSpec, out * }) } // WARNING: in.UpdateStrategy requires manual conversion: does not exist in peer-type - out.TerminationPolicy = v1alpha2.TerminationPolicy(in.TerminationPolicy) + out.TerminationPolicy = v1alpha2.DeletionPolicy(in.TerminationPolicy) return nil } @@ -434,7 +434,7 @@ func Convert_v1alpha1_MemcachedSpec_To_v1alpha2_MemcachedSpec(in *MemcachedSpec, }) } // WARNING: in.UpdateStrategy requires manual conversion: does not exist in peer-type - out.TerminationPolicy = v1alpha2.TerminationPolicy(in.TerminationPolicy) + out.TerminationPolicy = v1alpha2.DeletionPolicy(in.TerminationPolicy) return nil } @@ -537,7 +537,7 @@ func Convert_v1alpha1_MongoDBSpec_To_v1alpha2_MongoDBSpec(in *MongoDBSpec, out * }) } // WARNING: in.UpdateStrategy requires manual conversion: does not exist in peer-type - out.TerminationPolicy = v1alpha2.TerminationPolicy(in.TerminationPolicy) + out.TerminationPolicy = v1alpha2.DeletionPolicy(in.TerminationPolicy) return nil } @@ -722,7 +722,7 @@ func Convert_v1alpha1_MySQLSpec_To_v1alpha2_MySQLSpec(in *MySQLSpec, out *v1alph }) } // WARNING: in.UpdateStrategy requires manual conversion: does not exist in peer-type - out.TerminationPolicy = v1alpha2.TerminationPolicy(in.TerminationPolicy) + out.TerminationPolicy = v1alpha2.DeletionPolicy(in.TerminationPolicy) return nil } @@ -834,7 +834,7 @@ func Convert_v1alpha1_PerconaXtraDBSpec_To_v1alpha2_PerconaXtraDBSpec(in *Percon }) } // WARNING: in.UpdateStrategy requires manual conversion: does not exist in peer-type - out.TerminationPolicy = v1alpha2.TerminationPolicy(in.TerminationPolicy) + out.TerminationPolicy = v1alpha2.DeletionPolicy(in.TerminationPolicy) return nil } @@ -932,7 +932,7 @@ func Convert_v1alpha1_PostgresSpec_To_v1alpha2_PostgresSpec(in *PostgresSpec, ou }) } // WARNING: in.UpdateStrategy requires manual conversion: does not exist in peer-type - out.TerminationPolicy = v1alpha2.TerminationPolicy(in.TerminationPolicy) + out.TerminationPolicy = v1alpha2.DeletionPolicy(in.TerminationPolicy) return nil } @@ -1005,7 +1005,7 @@ func Convert_v1alpha1_RedisSpec_To_v1alpha2_RedisSpec(in *RedisSpec, out *v1alph }) } // WARNING: in.UpdateStrategy requires manual conversion: does not exist in peer-type - out.TerminationPolicy = v1alpha2.TerminationPolicy(in.TerminationPolicy) + out.TerminationPolicy = v1alpha2.DeletionPolicy(in.TerminationPolicy) return nil } diff --git a/apis/kubedb/v1alpha2/cassandra_helpers.go b/apis/kubedb/v1alpha2/cassandra_helpers.go index c9774862ae..95e1e2418c 100644 --- a/apis/kubedb/v1alpha2/cassandra_helpers.go +++ b/apis/kubedb/v1alpha2/cassandra_helpers.go @@ -269,7 +269,7 @@ func (r *Cassandra) ResourceSingular() string { func (r *Cassandra) SetDefaults() { if r.Spec.DeletionPolicy == "" { - r.Spec.DeletionPolicy = TerminationPolicyDelete + r.Spec.DeletionPolicy = DeletionPolicyDelete } var casVersion catalog.CassandraVersion diff --git a/apis/kubedb/v1alpha2/cassandra_types.go b/apis/kubedb/v1alpha2/cassandra_types.go index 0ff02c71cd..8a4d06c5a8 100644 --- a/apis/kubedb/v1alpha2/cassandra_types.go +++ b/apis/kubedb/v1alpha2/cassandra_types.go @@ -97,7 +97,7 @@ type CassandraSpec struct { // DeletionPolicy controls the delete operation for database // +optional - DeletionPolicy TerminationPolicy `json:"deletionPolicy,omitempty"` + DeletionPolicy DeletionPolicy `json:"deletionPolicy,omitempty"` // HealthChecker defines attributes of the health checker // +optional diff --git a/apis/kubedb/v1alpha2/cassandra_webhook.go b/apis/kubedb/v1alpha2/cassandra_webhook.go index a948bfa7d1..8488cefec4 100644 --- a/apis/kubedb/v1alpha2/cassandra_webhook.go +++ b/apis/kubedb/v1alpha2/cassandra_webhook.go @@ -69,7 +69,7 @@ func (r *Cassandra) ValidateDelete() (admission.Warnings, error) { cassandralog.Info("validate delete", "name", r.Name) var allErr field.ErrorList - if r.Spec.DeletionPolicy == TerminationPolicyDoNotTerminate { + if r.Spec.DeletionPolicy == DeletionPolicyDoNotTerminate { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("deletionPolicy"), r.Name, "Can not delete as terminationPolicy is set to \"DoNotTerminate\"")) diff --git a/apis/kubedb/v1alpha2/clickhouse_helpers.go b/apis/kubedb/v1alpha2/clickhouse_helpers.go index 2715e6d165..6dfabdd6ff 100644 --- a/apis/kubedb/v1alpha2/clickhouse_helpers.go +++ b/apis/kubedb/v1alpha2/clickhouse_helpers.go @@ -370,7 +370,7 @@ func (c *ClickHouse) SetDefaults() { c.Spec.Replicas = pointer.Int32P(1) } if c.Spec.DeletionPolicy == "" { - c.Spec.DeletionPolicy = TerminationPolicyDelete + c.Spec.DeletionPolicy = DeletionPolicyDelete } if c.Spec.StorageType == "" { c.Spec.StorageType = StorageTypeDurable diff --git a/apis/kubedb/v1alpha2/clickhouse_types.go b/apis/kubedb/v1alpha2/clickhouse_types.go index cd91574bf6..1dfa0f93cd 100644 --- a/apis/kubedb/v1alpha2/clickhouse_types.go +++ b/apis/kubedb/v1alpha2/clickhouse_types.go @@ -101,7 +101,7 @@ type ClickHouseSpec struct { // DeletionPolicy controls the delete operation for database // +optional - DeletionPolicy TerminationPolicy `json:"deletionPolicy,omitempty"` + DeletionPolicy DeletionPolicy `json:"deletionPolicy,omitempty"` // HealthChecker defines attributes of the health checker // +optional diff --git a/apis/kubedb/v1alpha2/clickhouse_webhook.go b/apis/kubedb/v1alpha2/clickhouse_webhook.go index 7dece77de7..a839f7750c 100644 --- a/apis/kubedb/v1alpha2/clickhouse_webhook.go +++ b/apis/kubedb/v1alpha2/clickhouse_webhook.go @@ -69,7 +69,7 @@ func (c *ClickHouse) ValidateDelete() (admission.Warnings, error) { clickhouselog.Info("validate delete", "name", c.Name) var allErr field.ErrorList - if c.Spec.DeletionPolicy == TerminationPolicyDoNotTerminate { + if c.Spec.DeletionPolicy == DeletionPolicyDoNotTerminate { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("teminationPolicy"), c.Name, "Can not delete as terminationPolicy is set to \"DoNotTerminate\"")) diff --git a/apis/kubedb/v1alpha2/conversion.go b/apis/kubedb/v1alpha2/conversion.go index 983900d418..ee2e4ae2d1 100644 --- a/apis/kubedb/v1alpha2/conversion.go +++ b/apis/kubedb/v1alpha2/conversion.go @@ -183,7 +183,7 @@ func Convert_v1_MariaDBSpec_To_v1alpha2_MariaDBSpec(in *v1.MariaDBSpec, out *Mar out.RequireSSL = in.RequireSSL out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) out.Halted = in.Halted - out.TerminationPolicy = TerminationPolicy(in.DeletionPolicy) + out.TerminationPolicy = DeletionPolicy(in.DeletionPolicy) out.AllowedSchemas = (*AllowedConsumers)(unsafe.Pointer(in.AllowedSchemas)) out.HealthChecker = in.HealthChecker out.Archiver = (*Archiver)(unsafe.Pointer(in.Archiver)) @@ -264,7 +264,7 @@ func Convert_v1_PostgresSpec_To_v1alpha2_PostgresSpec(in *v1.PostgresSpec, out * out.ServiceTemplates = *(*[]NamedServiceTemplateSpec)(unsafe.Pointer(&in.ServiceTemplates)) out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) out.Halted = in.Halted - out.TerminationPolicy = TerminationPolicy(in.DeletionPolicy) + out.TerminationPolicy = DeletionPolicy(in.DeletionPolicy) out.EnforceFsGroup = in.EnforceFsGroup out.AllowedSchemas = (*AllowedConsumers)(unsafe.Pointer(in.AllowedSchemas)) out.HealthChecker = in.HealthChecker @@ -369,7 +369,7 @@ func Convert_v1_MySQLSpec_To_v1alpha2_MySQLSpec(in *v1.MySQLSpec, out *MySQLSpec out.RequireSSL = in.RequireSSL out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) out.Halted = in.Halted - out.TerminationPolicy = TerminationPolicy(in.DeletionPolicy) + out.TerminationPolicy = DeletionPolicy(in.DeletionPolicy) out.UseAddressType = AddressType(in.UseAddressType) out.AllowedSchemas = (*AllowedConsumers)(unsafe.Pointer(in.AllowedSchemas)) out.AllowedReadReplicas = (*AllowedConsumers)(unsafe.Pointer(in.AllowedReadReplicas)) @@ -611,7 +611,7 @@ func Convert_v1_MongoDBSpec_To_v1alpha2_MongoDBSpec(in *v1.MongoDBSpec, out *Mon out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) out.KeyFileSecret = (*corev1.LocalObjectReference)(unsafe.Pointer(in.KeyFileSecret)) out.Halted = in.Halted - out.TerminationPolicy = TerminationPolicy(in.DeletionPolicy) + out.TerminationPolicy = DeletionPolicy(in.DeletionPolicy) out.StorageEngine = StorageEngine(in.StorageEngine) out.AllowedSchemas = (*AllowedConsumers)(unsafe.Pointer(in.AllowedSchemas)) if in.Arbiter != nil { @@ -761,7 +761,7 @@ func Convert_v1_RedisSpec_To_v1alpha2_RedisSpec(in *v1.RedisSpec, out *RedisSpec out.ServiceTemplates = *(*[]NamedServiceTemplateSpec)(unsafe.Pointer(&in.ServiceTemplates)) out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) out.Halted = in.Halted - out.TerminationPolicy = TerminationPolicy(in.DeletionPolicy) + out.TerminationPolicy = DeletionPolicy(in.DeletionPolicy) out.AllowedSchemas = (*AllowedConsumers)(unsafe.Pointer(in.AllowedSchemas)) out.HealthChecker = in.HealthChecker return nil @@ -829,7 +829,7 @@ func Convert_v1_PerconaXtraDBSpec_To_v1alpha2_PerconaXtraDBSpec(in *v1.PerconaXt out.RequireSSL = in.RequireSSL out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) out.Halted = in.Halted - out.TerminationPolicy = TerminationPolicy(in.DeletionPolicy) + out.TerminationPolicy = DeletionPolicy(in.DeletionPolicy) out.AllowedSchemas = (*AllowedConsumers)(unsafe.Pointer(in.AllowedSchemas)) out.HealthChecker = in.HealthChecker out.SystemUserSecrets = (*SystemUserSecretsSpec)(unsafe.Pointer(in.SystemUserSecrets)) @@ -958,7 +958,7 @@ func Convert_v1_ElasticsearchSpec_To_v1alpha2_ElasticsearchSpec(in *v1.Elasticse out.InternalUsers = *(*map[string]ElasticsearchUserSpec)(unsafe.Pointer(&in.InternalUsers)) out.RolesMapping = *(*map[string]ElasticsearchRoleMapSpec)(unsafe.Pointer(&in.RolesMapping)) out.Halted = in.Halted - out.TerminationPolicy = TerminationPolicy(in.DeletionPolicy) + out.TerminationPolicy = DeletionPolicy(in.DeletionPolicy) out.KernelSettings = (*KernelSettings)(unsafe.Pointer(in.KernelSettings)) out.HeapSizePercentage = (*int32)(unsafe.Pointer(in.HeapSizePercentage)) out.HealthChecker = in.HealthChecker @@ -977,7 +977,7 @@ func Convert_v1_MemcachedSpec_To_v1alpha2_MemcachedSpec(in *v1.MemcachedSpec, ou out.ServiceTemplates = *(*[]NamedServiceTemplateSpec)(unsafe.Pointer(&in.ServiceTemplates)) out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) out.Halted = in.Halted - out.TerminationPolicy = TerminationPolicy(in.DeletionPolicy) + out.TerminationPolicy = DeletionPolicy(in.DeletionPolicy) out.HealthChecker = in.HealthChecker return nil } @@ -1025,7 +1025,7 @@ func Convert_v1_PgBouncerSpec_To_v1alpha2_PgBouncerSpec(in *v1.PgBouncerSpec, ou out.Monitor = (*monitoringagentapiapiv1.AgentSpec)(unsafe.Pointer(in.Monitor)) out.SSLMode = PgBouncerSSLMode(in.SSLMode) out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) - out.TerminationPolicy = PgBouncerTerminationPolicy(in.DeletionPolicy) + out.TerminationPolicy = DeletionPolicy(in.DeletionPolicy) out.HealthChecker = in.HealthChecker return nil } @@ -1069,7 +1069,7 @@ func Convert_v1_ProxySQLSpec_To_v1alpha2_ProxySQLSpec(in *v1.ProxySQLSpec, out * } out.ServiceTemplates = *(*[]NamedServiceTemplateSpec)(unsafe.Pointer(&in.ServiceTemplates)) out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) - out.TerminationPolicy = TerminationPolicy(in.DeletionPolicy) + out.TerminationPolicy = DeletionPolicy(in.DeletionPolicy) out.HealthChecker = in.HealthChecker return nil } @@ -1113,7 +1113,7 @@ func Convert_v1_RedisSentinelSpec_To_v1alpha2_RedisSentinelSpec(in *v1.RedisSent out.DisableAuth = in.DisableAuth out.Halted = in.Halted out.Monitor = (*monitoringagentapiapiv1.AgentSpec)(unsafe.Pointer(in.Monitor)) - out.TerminationPolicy = TerminationPolicy(in.DeletionPolicy) + out.TerminationPolicy = DeletionPolicy(in.DeletionPolicy) out.HealthChecker = in.HealthChecker return nil } diff --git a/apis/kubedb/v1alpha2/druid_helpers.go b/apis/kubedb/v1alpha2/druid_helpers.go index f8c2d4f4e5..db03e2582c 100644 --- a/apis/kubedb/v1alpha2/druid_helpers.go +++ b/apis/kubedb/v1alpha2/druid_helpers.go @@ -431,7 +431,7 @@ func (d *Druid) GetCertSecretName(alias DruidCertificateAlias) string { func (d *Druid) SetDefaults() { if d.Spec.DeletionPolicy == "" { - d.Spec.DeletionPolicy = TerminationPolicyDelete + d.Spec.DeletionPolicy = DeletionPolicyDelete } if d.Spec.EnableSSL { diff --git a/apis/kubedb/v1alpha2/druid_types.go b/apis/kubedb/v1alpha2/druid_types.go index d572d1155b..3ffd2dedee 100644 --- a/apis/kubedb/v1alpha2/druid_types.go +++ b/apis/kubedb/v1alpha2/druid_types.go @@ -115,7 +115,7 @@ type DruidSpec struct { // DeletionPolicy controls the delete operation for database // +optional - DeletionPolicy TerminationPolicy `json:"deletionPolicy,omitempty"` + DeletionPolicy DeletionPolicy `json:"deletionPolicy,omitempty"` // HealthChecker defines attributes of the health checker // +optional diff --git a/apis/kubedb/v1alpha2/elasticsearch_helpers.go b/apis/kubedb/v1alpha2/elasticsearch_helpers.go index 9cf6ac4460..bc22cd8103 100644 --- a/apis/kubedb/v1alpha2/elasticsearch_helpers.go +++ b/apis/kubedb/v1alpha2/elasticsearch_helpers.go @@ -436,7 +436,7 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion, top } if e.Spec.TerminationPolicy == "" { - e.Spec.TerminationPolicy = TerminationPolicyDelete + e.Spec.TerminationPolicy = DeletionPolicyDelete } if e.Spec.PodTemplate.Spec.ServiceAccountName == "" { diff --git a/apis/kubedb/v1alpha2/elasticsearch_types.go b/apis/kubedb/v1alpha2/elasticsearch_types.go index 89c557aade..284112397c 100644 --- a/apis/kubedb/v1alpha2/elasticsearch_types.go +++ b/apis/kubedb/v1alpha2/elasticsearch_types.go @@ -156,7 +156,7 @@ type ElasticsearchSpec struct { // TerminationPolicy controls the delete operation for database // +optional - TerminationPolicy TerminationPolicy `json:"terminationPolicy,omitempty"` + TerminationPolicy DeletionPolicy `json:"terminationPolicy,omitempty"` // KernelSettings contains the additional kernel settings. // +optional diff --git a/apis/kubedb/v1alpha2/etcd_helpers.go b/apis/kubedb/v1alpha2/etcd_helpers.go index d0708704c2..6caa1697f2 100644 --- a/apis/kubedb/v1alpha2/etcd_helpers.go +++ b/apis/kubedb/v1alpha2/etcd_helpers.go @@ -182,7 +182,7 @@ func (e *Etcd) SetDefaults() { e.Spec.StorageType = StorageTypeDurable } if e.Spec.DeletionPolicy == "" { - e.Spec.DeletionPolicy = TerminationPolicyDelete + e.Spec.DeletionPolicy = DeletionPolicyDelete } e.Spec.Monitor.SetDefaults() diff --git a/apis/kubedb/v1alpha2/etcd_types.go b/apis/kubedb/v1alpha2/etcd_types.go index cbf151b155..ecc916ba1b 100644 --- a/apis/kubedb/v1alpha2/etcd_types.go +++ b/apis/kubedb/v1alpha2/etcd_types.go @@ -92,7 +92,7 @@ type EtcdSpec struct { // DeletionPolicy controls the delete operation for database // +optional - DeletionPolicy TerminationPolicy `json:"deletionPolicy,omitempty"` + DeletionPolicy DeletionPolicy `json:"deletionPolicy,omitempty"` } type TLSPolicy struct { diff --git a/apis/kubedb/v1alpha2/ferretdb_helpers.go b/apis/kubedb/v1alpha2/ferretdb_helpers.go index 0e5f17c6c7..b88bb0459b 100644 --- a/apis/kubedb/v1alpha2/ferretdb_helpers.go +++ b/apis/kubedb/v1alpha2/ferretdb_helpers.go @@ -181,7 +181,7 @@ func (f *FerretDB) SetDefaults() { } if f.Spec.DeletionPolicy == "" { - f.Spec.DeletionPolicy = TerminationPolicyWipeOut + f.Spec.DeletionPolicy = DeletionPolicyWipeOut } if f.Spec.SSLMode == "" { diff --git a/apis/kubedb/v1alpha2/ferretdb_types.go b/apis/kubedb/v1alpha2/ferretdb_types.go index cdfd9e2760..c99cf28dc9 100644 --- a/apis/kubedb/v1alpha2/ferretdb_types.go +++ b/apis/kubedb/v1alpha2/ferretdb_types.go @@ -92,7 +92,7 @@ type FerretDBSpec struct { // DeletionPolicy controls the delete operation for database // +optional - DeletionPolicy TerminationPolicy `json:"deletionPolicy,omitempty"` + DeletionPolicy DeletionPolicy `json:"deletionPolicy,omitempty"` // HealthChecker defines attributes of the health checker // +optional diff --git a/apis/kubedb/v1alpha2/ferretdb_webhook.go b/apis/kubedb/v1alpha2/ferretdb_webhook.go index 883f5b3b62..e9f9255315 100644 --- a/apis/kubedb/v1alpha2/ferretdb_webhook.go +++ b/apis/kubedb/v1alpha2/ferretdb_webhook.go @@ -92,7 +92,7 @@ func (f *FerretDB) ValidateDelete() (admission.Warnings, error) { ferretdblog.Info("validate delete", "name", f.Name) var allErr field.ErrorList - if f.Spec.DeletionPolicy == TerminationPolicyDoNotTerminate { + if f.Spec.DeletionPolicy == DeletionPolicyDoNotTerminate { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("terminationPolicy"), f.Name, "Can not delete as terminationPolicy is set to \"DoNotTerminate\"")) @@ -154,7 +154,7 @@ func (f *FerretDB) ValidateCreateOrUpdate() field.ErrorList { } // Termination policy related - if f.Spec.DeletionPolicy == TerminationPolicyHalt { + if f.Spec.DeletionPolicy == DeletionPolicyHalt { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("terminationPolicy"), f.Name, `'spec.terminationPolicy' value 'Halt' is not supported yet for FerretDB`)) diff --git a/apis/kubedb/v1alpha2/kafka_helpers.go b/apis/kubedb/v1alpha2/kafka_helpers.go index 95d5ebf413..094e8cf8fd 100644 --- a/apis/kubedb/v1alpha2/kafka_helpers.go +++ b/apis/kubedb/v1alpha2/kafka_helpers.go @@ -300,15 +300,15 @@ func (k *Kafka) SetHealthCheckerDefaults() { func (k *Kafka) SetDefaults() { if k.Spec.Halted { - if k.Spec.DeletionPolicy == TerminationPolicyDoNotTerminate { + if k.Spec.DeletionPolicy == DeletionPolicyDoNotTerminate { klog.Errorf(`Can't halt, since deletion policy is 'DoNotTerminate'`) return } - k.Spec.DeletionPolicy = TerminationPolicyHalt + k.Spec.DeletionPolicy = DeletionPolicyHalt } if k.Spec.DeletionPolicy == "" { - k.Spec.DeletionPolicy = TerminationPolicyDelete + k.Spec.DeletionPolicy = DeletionPolicyDelete } if k.Spec.StorageType == "" { diff --git a/apis/kubedb/v1alpha2/kafka_types.go b/apis/kubedb/v1alpha2/kafka_types.go index b4770a0bac..1fb23c5998 100644 --- a/apis/kubedb/v1alpha2/kafka_types.go +++ b/apis/kubedb/v1alpha2/kafka_types.go @@ -110,7 +110,7 @@ type KafkaSpec struct { // DeletionPolicy controls the delete operation for database // +optional - DeletionPolicy TerminationPolicy `json:"deletionPolicy,omitempty"` + DeletionPolicy DeletionPolicy `json:"deletionPolicy,omitempty"` // HealthChecker defines attributes of the health checker // +optional diff --git a/apis/kubedb/v1alpha2/kafka_webhook.go b/apis/kubedb/v1alpha2/kafka_webhook.go index b76005bb94..4204234190 100644 --- a/apis/kubedb/v1alpha2/kafka_webhook.go +++ b/apis/kubedb/v1alpha2/kafka_webhook.go @@ -81,7 +81,7 @@ func (k *Kafka) ValidateDelete() (admission.Warnings, error) { // TODO(user): fill in your validation logic upon object deletion. var allErr field.ErrorList - if k.Spec.DeletionPolicy == TerminationPolicyDoNotTerminate { + if k.Spec.DeletionPolicy == DeletionPolicyDoNotTerminate { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("teminationPolicy"), k.Name, "Can not delete as terminationPolicy is set to \"DoNotTerminate\"")) @@ -170,7 +170,7 @@ func (k *Kafka) ValidateCreateOrUpdate() error { } } - if k.Spec.Halted && k.Spec.DeletionPolicy == TerminationPolicyDoNotTerminate { + if k.Spec.Halted && k.Spec.DeletionPolicy == DeletionPolicyDoNotTerminate { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("halted"), k.Name, `can't halt if deletionPolicy is set to "DoNotTerminate"`)) @@ -207,7 +207,7 @@ func (k *Kafka) ValidateCreateOrUpdate() error { k.Name, "StorageType should be either durable or ephemeral")) } - if k.Spec.StorageType == StorageTypeEphemeral && k.Spec.DeletionPolicy == TerminationPolicyHalt { + if k.Spec.StorageType == StorageTypeEphemeral && k.Spec.DeletionPolicy == DeletionPolicyHalt { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("deletionPolicy"), k.Name, `'spec.deletionPolicy: Halt' can not be used for 'Ephemeral' storage`)) diff --git a/apis/kubedb/v1alpha2/mariadb_helpers.go b/apis/kubedb/v1alpha2/mariadb_helpers.go index a717e2ec8d..6943b0dde3 100644 --- a/apis/kubedb/v1alpha2/mariadb_helpers.go +++ b/apis/kubedb/v1alpha2/mariadb_helpers.go @@ -210,7 +210,7 @@ func (m *MariaDB) SetDefaults(mdVersion *v1alpha1.MariaDBVersion, topology *core m.Spec.StorageType = StorageTypeDurable } if m.Spec.TerminationPolicy == "" { - m.Spec.TerminationPolicy = TerminationPolicyDelete + m.Spec.TerminationPolicy = DeletionPolicyDelete } if m.Spec.PodTemplate.Spec.ServiceAccountName == "" { diff --git a/apis/kubedb/v1alpha2/mariadb_types.go b/apis/kubedb/v1alpha2/mariadb_types.go index ca7ecd6550..3ade7e877f 100644 --- a/apis/kubedb/v1alpha2/mariadb_types.go +++ b/apis/kubedb/v1alpha2/mariadb_types.go @@ -111,7 +111,7 @@ type MariaDBSpec struct { // TerminationPolicy controls the delete operation for database // +optional - TerminationPolicy TerminationPolicy `json:"terminationPolicy,omitempty"` + TerminationPolicy DeletionPolicy `json:"terminationPolicy,omitempty"` // Coordinator defines attributes of the coordinator container // +optional diff --git a/apis/kubedb/v1alpha2/memcached_helpers.go b/apis/kubedb/v1alpha2/memcached_helpers.go index f6839cea88..3925e2937a 100644 --- a/apis/kubedb/v1alpha2/memcached_helpers.go +++ b/apis/kubedb/v1alpha2/memcached_helpers.go @@ -187,7 +187,7 @@ func (m *Memcached) SetDefaults(mcVersion *catalog.MemcachedVersion) { m.setDefaultContainerSecurityContext(mcVersion, &m.Spec.PodTemplate) // perform defaulting if m.Spec.TerminationPolicy == "" { - m.Spec.TerminationPolicy = TerminationPolicyDelete + m.Spec.TerminationPolicy = DeletionPolicyDelete } if m.Spec.PodTemplate.Spec.ServiceAccountName == "" { m.Spec.PodTemplate.Spec.ServiceAccountName = m.OffshootName() diff --git a/apis/kubedb/v1alpha2/memcached_types.go b/apis/kubedb/v1alpha2/memcached_types.go index c4321b209d..e3077f1e2c 100644 --- a/apis/kubedb/v1alpha2/memcached_types.go +++ b/apis/kubedb/v1alpha2/memcached_types.go @@ -101,7 +101,7 @@ type MemcachedSpec struct { // TerminationPolicy controls the delete operation for database // +optional - TerminationPolicy TerminationPolicy `json:"terminationPolicy,omitempty"` + TerminationPolicy DeletionPolicy `json:"terminationPolicy,omitempty"` // HealthChecker defines attributes of the health checker // +optional diff --git a/apis/kubedb/v1alpha2/mongodb_helpers.go b/apis/kubedb/v1alpha2/mongodb_helpers.go index 615121324e..7304b41b12 100644 --- a/apis/kubedb/v1alpha2/mongodb_helpers.go +++ b/apis/kubedb/v1alpha2/mongodb_helpers.go @@ -618,7 +618,7 @@ func (m *MongoDB) SetDefaults(mgVersion *v1alpha1.MongoDBVersion, topology *core m.Spec.StorageEngine = StorageEngineWiredTiger } if m.Spec.TerminationPolicy == "" { - m.Spec.TerminationPolicy = TerminationPolicyDelete + m.Spec.TerminationPolicy = DeletionPolicyDelete } if m.Spec.SSLMode == "" { diff --git a/apis/kubedb/v1alpha2/mongodb_types.go b/apis/kubedb/v1alpha2/mongodb_types.go index 3fdabe84ec..4382a4bb21 100644 --- a/apis/kubedb/v1alpha2/mongodb_types.go +++ b/apis/kubedb/v1alpha2/mongodb_types.go @@ -121,7 +121,7 @@ type MongoDBSpec struct { // TerminationPolicy controls the delete operation for database // +optional - TerminationPolicy TerminationPolicy `json:"terminationPolicy,omitempty"` + TerminationPolicy DeletionPolicy `json:"terminationPolicy,omitempty"` // StorageEngine can be wiredTiger (default) or inMemory // See available StorageEngine: https://docs.mongodb.com/manual/core/storage-engines/ diff --git a/apis/kubedb/v1alpha2/mssqlserver_helpers.go b/apis/kubedb/v1alpha2/mssqlserver_helpers.go index 8ebada91ab..08e7ed0575 100644 --- a/apis/kubedb/v1alpha2/mssqlserver_helpers.go +++ b/apis/kubedb/v1alpha2/mssqlserver_helpers.go @@ -326,7 +326,7 @@ func (m *MSSQLServer) SetDefaults() { m.Spec.StorageType = StorageTypeDurable } if m.Spec.DeletionPolicy == "" { - m.Spec.DeletionPolicy = TerminationPolicyDelete + m.Spec.DeletionPolicy = DeletionPolicyDelete } if m.IsStandalone() { diff --git a/apis/kubedb/v1alpha2/mssqlserver_types.go b/apis/kubedb/v1alpha2/mssqlserver_types.go index d5c284f3a8..19138e9bf7 100644 --- a/apis/kubedb/v1alpha2/mssqlserver_types.go +++ b/apis/kubedb/v1alpha2/mssqlserver_types.go @@ -116,7 +116,7 @@ type MSSQLServerSpec struct { // DeletionPolicy controls the delete operation for database // +optional - DeletionPolicy TerminationPolicy `json:"deletionPolicy,omitempty"` + DeletionPolicy DeletionPolicy `json:"deletionPolicy,omitempty"` // HealthChecker defines attributes of the health checker // +optional diff --git a/apis/kubedb/v1alpha2/mssqlserver_webhook.go b/apis/kubedb/v1alpha2/mssqlserver_webhook.go index 8d3bb942eb..cbfb46c78d 100644 --- a/apis/kubedb/v1alpha2/mssqlserver_webhook.go +++ b/apis/kubedb/v1alpha2/mssqlserver_webhook.go @@ -95,7 +95,7 @@ func (m *MSSQLServer) ValidateDelete() (admission.Warnings, error) { mssqllog.Info("validate delete", "name", m.Name) var allErr field.ErrorList - if m.Spec.DeletionPolicy == TerminationPolicyDoNotTerminate { + if m.Spec.DeletionPolicy == DeletionPolicyDoNotTerminate { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("terminationPolicy"), m.Name, "Can not delete as terminationPolicy is set to \"DoNotTerminate\"")) diff --git a/apis/kubedb/v1alpha2/mysql_helpers.go b/apis/kubedb/v1alpha2/mysql_helpers.go index cb749df94f..7ae173071e 100644 --- a/apis/kubedb/v1alpha2/mysql_helpers.go +++ b/apis/kubedb/v1alpha2/mysql_helpers.go @@ -264,7 +264,7 @@ func (m *MySQL) SetDefaults(myVersion *v1alpha1.MySQLVersion, topology *core_uti m.Spec.StorageType = StorageTypeDurable } if m.Spec.TerminationPolicy == "" { - m.Spec.TerminationPolicy = TerminationPolicyDelete + m.Spec.TerminationPolicy = DeletionPolicyDelete } if m.UsesGroupReplication() { diff --git a/apis/kubedb/v1alpha2/mysql_types.go b/apis/kubedb/v1alpha2/mysql_types.go index b023255f83..467bb78bc2 100644 --- a/apis/kubedb/v1alpha2/mysql_types.go +++ b/apis/kubedb/v1alpha2/mysql_types.go @@ -128,7 +128,7 @@ type MySQLSpec struct { // TerminationPolicy controls the delete operation for database // +optional - TerminationPolicy TerminationPolicy `json:"terminationPolicy,omitempty"` + TerminationPolicy DeletionPolicy `json:"terminationPolicy,omitempty"` // Indicated whether to use DNS or IP address to address pods in a db cluster. // If IP address is used, HostNetwork will be used. Defaults to DNS. diff --git a/apis/kubedb/v1alpha2/perconaxtradb_helpers.go b/apis/kubedb/v1alpha2/perconaxtradb_helpers.go index 52a9f67b91..4bbbcc6f00 100644 --- a/apis/kubedb/v1alpha2/perconaxtradb_helpers.go +++ b/apis/kubedb/v1alpha2/perconaxtradb_helpers.go @@ -219,7 +219,7 @@ func (p *PerconaXtraDB) SetDefaults(pVersion *v1alpha1.PerconaXtraDBVersion, top p.Spec.StorageType = StorageTypeDurable } if p.Spec.TerminationPolicy == "" { - p.Spec.TerminationPolicy = TerminationPolicyDelete + p.Spec.TerminationPolicy = DeletionPolicyDelete } if p.Spec.PodTemplate.Spec.ServiceAccountName == "" { diff --git a/apis/kubedb/v1alpha2/perconaxtradb_types.go b/apis/kubedb/v1alpha2/perconaxtradb_types.go index 021fd35d3d..fffafa5a17 100644 --- a/apis/kubedb/v1alpha2/perconaxtradb_types.go +++ b/apis/kubedb/v1alpha2/perconaxtradb_types.go @@ -105,7 +105,7 @@ type PerconaXtraDBSpec struct { // TerminationPolicy controls the delete operation for database // +optional - TerminationPolicy TerminationPolicy `json:"terminationPolicy,omitempty"` + TerminationPolicy DeletionPolicy `json:"terminationPolicy,omitempty"` // Coordinator defines attributes of the coordinator container // +optional diff --git a/apis/kubedb/v1alpha2/pgbouncer_helpers.go b/apis/kubedb/v1alpha2/pgbouncer_helpers.go index f879d65e24..2d247ade98 100644 --- a/apis/kubedb/v1alpha2/pgbouncer_helpers.go +++ b/apis/kubedb/v1alpha2/pgbouncer_helpers.go @@ -192,7 +192,7 @@ func (p *PgBouncer) SetDefaults(pgBouncerVersion *catalog.PgBouncerVersion, uses } if p.Spec.TerminationPolicy == "" { - p.Spec.TerminationPolicy = PgBouncerTerminationPolicyDelete + p.Spec.TerminationPolicy = DeletionPolicyDelete } p.setConnectionPoolConfigDefaults() diff --git a/apis/kubedb/v1alpha2/pgbouncer_types.go b/apis/kubedb/v1alpha2/pgbouncer_types.go index 095e99cff9..3a15897072 100644 --- a/apis/kubedb/v1alpha2/pgbouncer_types.go +++ b/apis/kubedb/v1alpha2/pgbouncer_types.go @@ -99,7 +99,7 @@ type PgBouncerSpec struct { // TerminationPolicy controls the delete operation for database // +optional - TerminationPolicy PgBouncerTerminationPolicy `json:"terminationPolicy,omitempty"` + TerminationPolicy DeletionPolicy `json:"terminationPolicy,omitempty"` // HealthChecker defines attributes of the health checker // +optional @@ -265,17 +265,3 @@ const ( // to Send the client cert and client key certificate for authentication. PgBouncerClientAuthModeCert PgBouncerClientAuthMode = "cert" ) - -// +kubebuilder:validation:Enum=Halt;Delete;WipeOut;DoNotTerminate -type PgBouncerTerminationPolicy string - -const ( - // Deletes database pods, service but leave the PVCs and stash backup data intact. - PgBouncerDeletionPolicyHalt PgBouncerTerminationPolicy = "Halt" - // Deletes database pods, service, pvcs but leave the stash backup data intact. - PgBouncerTerminationPolicyDelete PgBouncerTerminationPolicy = "Delete" - // Deletes database pods, service, pvcs and stash backup data. - PgBouncerTerminationPolicyWipeOut PgBouncerTerminationPolicy = "WipeOut" - // Rejects attempt to delete database using ValidationWebhook. - PgBouncerTerminationPolicyDoNotTerminate PgBouncerTerminationPolicy = "DoNotTerminate" -) diff --git a/apis/kubedb/v1alpha2/pgpool_helpers.go b/apis/kubedb/v1alpha2/pgpool_helpers.go index 7e0167b7af..9fc3e14545 100644 --- a/apis/kubedb/v1alpha2/pgpool_helpers.go +++ b/apis/kubedb/v1alpha2/pgpool_helpers.go @@ -348,7 +348,7 @@ func (p *Pgpool) SetDefaults() { p.Spec.Replicas = pointer.Int32P(1) } if p.Spec.DeletionPolicy == "" { - p.Spec.DeletionPolicy = TerminationPolicyDelete + p.Spec.DeletionPolicy = DeletionPolicyDelete } if p.Spec.PodTemplate == nil { p.Spec.PodTemplate = &ofst.PodTemplateSpec{} diff --git a/apis/kubedb/v1alpha2/pgpool_types.go b/apis/kubedb/v1alpha2/pgpool_types.go index b2795de86f..605b95088d 100644 --- a/apis/kubedb/v1alpha2/pgpool_types.go +++ b/apis/kubedb/v1alpha2/pgpool_types.go @@ -99,7 +99,7 @@ type PgpoolSpec struct { // DeletionPolicy controls the delete operation for database // +optional - DeletionPolicy TerminationPolicy `json:"deletionPolicy,omitempty"` + DeletionPolicy DeletionPolicy `json:"deletionPolicy,omitempty"` // SSLMode for both standalone and clusters. [disable;allow;prefer;require;verify-ca;verify-full] SSLMode PgpoolSSLMode `json:"sslMode,omitempty"` diff --git a/apis/kubedb/v1alpha2/pgpool_webhook.go b/apis/kubedb/v1alpha2/pgpool_webhook.go index 7476ca18af..d870dd754a 100644 --- a/apis/kubedb/v1alpha2/pgpool_webhook.go +++ b/apis/kubedb/v1alpha2/pgpool_webhook.go @@ -90,7 +90,7 @@ func (p *Pgpool) ValidateDelete() (admission.Warnings, error) { pgpoollog.Info("validate delete", "name", p.Name) var errorList field.ErrorList - if p.Spec.DeletionPolicy == TerminationPolicyDoNotTerminate { + if p.Spec.DeletionPolicy == DeletionPolicyDoNotTerminate { errorList = append(errorList, field.Invalid(field.NewPath("spec").Child("terminationPolicy"), p.Name, "Can not delete as terminationPolicy is set to \"DoNotTerminate\"")) diff --git a/apis/kubedb/v1alpha2/postgres_helpers.go b/apis/kubedb/v1alpha2/postgres_helpers.go index ee212cbac1..a31dbb4ce4 100644 --- a/apis/kubedb/v1alpha2/postgres_helpers.go +++ b/apis/kubedb/v1alpha2/postgres_helpers.go @@ -193,7 +193,7 @@ func (p *Postgres) SetDefaults(postgresVersion *catalog.PostgresVersion, topolog p.Spec.StorageType = StorageTypeDurable } if p.Spec.TerminationPolicy == "" { - p.Spec.TerminationPolicy = TerminationPolicyDelete + p.Spec.TerminationPolicy = DeletionPolicyDelete } if p.Spec.LeaderElection == nil { diff --git a/apis/kubedb/v1alpha2/postgres_types.go b/apis/kubedb/v1alpha2/postgres_types.go index ff4b5ea29c..dbbf37dd7f 100644 --- a/apis/kubedb/v1alpha2/postgres_types.go +++ b/apis/kubedb/v1alpha2/postgres_types.go @@ -131,7 +131,7 @@ type PostgresSpec struct { // TerminationPolicy controls the delete operation for database // +optional - TerminationPolicy TerminationPolicy `json:"terminationPolicy,omitempty"` + TerminationPolicy DeletionPolicy `json:"terminationPolicy,omitempty"` // Coordinator defines attributes of the coordinator container // +optional diff --git a/apis/kubedb/v1alpha2/proxysql_types.go b/apis/kubedb/v1alpha2/proxysql_types.go index 9a196ce2a9..630c0a0300 100644 --- a/apis/kubedb/v1alpha2/proxysql_types.go +++ b/apis/kubedb/v1alpha2/proxysql_types.go @@ -166,7 +166,7 @@ type ProxySQLSpec struct { // TerminationPolicy controls the delete operation for database // +optional - TerminationPolicy TerminationPolicy `json:"terminationPolicy,omitempty"` + TerminationPolicy DeletionPolicy `json:"terminationPolicy,omitempty"` // HealthChecker defines attributes of the health checker // +optional diff --git a/apis/kubedb/v1alpha2/rabbitmq_helpers.go b/apis/kubedb/v1alpha2/rabbitmq_helpers.go index f998beb0c9..35384a26fa 100644 --- a/apis/kubedb/v1alpha2/rabbitmq_helpers.go +++ b/apis/kubedb/v1alpha2/rabbitmq_helpers.go @@ -281,7 +281,7 @@ func (r *RabbitMQ) SetDefaults() { } if r.Spec.DeletionPolicy == "" { - r.Spec.DeletionPolicy = TerminationPolicyDelete + r.Spec.DeletionPolicy = DeletionPolicyDelete } if r.Spec.StorageType == "" { diff --git a/apis/kubedb/v1alpha2/rabbitmq_types.go b/apis/kubedb/v1alpha2/rabbitmq_types.go index 050c8a9547..bb42ff5a79 100644 --- a/apis/kubedb/v1alpha2/rabbitmq_types.go +++ b/apis/kubedb/v1alpha2/rabbitmq_types.go @@ -110,7 +110,7 @@ type RabbitMQSpec struct { // DeletionPolicy controls the delete operation for database // +optional - DeletionPolicy TerminationPolicy `json:"deletionPolicy,omitempty"` + DeletionPolicy DeletionPolicy `json:"deletionPolicy,omitempty"` // HealthChecker defines attributes of the health checker // +optional diff --git a/apis/kubedb/v1alpha2/rabbitmq_webhook.go b/apis/kubedb/v1alpha2/rabbitmq_webhook.go index 6a33e59a4e..4ad133a9f3 100644 --- a/apis/kubedb/v1alpha2/rabbitmq_webhook.go +++ b/apis/kubedb/v1alpha2/rabbitmq_webhook.go @@ -71,8 +71,8 @@ func (r *RabbitMQ) ValidateDelete() (admission.Warnings, error) { rabbitmqlog.Info("validate delete", "name", r.Name) var allErr field.ErrorList - if r.Spec.DeletionPolicy == TerminationPolicyDoNotTerminate { - allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("teminationPolicy"), + if r.Spec.DeletionPolicy == DeletionPolicyDoNotTerminate { + allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("deletionPolicy"), r.Name, "Can not delete as terminationPolicy is set to \"DoNotTerminate\"")) return nil, apierrors.NewInvalid(schema.GroupKind{Group: "rabbitmq.kubedb.com", Kind: "RabbitMQ"}, r.Name, allErr) diff --git a/apis/kubedb/v1alpha2/redis_helpers.go b/apis/kubedb/v1alpha2/redis_helpers.go index 163eae20e5..048be592e1 100644 --- a/apis/kubedb/v1alpha2/redis_helpers.go +++ b/apis/kubedb/v1alpha2/redis_helpers.go @@ -227,7 +227,7 @@ func (r *Redis) SetDefaults(rdVersion *catalog.RedisVersion, topology *core_util r.Spec.StorageType = StorageTypeDurable } if r.Spec.TerminationPolicy == "" { - r.Spec.TerminationPolicy = TerminationPolicyDelete + r.Spec.TerminationPolicy = DeletionPolicyDelete } r.setDefaultContainerSecurityContext(rdVersion, &r.Spec.PodTemplate) if r.Spec.PodTemplate.Spec.ServiceAccountName == "" { diff --git a/apis/kubedb/v1alpha2/redis_sentinel_helpers.go b/apis/kubedb/v1alpha2/redis_sentinel_helpers.go index ec023d85ab..73d2fa19bf 100644 --- a/apis/kubedb/v1alpha2/redis_sentinel_helpers.go +++ b/apis/kubedb/v1alpha2/redis_sentinel_helpers.go @@ -188,7 +188,7 @@ func (rs *RedisSentinel) SetDefaults(rdVersion *catalog.RedisVersion, topology * rs.Spec.StorageType = StorageTypeDurable } if rs.Spec.TerminationPolicy == "" { - rs.Spec.TerminationPolicy = TerminationPolicyDelete + rs.Spec.TerminationPolicy = DeletionPolicyDelete } rs.setDefaultContainerSecurityContext(rdVersion, &rs.Spec.PodTemplate) diff --git a/apis/kubedb/v1alpha2/redis_sentinel_types.go b/apis/kubedb/v1alpha2/redis_sentinel_types.go index dbb0608324..a36e180240 100644 --- a/apis/kubedb/v1alpha2/redis_sentinel_types.go +++ b/apis/kubedb/v1alpha2/redis_sentinel_types.go @@ -90,7 +90,7 @@ type RedisSentinelSpec struct { // TerminationPolicy controls the delete operation for database // +optional - TerminationPolicy TerminationPolicy `json:"terminationPolicy,omitempty"` + TerminationPolicy DeletionPolicy `json:"terminationPolicy,omitempty"` // HealthChecker defines attributes of the health checker // +optional diff --git a/apis/kubedb/v1alpha2/redis_types.go b/apis/kubedb/v1alpha2/redis_types.go index 9d2f2615a2..fb40cb8aaa 100644 --- a/apis/kubedb/v1alpha2/redis_types.go +++ b/apis/kubedb/v1alpha2/redis_types.go @@ -123,7 +123,7 @@ type RedisSpec struct { // TerminationPolicy controls the delete operation for database // +optional - TerminationPolicy TerminationPolicy `json:"terminationPolicy,omitempty"` + TerminationPolicy DeletionPolicy `json:"terminationPolicy,omitempty"` // Coordinator defines attributes of the coordinator container // +optional diff --git a/apis/kubedb/v1alpha2/singlestore_helpers.go b/apis/kubedb/v1alpha2/singlestore_helpers.go index a0136f0337..617317a658 100644 --- a/apis/kubedb/v1alpha2/singlestore_helpers.go +++ b/apis/kubedb/v1alpha2/singlestore_helpers.go @@ -327,7 +327,7 @@ func (s *Singlestore) SetDefaults() { s.Spec.StorageType = StorageTypeDurable } if s.Spec.DeletionPolicy == "" { - s.Spec.DeletionPolicy = TerminationPolicyDelete + s.Spec.DeletionPolicy = DeletionPolicyDelete } if s.Spec.Topology == nil { diff --git a/apis/kubedb/v1alpha2/singlestore_types.go b/apis/kubedb/v1alpha2/singlestore_types.go index da7375461d..48b3b00411 100644 --- a/apis/kubedb/v1alpha2/singlestore_types.go +++ b/apis/kubedb/v1alpha2/singlestore_types.go @@ -102,7 +102,7 @@ type SinglestoreSpec struct { // DeletionPolicy controls the delete operation for database // +optional - DeletionPolicy TerminationPolicy `json:"deletionPolicy,omitempty"` + DeletionPolicy DeletionPolicy `json:"deletionPolicy,omitempty"` // HealthChecker defines attributes of the health checker // +optional diff --git a/apis/kubedb/v1alpha2/singlestore_webhook.go b/apis/kubedb/v1alpha2/singlestore_webhook.go index 7547abb319..5078f78148 100644 --- a/apis/kubedb/v1alpha2/singlestore_webhook.go +++ b/apis/kubedb/v1alpha2/singlestore_webhook.go @@ -78,7 +78,7 @@ func (s *Singlestore) ValidateDelete() (admission.Warnings, error) { singlestorelog.Info("validate delete", "name", s.Name) var allErr field.ErrorList - if s.Spec.DeletionPolicy == TerminationPolicyDoNotTerminate { + if s.Spec.DeletionPolicy == DeletionPolicyDoNotTerminate { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("terminationPolicy"), s.Name, "Can not delete as terminationPolicy is set to \"DoNotTerminate\"")) diff --git a/apis/kubedb/v1alpha2/solr_helpers.go b/apis/kubedb/v1alpha2/solr_helpers.go index ca0b3b26ca..265e7fb481 100644 --- a/apis/kubedb/v1alpha2/solr_helpers.go +++ b/apis/kubedb/v1alpha2/solr_helpers.go @@ -274,7 +274,7 @@ func (s Solr) CoordinatorSelectors() map[string]string { func (s *Solr) SetDefaults() { if s.Spec.DeletionPolicy == "" { - s.Spec.DeletionPolicy = TerminationPolicyDelete + s.Spec.DeletionPolicy = DeletionPolicyDelete } if s.Spec.ClientAuthSSL != "need" && s.Spec.ClientAuthSSL != "want" { diff --git a/apis/kubedb/v1alpha2/solr_types.go b/apis/kubedb/v1alpha2/solr_types.go index b56760945c..25abe9352d 100644 --- a/apis/kubedb/v1alpha2/solr_types.go +++ b/apis/kubedb/v1alpha2/solr_types.go @@ -123,7 +123,7 @@ type SolrSpec struct { // DeletionPolicy controls the delete operation for database // +optional - DeletionPolicy TerminationPolicy `json:"deletionPolicy,omitempty"` + DeletionPolicy DeletionPolicy `json:"deletionPolicy,omitempty"` // HealthChecker defines attributes of the health checker // +optional diff --git a/apis/kubedb/v1alpha2/solr_webhook.go b/apis/kubedb/v1alpha2/solr_webhook.go index 4a64c8e857..1ea9feecb8 100644 --- a/apis/kubedb/v1alpha2/solr_webhook.go +++ b/apis/kubedb/v1alpha2/solr_webhook.go @@ -84,7 +84,7 @@ func (s *Solr) ValidateDelete() (admission.Warnings, error) { solrlog.Info("validate delete", "name", s.Name) var allErr field.ErrorList - if s.Spec.DeletionPolicy == TerminationPolicyDoNotTerminate { + if s.Spec.DeletionPolicy == DeletionPolicyDoNotTerminate { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("terminationPolicy"), s.Name, "Can not delete as terminationPolicy is set to \"DoNotTerminate\"")) diff --git a/apis/kubedb/v1alpha2/types.go b/apis/kubedb/v1alpha2/types.go index bb818a9604..3a8aab79e1 100644 --- a/apis/kubedb/v1alpha2/types.go +++ b/apis/kubedb/v1alpha2/types.go @@ -111,17 +111,17 @@ const ( ) // +kubebuilder:validation:Enum=Halt;Delete;WipeOut;DoNotTerminate -type TerminationPolicy string +type DeletionPolicy string const ( // Deletes database pods, service but leave the PVCs and stash backup data intact. - TerminationPolicyHalt TerminationPolicy = "Halt" + DeletionPolicyHalt DeletionPolicy = "Halt" // Deletes database pods, service, pvcs but leave the stash backup data intact. - TerminationPolicyDelete TerminationPolicy = "Delete" + DeletionPolicyDelete DeletionPolicy = "Delete" // Deletes database pods, service, pvcs and stash backup data. - TerminationPolicyWipeOut TerminationPolicy = "WipeOut" + DeletionPolicyWipeOut DeletionPolicy = "WipeOut" // Rejects attempt to delete database using ValidationWebhook. - TerminationPolicyDoNotTerminate TerminationPolicy = "DoNotTerminate" + DeletionPolicyDoNotTerminate DeletionPolicy = "DoNotTerminate" ) // +kubebuilder:validation:Enum=primary;standby;stats;dashboard;secondary diff --git a/apis/kubedb/v1alpha2/zookeeper_helpers.go b/apis/kubedb/v1alpha2/zookeeper_helpers.go index 5bd4730eff..39b9b8b7cd 100644 --- a/apis/kubedb/v1alpha2/zookeeper_helpers.go +++ b/apis/kubedb/v1alpha2/zookeeper_helpers.go @@ -188,18 +188,18 @@ func (z *ZooKeeper) SetHealthCheckerDefaults() { func (z *ZooKeeper) SetDefaults() { if z.Spec.DeletionPolicy == "" { - z.Spec.DeletionPolicy = TerminationPolicyDelete + z.Spec.DeletionPolicy = DeletionPolicyDelete } if z.Spec.Replicas == nil { z.Spec.Replicas = pointer.Int32P(1) } if z.Spec.Halted { - if z.Spec.DeletionPolicy == TerminationPolicyDoNotTerminate { + if z.Spec.DeletionPolicy == DeletionPolicyDoNotTerminate { klog.Errorf(`Can't halt, since termination policy is 'DoNotTerminate'`) return } - z.Spec.DeletionPolicy = TerminationPolicyHalt + z.Spec.DeletionPolicy = DeletionPolicyHalt } var zkVersion catalog.ZooKeeperVersion diff --git a/apis/kubedb/v1alpha2/zookeeper_types.go b/apis/kubedb/v1alpha2/zookeeper_types.go index 661a5feea7..972d48c59c 100644 --- a/apis/kubedb/v1alpha2/zookeeper_types.go +++ b/apis/kubedb/v1alpha2/zookeeper_types.go @@ -106,7 +106,7 @@ type ZooKeeperSpec struct { // DeletionPolicy controls the delete operation for database // +optional - DeletionPolicy TerminationPolicy `json:"deletionPolicy,omitempty"` + DeletionPolicy DeletionPolicy `json:"deletionPolicy,omitempty"` // Indicates that the database is halted and all offshoot Kubernetes resources except PVCs are deleted. // +optional diff --git a/apis/kubedb/v1alpha2/zookeeper_webhook.go b/apis/kubedb/v1alpha2/zookeeper_webhook.go index 20fcfba928..e9da6a2ce9 100644 --- a/apis/kubedb/v1alpha2/zookeeper_webhook.go +++ b/apis/kubedb/v1alpha2/zookeeper_webhook.go @@ -79,7 +79,7 @@ func (z *ZooKeeper) ValidateDelete() (admission.Warnings, error) { zookeeperlog.Info("validate delete", "name", z.Name) var allErr field.ErrorList - if z.Spec.DeletionPolicy == TerminationPolicyDoNotTerminate { + if z.Spec.DeletionPolicy == DeletionPolicyDoNotTerminate { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("teminationPolicy"), z.Name, "Can not delete as terminationPolicy is set to \"DoNotTerminate\"")) diff --git a/apis/kubedb/v1alpha2/zz_generated.conversion.go b/apis/kubedb/v1alpha2/zz_generated.conversion.go index a9586fa311..44658e35c9 100644 --- a/apis/kubedb/v1alpha2/zz_generated.conversion.go +++ b/apis/kubedb/v1alpha2/zz_generated.conversion.go @@ -2045,7 +2045,7 @@ func autoConvert_v1_KafkaSpec_To_v1alpha2_KafkaSpec(in *v1.KafkaSpec, out *Kafka out.TLS = (*clientgoapiv1.TLSConfig)(unsafe.Pointer(in.TLS)) out.PodTemplate = in.PodTemplate out.ServiceTemplates = *(*[]NamedServiceTemplateSpec)(unsafe.Pointer(&in.ServiceTemplates)) - out.DeletionPolicy = TerminationPolicy(in.DeletionPolicy) + out.DeletionPolicy = DeletionPolicy(in.DeletionPolicy) out.HealthChecker = in.HealthChecker out.CruiseControl = (*KafkaCruiseControl)(unsafe.Pointer(in.CruiseControl)) out.Monitor = (*monitoringagentapiapiv1.AgentSpec)(unsafe.Pointer(in.Monitor)) diff --git a/pkg/admission/namespace/admission.go b/pkg/admission/namespace/admission.go index 58baa0be47..1af1b8716b 100644 --- a/pkg/admission/namespace/admission.go +++ b/pkg/admission/namespace/admission.go @@ -114,8 +114,8 @@ func (a *NamespaceValidator) Admit(req *admission.AdmissionRequest) *admission.A return err } if found && - (terminationPolicy == string(olddbapi.TerminationPolicyHalt) || - terminationPolicy == string(olddbapi.TerminationPolicyDoNotTerminate)) { + (terminationPolicy == string(olddbapi.DeletionPolicyHalt) || + terminationPolicy == string(olddbapi.DeletionPolicyDoNotTerminate)) { return fmt.Errorf("%s %s/%s has termination policy `%s`", u.GetKind(), u.GetNamespace(), u.GetName(), terminationPolicy) } return nil