diff --git a/apis/kubedb/v1alpha2/constants.go b/apis/kubedb/v1alpha2/constants.go index db183df4c0..fad6318b5a 100644 --- a/apis/kubedb/v1alpha2/constants.go +++ b/apis/kubedb/v1alpha2/constants.go @@ -522,7 +522,7 @@ const ( KafkaPortNameExternal = "external" KafkaTopicNameHealth = "kafka-health" KafkaTopicDeletionThresholdOffset = 1000 - KafkaMaxNumberOfController = 1000 + KafkaControllerMaxID = 1000 KafkaRESTPort = 9092 KafkaControllerRESTPort = 9093 KafkaInternalRESTPort = 29092 diff --git a/apis/ops/v1alpha1/kafka_ops_helpers.go b/apis/ops/v1alpha1/kafka_ops_helpers.go index c06975df27..92c3ee2115 100644 --- a/apis/ops/v1alpha1/kafka_ops_helpers.go +++ b/apis/ops/v1alpha1/kafka_ops_helpers.go @@ -53,10 +53,6 @@ func (k *KafkaOpsRequest) ResourcePlural() string { return ResourcePluralKafkaOpsRequest } -func (k *KafkaOpsRequest) ValidateSpecs() error { - return nil -} - var _ Accessor = &KafkaOpsRequest{} func (k *KafkaOpsRequest) GetRequestType() any { diff --git a/apis/ops/v1alpha1/kafka_ops_types.go b/apis/ops/v1alpha1/kafka_ops_types.go index 4bb70e6363..4ff026b474 100644 --- a/apis/ops/v1alpha1/kafka_ops_types.go +++ b/apis/ops/v1alpha1/kafka_ops_types.go @@ -110,8 +110,6 @@ type KafkaHorizontalScalingTopologySpec struct { type KafkaVerticalScalingSpec struct { // Resource spec for combined nodes Node *core.ResourceRequirements `json:"node,omitempty"` - // Resource spec for exporter sidecar - Exporter *core.ResourceRequirements `json:"exporter,omitempty"` // Specifies the resource spec for cluster in topology mode Topology *KafkaVerticalScalingTopologySpec `json:"topology,omitempty"` } diff --git a/apis/ops/v1alpha1/openapi_generated.go b/apis/ops/v1alpha1/openapi_generated.go index f9a990f613..be570e81f2 100644 --- a/apis/ops/v1alpha1/openapi_generated.go +++ b/apis/ops/v1alpha1/openapi_generated.go @@ -22802,12 +22802,6 @@ func schema_apimachinery_apis_ops_v1alpha1_KafkaVerticalScalingSpec(ref common.R Ref: ref("k8s.io/api/core/v1.ResourceRequirements"), }, }, - "exporter": { - SchemaProps: spec.SchemaProps{ - Description: "Resource spec for exporter sidecar", - Ref: ref("k8s.io/api/core/v1.ResourceRequirements"), - }, - }, "topology": { SchemaProps: spec.SchemaProps{ Description: "Specifies the resource spec for cluster in topology mode", diff --git a/apis/ops/v1alpha1/zz_generated.deepcopy.go b/apis/ops/v1alpha1/zz_generated.deepcopy.go index d73654f3f6..50068e7ece 100644 --- a/apis/ops/v1alpha1/zz_generated.deepcopy.go +++ b/apis/ops/v1alpha1/zz_generated.deepcopy.go @@ -1064,11 +1064,6 @@ func (in *KafkaVerticalScalingSpec) DeepCopyInto(out *KafkaVerticalScalingSpec) *out = new(v1.ResourceRequirements) (*in).DeepCopyInto(*out) } - if in.Exporter != nil { - in, out := &in.Exporter, &out.Exporter - *out = new(v1.ResourceRequirements) - (*in).DeepCopyInto(*out) - } if in.Topology != nil { in, out := &in.Topology, &out.Topology *out = new(KafkaVerticalScalingTopologySpec) diff --git a/crds/ops.kubedb.com_kafkaopsrequests.yaml b/crds/ops.kubedb.com_kafkaopsrequests.yaml index 85b2288157..663e764a78 100644 --- a/crds/ops.kubedb.com_kafkaopsrequests.yaml +++ b/crds/ops.kubedb.com_kafkaopsrequests.yaml @@ -210,25 +210,6 @@ spec: type: object verticalScaling: properties: - exporter: - properties: - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - type: object - type: object node: properties: limits: