From 0c4d712b6352d440e8a9d84ff8526f8ca6dc0059 Mon Sep 17 00:00:00 2001 From: Anson Liu Date: Sat, 28 Sep 2024 10:04:28 +0000 Subject: [PATCH] Remove influxdb host validation in clusteroutput Signed-off-by: Anson Liu --- .../v1alpha2/plugins/output/influxdb_types.go | 7 ++----- .../crds/fluentbit.fluent.io_clusteroutputs.yaml | 5 ++--- .../crds/fluentbit.fluent.io_outputs.yaml | 5 ++--- .../crd/bases/fluentbit.fluent.io_clusteroutputs.yaml | 5 ++--- config/crd/bases/fluentbit.fluent.io_outputs.yaml | 5 ++--- manifests/setup/fluent-operator-crd.yaml | 10 ++++------ manifests/setup/setup.yaml | 10 ++++------ 7 files changed, 18 insertions(+), 29 deletions(-) diff --git a/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go b/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go index 99f28b074..2cb60f38f 100644 --- a/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go +++ b/apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go @@ -14,13 +14,10 @@ import ( // **For full documentation, refer to https://docs.fluentbit.io/manual/pipeline/outputs/influxdb** type InfluxDB struct { // IP address or hostname of the target InfluxDB service. - // +kubebuilder:validation:Format="hostname" - // +kubebuilder:validation:Format="ipv4" - // +kubebuilder:validation:Format="ipv6" Host string `json:"host"` // TCP port of the target InfluxDB service. - // +kubebuilder:validation:Maximum=65536 - // +kubebuilder:validation:Minimum=0 + // +kubebuilder:validation:Maximum=65535 + // +kubebuilder:validation:Minimum=1 Port *int32 `json:"port,omitempty"` // InfluxDB database name where records will be inserted. Database string `json:"database,omitempty"` diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml index bea2ab3fe..32efef86b 100644 --- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml +++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml @@ -1747,7 +1747,6 @@ spec: type: string host: description: IP address or hostname of the target InfluxDB service. - format: ipv6 type: string httpPassword: description: Password for user defined in HTTP_User @@ -1917,8 +1916,8 @@ spec: port: description: TCP port of the target InfluxDB service. format: int32 - maximum: 65536 - minimum: 0 + maximum: 65535 + minimum: 1 type: integer sequenceTag: description: The name of the tag whose value is incremented for diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml index 3342392bb..4831c6ecf 100644 --- a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml +++ b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml @@ -1747,7 +1747,6 @@ spec: type: string host: description: IP address or hostname of the target InfluxDB service. - format: ipv6 type: string httpPassword: description: Password for user defined in HTTP_User @@ -1917,8 +1916,8 @@ spec: port: description: TCP port of the target InfluxDB service. format: int32 - maximum: 65536 - minimum: 0 + maximum: 65535 + minimum: 1 type: integer sequenceTag: description: The name of the tag whose value is incremented for diff --git a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml index bea2ab3fe..32efef86b 100644 --- a/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml +++ b/config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml @@ -1747,7 +1747,6 @@ spec: type: string host: description: IP address or hostname of the target InfluxDB service. - format: ipv6 type: string httpPassword: description: Password for user defined in HTTP_User @@ -1917,8 +1916,8 @@ spec: port: description: TCP port of the target InfluxDB service. format: int32 - maximum: 65536 - minimum: 0 + maximum: 65535 + minimum: 1 type: integer sequenceTag: description: The name of the tag whose value is incremented for diff --git a/config/crd/bases/fluentbit.fluent.io_outputs.yaml b/config/crd/bases/fluentbit.fluent.io_outputs.yaml index 3342392bb..4831c6ecf 100644 --- a/config/crd/bases/fluentbit.fluent.io_outputs.yaml +++ b/config/crd/bases/fluentbit.fluent.io_outputs.yaml @@ -1747,7 +1747,6 @@ spec: type: string host: description: IP address or hostname of the target InfluxDB service. - format: ipv6 type: string httpPassword: description: Password for user defined in HTTP_User @@ -1917,8 +1916,8 @@ spec: port: description: TCP port of the target InfluxDB service. format: int32 - maximum: 65536 - minimum: 0 + maximum: 65535 + minimum: 1 type: integer sequenceTag: description: The name of the tag whose value is incremented for diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml index 00e34885f..308b0abe5 100644 --- a/manifests/setup/fluent-operator-crd.yaml +++ b/manifests/setup/fluent-operator-crd.yaml @@ -5784,7 +5784,6 @@ spec: type: string host: description: IP address or hostname of the target InfluxDB service. - format: ipv6 type: string httpPassword: description: Password for user defined in HTTP_User @@ -5954,8 +5953,8 @@ spec: port: description: TCP port of the target InfluxDB service. format: int32 - maximum: 65536 - minimum: 0 + maximum: 65535 + minimum: 1 type: integer sequenceTag: description: The name of the tag whose value is incremented for @@ -34472,7 +34471,6 @@ spec: type: string host: description: IP address or hostname of the target InfluxDB service. - format: ipv6 type: string httpPassword: description: Password for user defined in HTTP_User @@ -34642,8 +34640,8 @@ spec: port: description: TCP port of the target InfluxDB service. format: int32 - maximum: 65536 - minimum: 0 + maximum: 65535 + minimum: 1 type: integer sequenceTag: description: The name of the tag whose value is incremented for diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml index 138a029ca..4b2553377 100644 --- a/manifests/setup/setup.yaml +++ b/manifests/setup/setup.yaml @@ -5784,7 +5784,6 @@ spec: type: string host: description: IP address or hostname of the target InfluxDB service. - format: ipv6 type: string httpPassword: description: Password for user defined in HTTP_User @@ -5954,8 +5953,8 @@ spec: port: description: TCP port of the target InfluxDB service. format: int32 - maximum: 65536 - minimum: 0 + maximum: 65535 + minimum: 1 type: integer sequenceTag: description: The name of the tag whose value is incremented for @@ -34472,7 +34471,6 @@ spec: type: string host: description: IP address or hostname of the target InfluxDB service. - format: ipv6 type: string httpPassword: description: Password for user defined in HTTP_User @@ -34642,8 +34640,8 @@ spec: port: description: TCP port of the target InfluxDB service. format: int32 - maximum: 65536 - minimum: 0 + maximum: 65535 + minimum: 1 type: integer sequenceTag: description: The name of the tag whose value is incremented for