Skip to content

Commit

Permalink
Merge pull request #1363 from smallc2009/bugfix/host-validation-influxDB
Browse files Browse the repository at this point in the history 
Remove influxdb host validation in  ClusterOutput
  • Loading branch information
@wenchajun
wenchajun authored Sep 29, 2024
2 parents 3064a00 + 0c4d712 commit 0058435
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 29 deletions.
7 changes: 2 additions & 5 deletions apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
5 changes: 2 additions & 3 deletions charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions config/crd/bases/fluentbit.fluent.io_outputs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions manifests/setup/fluent-operator-crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions manifests/setup/setup.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 0058435

Please sign in to comment.