Skip to content

Commit 0058435

Browse files
authored
Merge pull request #1363 from smallc2009/bugfix/host-validation-influxDB
Remove influxdb host validation in ClusterOutput
2 parents 3064a00 + 0c4d712 commit 0058435

File tree

7 files changed

+18
-29
lines changed

7 files changed

+18
-29
lines changed

apis/fluentbit/v1alpha2/plugins/output/influxdb_types.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@ import (
1414
// **For full documentation, refer to https://docs.fluentbit.io/manual/pipeline/outputs/influxdb**
1515
type InfluxDB struct {
1616
// IP address or hostname of the target InfluxDB service.
17-
// +kubebuilder:validation:Format="hostname"
18-
// +kubebuilder:validation:Format="ipv4"
19-
// +kubebuilder:validation:Format="ipv6"
2017
Host string `json:"host"`
2118
// TCP port of the target InfluxDB service.
22-
// +kubebuilder:validation:Maximum=65536
23-
// +kubebuilder:validation:Minimum=0
19+
// +kubebuilder:validation:Maximum=65535
20+
// +kubebuilder:validation:Minimum=1
2421
Port *int32 `json:"port,omitempty"`
2522
// InfluxDB database name where records will be inserted.
2623
Database string `json:"database,omitempty"`

charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_clusteroutputs.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,7 +1747,6 @@ spec:
17471747
type: string
17481748
host:
17491749
description: IP address or hostname of the target InfluxDB service.
1750-
format: ipv6
17511750
type: string
17521751
httpPassword:
17531752
description: Password for user defined in HTTP_User
@@ -1917,8 +1916,8 @@ spec:
19171916
port:
19181917
description: TCP port of the target InfluxDB service.
19191918
format: int32
1920-
maximum: 65536
1921-
minimum: 0
1919+
maximum: 65535
1920+
minimum: 1
19221921
type: integer
19231922
sequenceTag:
19241923
description: The name of the tag whose value is incremented for

charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_outputs.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,7 +1747,6 @@ spec:
17471747
type: string
17481748
host:
17491749
description: IP address or hostname of the target InfluxDB service.
1750-
format: ipv6
17511750
type: string
17521751
httpPassword:
17531752
description: Password for user defined in HTTP_User
@@ -1917,8 +1916,8 @@ spec:
19171916
port:
19181917
description: TCP port of the target InfluxDB service.
19191918
format: int32
1920-
maximum: 65536
1921-
minimum: 0
1919+
maximum: 65535
1920+
minimum: 1
19221921
type: integer
19231922
sequenceTag:
19241923
description: The name of the tag whose value is incremented for

config/crd/bases/fluentbit.fluent.io_clusteroutputs.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,7 +1747,6 @@ spec:
17471747
type: string
17481748
host:
17491749
description: IP address or hostname of the target InfluxDB service.
1750-
format: ipv6
17511750
type: string
17521751
httpPassword:
17531752
description: Password for user defined in HTTP_User
@@ -1917,8 +1916,8 @@ spec:
19171916
port:
19181917
description: TCP port of the target InfluxDB service.
19191918
format: int32
1920-
maximum: 65536
1921-
minimum: 0
1919+
maximum: 65535
1920+
minimum: 1
19221921
type: integer
19231922
sequenceTag:
19241923
description: The name of the tag whose value is incremented for

config/crd/bases/fluentbit.fluent.io_outputs.yaml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,7 +1747,6 @@ spec:
17471747
type: string
17481748
host:
17491749
description: IP address or hostname of the target InfluxDB service.
1750-
format: ipv6
17511750
type: string
17521751
httpPassword:
17531752
description: Password for user defined in HTTP_User
@@ -1917,8 +1916,8 @@ spec:
19171916
port:
19181917
description: TCP port of the target InfluxDB service.
19191918
format: int32
1920-
maximum: 65536
1921-
minimum: 0
1919+
maximum: 65535
1920+
minimum: 1
19221921
type: integer
19231922
sequenceTag:
19241923
description: The name of the tag whose value is incremented for

manifests/setup/fluent-operator-crd.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5784,7 +5784,6 @@ spec:
57845784
type: string
57855785
host:
57865786
description: IP address or hostname of the target InfluxDB service.
5787-
format: ipv6
57885787
type: string
57895788
httpPassword:
57905789
description: Password for user defined in HTTP_User
@@ -5954,8 +5953,8 @@ spec:
59545953
port:
59555954
description: TCP port of the target InfluxDB service.
59565955
format: int32
5957-
maximum: 65536
5958-
minimum: 0
5956+
maximum: 65535
5957+
minimum: 1
59595958
type: integer
59605959
sequenceTag:
59615960
description: The name of the tag whose value is incremented for
@@ -34472,7 +34471,6 @@ spec:
3447234471
type: string
3447334472
host:
3447434473
description: IP address or hostname of the target InfluxDB service.
34475-
format: ipv6
3447634474
type: string
3447734475
httpPassword:
3447834476
description: Password for user defined in HTTP_User
@@ -34642,8 +34640,8 @@ spec:
3464234640
port:
3464334641
description: TCP port of the target InfluxDB service.
3464434642
format: int32
34645-
maximum: 65536
34646-
minimum: 0
34643+
maximum: 65535
34644+
minimum: 1
3464734645
type: integer
3464834646
sequenceTag:
3464934647
description: The name of the tag whose value is incremented for

manifests/setup/setup.yaml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5784,7 +5784,6 @@ spec:
57845784
type: string
57855785
host:
57865786
description: IP address or hostname of the target InfluxDB service.
5787-
format: ipv6
57885787
type: string
57895788
httpPassword:
57905789
description: Password for user defined in HTTP_User
@@ -5954,8 +5953,8 @@ spec:
59545953
port:
59555954
description: TCP port of the target InfluxDB service.
59565955
format: int32
5957-
maximum: 65536
5958-
minimum: 0
5956+
maximum: 65535
5957+
minimum: 1
59595958
type: integer
59605959
sequenceTag:
59615960
description: The name of the tag whose value is incremented for
@@ -34472,7 +34471,6 @@ spec:
3447234471
type: string
3447334472
host:
3447434473
description: IP address or hostname of the target InfluxDB service.
34475-
format: ipv6
3447634474
type: string
3447734475
httpPassword:
3447834476
description: Password for user defined in HTTP_User
@@ -34642,8 +34640,8 @@ spec:
3464234640
port:
3464334641
description: TCP port of the target InfluxDB service.
3464434642
format: int32
34645-
maximum: 65536
34646-
minimum: 0
34643+
maximum: 65535
34644+
minimum: 1
3464734645
type: integer
3464834646
sequenceTag:
3464934647
description: The name of the tag whose value is incremented for

0 commit comments

Comments
 (0)