From 0f8ac9110f98817bcb73b8bbd6d3ad22fe7d1326 Mon Sep 17 00:00:00 2001 From: Raihan Khan Date: Fri, 19 Jan 2024 19:57:42 +0600 Subject: [PATCH] Fix API for new Databases (#1120) Signed-off-by: raihankhan --- apis/catalog/v1alpha1/druid_version_types.go | 23 +-- .../v1alpha1/kafka_connector_version_types.go | 8 - apis/catalog/v1alpha1/openapi_generated.go | 143 +----------------- apis/catalog/v1alpha1/solr_version_types.go | 13 +- .../catalog/v1alpha1/zz_generated.deepcopy.go | 87 ----------- apis/kubedb/v1alpha2/druid_helpers.go | 3 - apis/kubedb/v1alpha2/rabbitmq_webhook.go | 6 +- apis/kubedb/v1alpha2/solr_helpers.go | 3 - apis/kubedb/v1alpha2/solr_webhook.go | 5 + crds/catalog.kubedb.com_druidversions.yaml | 23 --- ...log.kubedb.com_kafkaconnectorversions.yaml | 7 - crds/catalog.kubedb.com_solrversions.yaml | 5 - pkg/openapi/lib.go | 12 ++ 13 files changed, 26 insertions(+), 312 deletions(-) diff --git a/apis/catalog/v1alpha1/druid_version_types.go b/apis/catalog/v1alpha1/druid_version_types.go index d538d42958..399165584c 100644 --- a/apis/catalog/v1alpha1/druid_version_types.go +++ b/apis/catalog/v1alpha1/druid_version_types.go @@ -56,14 +56,9 @@ type DruidVersionSpec struct { // Deprecated versions usable but regarded as obsolete and best avoided, typically due to having been superseded. // +optional Deprecated bool `json:"deprecated,omitempty"` - // PSP names - // +optional - PodSecurityPolicies DruidVersionPodSecurityPolicy `json:"podSecurityPolicies"` - // update constraints - UpdateConstraints UpdateConstraints `json:"updateConstraints,omitempty"` // SecurityContext is for the additional security information for the Druid container // +optional - SecurityContext DruidSecurityContext `json:"securityContext"` + SecurityContext SecurityContext `json:"securityContext"` } // DruidVersionDatabase is the Druid Database image @@ -76,22 +71,6 @@ type DruidInitContainer struct { Image string `json:"image"` } -// SinglestoreVersionPodSecurityPolicy is the Singlestore pod security policies -type DruidVersionPodSecurityPolicy struct { - DatabasePolicyName string `json:"databasePolicyName"` -} - -// DruidSecurityContext provides additional securityContext settings for the Druid Image -type DruidSecurityContext struct { - // RunAsUser is default UID for the DB container. It defaults to 1000. - RunAsUser *int64 `json:"runAsUser,omitempty"` - - RunAsGroup *int64 `json:"runAsGroup,omitempty"` - - // RunAsAnyNonRoot will be true if user can change the default UID to other than 1000. - RunAsAnyNonRoot bool `json:"runAsAnyNonRoot,omitempty"` -} - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // DruidVersionList contains a list of DruidVersion diff --git a/apis/catalog/v1alpha1/kafka_connector_version_types.go b/apis/catalog/v1alpha1/kafka_connector_version_types.go index abb48b44df..df4319f0f1 100644 --- a/apis/catalog/v1alpha1/kafka_connector_version_types.go +++ b/apis/catalog/v1alpha1/kafka_connector_version_types.go @@ -58,9 +58,6 @@ type KafkaConnectorVersionSpec struct { // Deprecated versions usable but regarded as obsolete and best avoided, typically due to having been superseded. // +optional Deprecated bool `json:"deprecated,omitempty"` - // PSP names - // +optional - PodSecurityPolicies ConnectorPluginPodSecurityPolicy `json:"podSecurityPolicies"` // SecurityContext is for the additional config for the init container // +optional SecurityContext SecurityContext `json:"securityContext"` @@ -71,11 +68,6 @@ type ConnectorPlugin struct { Image string `json:"image"` } -// ConnectorPluginPodSecurityPolicy is the Kafka init container security policies -type ConnectorPluginPodSecurityPolicy struct { - DatabasePolicyName string `json:"databasePolicyName"` -} - // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // KafkaConnectorVersionList is a list of KafkaConnectorVersion diff --git a/apis/catalog/v1alpha1/openapi_generated.go b/apis/catalog/v1alpha1/openapi_generated.go index b3b40d1b33..c526ac86b8 100644 --- a/apis/catalog/v1alpha1/openapi_generated.go +++ b/apis/catalog/v1alpha1/openapi_generated.go @@ -460,14 +460,11 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ArchiverSpec": schema_apimachinery_apis_catalog_v1alpha1_ArchiverSpec(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ConnectClusterVersion": schema_apimachinery_apis_catalog_v1alpha1_ConnectClusterVersion(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ConnectorPlugin": schema_apimachinery_apis_catalog_v1alpha1_ConnectorPlugin(ref), - "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ConnectorPluginPodSecurityPolicy": schema_apimachinery_apis_catalog_v1alpha1_ConnectorPluginPodSecurityPolicy(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.CruiseControlVersionDatabase": schema_apimachinery_apis_catalog_v1alpha1_CruiseControlVersionDatabase(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidInitContainer": schema_apimachinery_apis_catalog_v1alpha1_DruidInitContainer(ref), - "kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidSecurityContext": schema_apimachinery_apis_catalog_v1alpha1_DruidSecurityContext(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidVersion": schema_apimachinery_apis_catalog_v1alpha1_DruidVersion(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidVersionDatabase": schema_apimachinery_apis_catalog_v1alpha1_DruidVersionDatabase(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidVersionList": schema_apimachinery_apis_catalog_v1alpha1_DruidVersionList(ref), - "kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidVersionPodSecurityPolicy": schema_apimachinery_apis_catalog_v1alpha1_DruidVersionPodSecurityPolicy(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidVersionSpec": schema_apimachinery_apis_catalog_v1alpha1_DruidVersionSpec(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchDashboardVersionDatabase": schema_apimachinery_apis_catalog_v1alpha1_ElasticsearchDashboardVersionDatabase(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ElasticsearchSecurityContext": schema_apimachinery_apis_catalog_v1alpha1_ElasticsearchSecurityContext(ref), @@ -590,7 +587,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SinglestoreVersionList": schema_apimachinery_apis_catalog_v1alpha1_SinglestoreVersionList(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SinglestoreVersionSpec": schema_apimachinery_apis_catalog_v1alpha1_SinglestoreVersionSpec(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SolrInitContainer": schema_apimachinery_apis_catalog_v1alpha1_SolrInitContainer(ref), - "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SolrSecurityContext": schema_apimachinery_apis_catalog_v1alpha1_SolrSecurityContext(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SolrVersion": schema_apimachinery_apis_catalog_v1alpha1_SolrVersion(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SolrVersionDatabase": schema_apimachinery_apis_catalog_v1alpha1_SolrVersionDatabase(ref), "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SolrVersionList": schema_apimachinery_apis_catalog_v1alpha1_SolrVersionList(ref), @@ -22901,27 +22897,6 @@ func schema_apimachinery_apis_catalog_v1alpha1_ConnectorPlugin(ref common.Refere } } -func schema_apimachinery_apis_catalog_v1alpha1_ConnectorPluginPodSecurityPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "ConnectorPluginPodSecurityPolicy is the Kafka init container security policies", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "databasePolicyName": { - SchemaProps: spec.SchemaProps{ - Default: "", - Type: []string{"string"}, - Format: "", - }, - }, - }, - Required: []string{"databasePolicyName"}, - }, - }, - } -} - func schema_apimachinery_apis_catalog_v1alpha1_CruiseControlVersionDatabase(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -22964,39 +22939,6 @@ func schema_apimachinery_apis_catalog_v1alpha1_DruidInitContainer(ref common.Ref } } -func schema_apimachinery_apis_catalog_v1alpha1_DruidSecurityContext(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "DruidSecurityContext provides additional securityContext settings for the Druid Image", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "runAsUser": { - SchemaProps: spec.SchemaProps{ - Description: "RunAsUser is default UID for the DB container. It defaults to 1000.", - Type: []string{"integer"}, - Format: "int64", - }, - }, - "runAsGroup": { - SchemaProps: spec.SchemaProps{ - Type: []string{"integer"}, - Format: "int64", - }, - }, - "runAsAnyNonRoot": { - SchemaProps: spec.SchemaProps{ - Description: "RunAsAnyNonRoot will be true if user can change the default UID to other than 1000.", - Type: []string{"boolean"}, - Format: "", - }, - }, - }, - }, - }, - } -} - func schema_apimachinery_apis_catalog_v1alpha1_DruidVersion(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -23106,27 +23048,6 @@ func schema_apimachinery_apis_catalog_v1alpha1_DruidVersionList(ref common.Refer } } -func schema_apimachinery_apis_catalog_v1alpha1_DruidVersionPodSecurityPolicy(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "SinglestoreVersionPodSecurityPolicy is the Singlestore pod security policies", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "databasePolicyName": { - SchemaProps: spec.SchemaProps{ - Default: "", - Type: []string{"string"}, - Format: "", - }, - }, - }, - Required: []string{"databasePolicyName"}, - }, - }, - } -} - func schema_apimachinery_apis_catalog_v1alpha1_DruidVersionSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -23163,25 +23084,11 @@ func schema_apimachinery_apis_catalog_v1alpha1_DruidVersionSpec(ref common.Refer Format: "", }, }, - "podSecurityPolicies": { - SchemaProps: spec.SchemaProps{ - Description: "PSP names", - Default: map[string]interface{}{}, - Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidVersionPodSecurityPolicy"), - }, - }, - "updateConstraints": { - SchemaProps: spec.SchemaProps{ - Description: "update constraints", - Default: map[string]interface{}{}, - Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.UpdateConstraints"), - }, - }, "securityContext": { SchemaProps: spec.SchemaProps{ Description: "SecurityContext is for the additional security information for the Druid container", Default: map[string]interface{}{}, - Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidSecurityContext"), + Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.SecurityContext"), }, }, }, @@ -23189,7 +23096,7 @@ func schema_apimachinery_apis_catalog_v1alpha1_DruidVersionSpec(ref common.Refer }, }, Dependencies: []string{ - "kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidInitContainer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidSecurityContext", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidVersionDatabase", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidVersionPodSecurityPolicy", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.UpdateConstraints"}, + "kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidInitContainer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.DruidVersionDatabase", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SecurityContext"}, } } @@ -23900,13 +23807,6 @@ func schema_apimachinery_apis_catalog_v1alpha1_KafkaConnectorVersionSpec(ref com Format: "", }, }, - "podSecurityPolicies": { - SchemaProps: spec.SchemaProps{ - Description: "PSP names", - Default: map[string]interface{}{}, - Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.ConnectorPluginPodSecurityPolicy"), - }, - }, "securityContext": { SchemaProps: spec.SchemaProps{ Description: "SecurityContext is for the additional config for the init container", @@ -23919,7 +23819,7 @@ func schema_apimachinery_apis_catalog_v1alpha1_KafkaConnectorVersionSpec(ref com }, }, Dependencies: []string{ - "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ConnectorPlugin", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ConnectorPluginPodSecurityPolicy", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SecurityContext"}, + "kubedb.dev/apimachinery/apis/catalog/v1alpha1.ConnectorPlugin", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SecurityContext"}, } } @@ -27545,39 +27445,6 @@ func schema_apimachinery_apis_catalog_v1alpha1_SolrInitContainer(ref common.Refe } } -func schema_apimachinery_apis_catalog_v1alpha1_SolrSecurityContext(ref common.ReferenceCallback) common.OpenAPIDefinition { - return common.OpenAPIDefinition{ - Schema: spec.Schema{ - SchemaProps: spec.SchemaProps{ - Description: "SolrSecurityContext provides additional securityContext settings for the Solr Image", - Type: []string{"object"}, - Properties: map[string]spec.Schema{ - "runAsUser": { - SchemaProps: spec.SchemaProps{ - Description: "RunAsUser is default UID for the DB container. It defaults to 8983.", - Type: []string{"integer"}, - Format: "int64", - }, - }, - "runAsGroup": { - SchemaProps: spec.SchemaProps{ - Type: []string{"integer"}, - Format: "int64", - }, - }, - "runAsAnyNonRoot": { - SchemaProps: spec.SchemaProps{ - Description: "RunAsAnyNonRoot will be true if user can change the default UID to other than 8983.", - Type: []string{"boolean"}, - Format: "", - }, - }, - }, - }, - }, - } -} - func schema_apimachinery_apis_catalog_v1alpha1_SolrVersion(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -27727,7 +27594,7 @@ func schema_apimachinery_apis_catalog_v1alpha1_SolrVersionSpec(ref common.Refere SchemaProps: spec.SchemaProps{ Description: "SecurityContext is for the additional security information for the Solr container", Default: map[string]interface{}{}, - Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.SolrSecurityContext"), + Ref: ref("kubedb.dev/apimachinery/apis/catalog/v1alpha1.SecurityContext"), }, }, }, @@ -27735,7 +27602,7 @@ func schema_apimachinery_apis_catalog_v1alpha1_SolrVersionSpec(ref common.Refere }, }, Dependencies: []string{ - "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SolrInitContainer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SolrSecurityContext", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SolrVersionDatabase"}, + "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SecurityContext", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SolrInitContainer", "kubedb.dev/apimachinery/apis/catalog/v1alpha1.SolrVersionDatabase"}, } } diff --git a/apis/catalog/v1alpha1/solr_version_types.go b/apis/catalog/v1alpha1/solr_version_types.go index 11d72ba0e4..f6793fe30a 100644 --- a/apis/catalog/v1alpha1/solr_version_types.go +++ b/apis/catalog/v1alpha1/solr_version_types.go @@ -63,7 +63,7 @@ type SolrVersionSpec struct { Deprecated bool `json:"deprecated,omitempty"` // SecurityContext is for the additional security information for the Solr container // +optional - SecurityContext SolrSecurityContext `json:"securityContext"` + SecurityContext SecurityContext `json:"securityContext"` } // SolrVersionDatabase is the Solr Database image @@ -76,17 +76,6 @@ type SolrInitContainer struct { Image string `json:"image"` } -// SolrSecurityContext provides additional securityContext settings for the Solr Image -type SolrSecurityContext struct { - // RunAsUser is default UID for the DB container. It defaults to 8983. - RunAsUser *int64 `json:"runAsUser,omitempty"` - - RunAsGroup *int64 `json:"runAsGroup,omitempty"` - - // RunAsAnyNonRoot will be true if user can change the default UID to other than 8983. - RunAsAnyNonRoot bool `json:"runAsAnyNonRoot,omitempty"` -} - // SolrVersionList contains a list of SolrVersion // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/apis/catalog/v1alpha1/zz_generated.deepcopy.go b/apis/catalog/v1alpha1/zz_generated.deepcopy.go index fd77c635bb..4293dd78e3 100644 --- a/apis/catalog/v1alpha1/zz_generated.deepcopy.go +++ b/apis/catalog/v1alpha1/zz_generated.deepcopy.go @@ -111,22 +111,6 @@ func (in *ConnectorPlugin) DeepCopy() *ConnectorPlugin { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *ConnectorPluginPodSecurityPolicy) DeepCopyInto(out *ConnectorPluginPodSecurityPolicy) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConnectorPluginPodSecurityPolicy. -func (in *ConnectorPluginPodSecurityPolicy) DeepCopy() *ConnectorPluginPodSecurityPolicy { - if in == nil { - return nil - } - out := new(ConnectorPluginPodSecurityPolicy) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *CruiseControlVersionDatabase) DeepCopyInto(out *CruiseControlVersionDatabase) { *out = *in @@ -159,32 +143,6 @@ func (in *DruidInitContainer) DeepCopy() *DruidInitContainer { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DruidSecurityContext) DeepCopyInto(out *DruidSecurityContext) { - *out = *in - if in.RunAsUser != nil { - in, out := &in.RunAsUser, &out.RunAsUser - *out = new(int64) - **out = **in - } - if in.RunAsGroup != nil { - in, out := &in.RunAsGroup, &out.RunAsGroup - *out = new(int64) - **out = **in - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DruidSecurityContext. -func (in *DruidSecurityContext) DeepCopy() *DruidSecurityContext { - if in == nil { - return nil - } - out := new(DruidSecurityContext) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DruidVersion) DeepCopyInto(out *DruidVersion) { *out = *in @@ -261,29 +219,11 @@ func (in *DruidVersionList) DeepCopyObject() runtime.Object { return nil } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DruidVersionPodSecurityPolicy) DeepCopyInto(out *DruidVersionPodSecurityPolicy) { - *out = *in - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DruidVersionPodSecurityPolicy. -func (in *DruidVersionPodSecurityPolicy) DeepCopy() *DruidVersionPodSecurityPolicy { - if in == nil { - return nil - } - out := new(DruidVersionPodSecurityPolicy) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *DruidVersionSpec) DeepCopyInto(out *DruidVersionSpec) { *out = *in out.DB = in.DB out.InitContainer = in.InitContainer - out.PodSecurityPolicies = in.PodSecurityPolicies - in.UpdateConstraints.DeepCopyInto(&out.UpdateConstraints) in.SecurityContext.DeepCopyInto(&out.SecurityContext) return } @@ -694,7 +634,6 @@ func (in *KafkaConnectorVersionList) DeepCopyObject() runtime.Object { func (in *KafkaConnectorVersionSpec) DeepCopyInto(out *KafkaConnectorVersionSpec) { *out = *in out.ConnectorPlugin = in.ConnectorPlugin - out.PodSecurityPolicies = in.PodSecurityPolicies in.SecurityContext.DeepCopyInto(&out.SecurityContext) return } @@ -2864,32 +2803,6 @@ func (in *SolrInitContainer) DeepCopy() *SolrInitContainer { return out } -// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *SolrSecurityContext) DeepCopyInto(out *SolrSecurityContext) { - *out = *in - if in.RunAsUser != nil { - in, out := &in.RunAsUser, &out.RunAsUser - *out = new(int64) - **out = **in - } - if in.RunAsGroup != nil { - in, out := &in.RunAsGroup, &out.RunAsGroup - *out = new(int64) - **out = **in - } - return -} - -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SolrSecurityContext. -func (in *SolrSecurityContext) DeepCopy() *SolrSecurityContext { - if in == nil { - return nil - } - out := new(SolrSecurityContext) - in.DeepCopyInto(out) - return out -} - // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SolrVersion) DeepCopyInto(out *SolrVersion) { *out = *in diff --git a/apis/kubedb/v1alpha2/druid_helpers.go b/apis/kubedb/v1alpha2/druid_helpers.go index 994b0beb4d..f4a1335f54 100644 --- a/apis/kubedb/v1alpha2/druid_helpers.go +++ b/apis/kubedb/v1alpha2/druid_helpers.go @@ -421,9 +421,6 @@ func (d *Druid) assignDefaultContainerSecurityContext(druidVersion *catalog.Drui if sc.RunAsUser == nil { sc.RunAsUser = druidVersion.Spec.SecurityContext.RunAsUser } - if sc.RunAsGroup == nil { - sc.RunAsGroup = druidVersion.Spec.SecurityContext.RunAsGroup - } if sc.SeccompProfile == nil { sc.SeccompProfile = secomp.DefaultSeccompProfile() } diff --git a/apis/kubedb/v1alpha2/rabbitmq_webhook.go b/apis/kubedb/v1alpha2/rabbitmq_webhook.go index 61a1842a40..171dc86fb2 100644 --- a/apis/kubedb/v1alpha2/rabbitmq_webhook.go +++ b/apis/kubedb/v1alpha2/rabbitmq_webhook.go @@ -69,20 +69,18 @@ func (r *RabbitMQ) ValidateUpdate(old runtime.Object) (admission.Warnings, error func (r *RabbitMQ) ValidateDelete() (admission.Warnings, error) { rabbitmqlog.Info("validate delete", "name", r.Name) - // TODO(user): fill in your validation logic upon object deletion. var allErr field.ErrorList if r.Spec.TerminationPolicy == TerminationPolicyDoNotTerminate { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("teminationPolicy"), r.Name, "Can not delete as terminationPolicy is set to \"DoNotTerminate\"")) - return nil, apierrors.NewInvalid(schema.GroupKind{Group: "kafka.kubedb.com", Kind: "Kafka"}, r.Name, allErr) + return nil, apierrors.NewInvalid(schema.GroupKind{Group: "rabbitmq.kubedb.com", Kind: "RabbitMQ"}, r.Name, allErr) } return nil, nil } func (r *RabbitMQ) ValidateCreateOrUpdate() error { var allErr field.ErrorList - // TODO(user): fill in your validation logic upon object creation. if r.Spec.EnableSSL { if r.Spec.TLS == nil { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("enableSSL"), @@ -140,7 +138,7 @@ func (r *RabbitMQ) ValidateCreateOrUpdate() error { if len(allErr) == 0 { return nil } - return apierrors.NewInvalid(schema.GroupKind{Group: "kafka.kubedb.com", Kind: "Kafka"}, r.Name, allErr) + return apierrors.NewInvalid(schema.GroupKind{Group: "rabbitmq.kubedb.com", Kind: "RabbitMQ"}, r.Name, allErr) } func (r *RabbitMQ) ValidateVersion(db *RabbitMQ) error { diff --git a/apis/kubedb/v1alpha2/solr_helpers.go b/apis/kubedb/v1alpha2/solr_helpers.go index dcb0ddba3c..b468947601 100644 --- a/apis/kubedb/v1alpha2/solr_helpers.go +++ b/apis/kubedb/v1alpha2/solr_helpers.go @@ -312,9 +312,6 @@ func (s *Solr) assignDefaultContainerSecurityContext(slVersion *catalog.SolrVers if sc.RunAsUser == nil { sc.RunAsUser = slVersion.Spec.SecurityContext.RunAsUser } - if sc.RunAsGroup == nil { - sc.RunAsGroup = slVersion.Spec.SecurityContext.RunAsGroup - } if sc.SeccompProfile == nil { sc.SeccompProfile = secomp.DefaultSeccompProfile() } diff --git a/apis/kubedb/v1alpha2/solr_webhook.go b/apis/kubedb/v1alpha2/solr_webhook.go index 51ba697ebd..59187e616e 100644 --- a/apis/kubedb/v1alpha2/solr_webhook.go +++ b/apis/kubedb/v1alpha2/solr_webhook.go @@ -176,6 +176,11 @@ func (s *Solr) ValidateCreateOrUpdate() field.ErrorList { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("topology").Child("data"), s.Name, ".spec.topology.data can't be empty in cluster mode")) + if s.Spec.Replicas != nil && *s.Spec.Replicas <= 0 { + allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("replicas"), + s.Name, + "number of replicas can not be less be 0 or less")) + } } if s.Spec.Topology.Data.Replicas != nil && *s.Spec.Topology.Data.Replicas <= 0 { allErr = append(allErr, field.Invalid(field.NewPath("spec").Child("topology").Child("data").Child("replicas"), diff --git a/crds/catalog.kubedb.com_druidversions.yaml b/crds/catalog.kubedb.com_druidversions.yaml index 5d865aa469..87fe0686bd 100644 --- a/crds/catalog.kubedb.com_druidversions.yaml +++ b/crds/catalog.kubedb.com_druidversions.yaml @@ -61,35 +61,12 @@ spec: required: - image type: object - podSecurityPolicies: - properties: - databasePolicyName: - type: string - required: - - databasePolicyName - type: object securityContext: properties: - runAsAnyNonRoot: - type: boolean - runAsGroup: - format: int64 - type: integer runAsUser: format: int64 type: integer type: object - updateConstraints: - properties: - allowlist: - items: - type: string - type: array - denylist: - items: - type: string - type: array - type: object version: type: string required: diff --git a/crds/catalog.kubedb.com_kafkaconnectorversions.yaml b/crds/catalog.kubedb.com_kafkaconnectorversions.yaml index 027d51bbe1..03d1c33a2b 100644 --- a/crds/catalog.kubedb.com_kafkaconnectorversions.yaml +++ b/crds/catalog.kubedb.com_kafkaconnectorversions.yaml @@ -54,13 +54,6 @@ spec: type: object deprecated: type: boolean - podSecurityPolicies: - properties: - databasePolicyName: - type: string - required: - - databasePolicyName - type: object securityContext: properties: runAsUser: diff --git a/crds/catalog.kubedb.com_solrversions.yaml b/crds/catalog.kubedb.com_solrversions.yaml index dc1b721866..64c7213d23 100644 --- a/crds/catalog.kubedb.com_solrversions.yaml +++ b/crds/catalog.kubedb.com_solrversions.yaml @@ -63,11 +63,6 @@ spec: type: object securityContext: properties: - runAsAnyNonRoot: - type: boolean - runAsGroup: - format: int64 - type: integer runAsUser: format: int64 type: integer diff --git a/pkg/openapi/lib.go b/pkg/openapi/lib.go index 19ad8a25c7..2daa99aa2b 100644 --- a/pkg/openapi/lib.go +++ b/pkg/openapi/lib.go @@ -58,6 +58,12 @@ func ConfigureOpenAPI(scheme *runtime.Scheme, serverConfig *genericapiserver.Rec "/apis/mutators.kubedb.com/v1alpha1/redissentinelwebhooks", "/apis/mutators.kubedb.com/v1alpha1/rediswebhooks", "/apis/mutators.kubedb.com/v1alpha1/zookeeperwebhooks", + "/apis/mutators.kubedb.com/v1alpha1/rabbitmqwebhooks", + "/apis/mutators.kubedb.com/v1alpha1/druidwebhooks", + "/apis/mutators.kubedb.com/v1alpha1/solrwebhooks", + "/apis/mutators.kubedb.com/v1alpha1/singlestorewebhooks", + "/apis/mutators.kubedb.com/v1alpha1/pgpoolwebhooks", + "/apis/mutators.kubedb.com/v1alpha1/ferretdbwebhooks", "/apis/mutators.ops.kubedb.com/v1alpha1", "/apis/mutators.ops.kubedb.com/v1alpha1/mysqlopsrequestwebhooks", @@ -100,6 +106,12 @@ func ConfigureOpenAPI(scheme *runtime.Scheme, serverConfig *genericapiserver.Rec "/apis/validators.kubedb.com/v1alpha1/redissentinelwebhooks", "/apis/validators.kubedb.com/v1alpha1/rediswebhooks", "/apis/validators.kubedb.com/v1alpha1/zookeeperwebhooks", + "/apis/validators.kubedb.com/v1alpha1/rabbitmqwebhooks", + "/apis/validators.kubedb.com/v1alpha1/druidwebhooks", + "/apis/validators.kubedb.com/v1alpha1/solrwebhooks", + "/apis/validators.kubedb.com/v1alpha1/singlestorewebhooks", + "/apis/validators.kubedb.com/v1alpha1/pgpoolwebhooks", + "/apis/validators.kubedb.com/v1alpha1/ferretdbwebhooks", "/apis/validators.ops.kubedb.com/v1alpha1", "/apis/validators.ops.kubedb.com/v1alpha1/elasticsearchopsrequestwebhooks",