Skip to content

Commit 454fb67

Browse files
committed
feat: autogenerate HostAliases documentation and structure in CRDs
Signed-off-by: Tomáš Novák <[email protected]>
1 parent 30e77bf commit 454fb67

File tree

6 files changed

+130
-66
lines changed

6 files changed

+130
-66
lines changed

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

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,37 +1310,32 @@ spec:
13101310
fluentBitConfigName:
13111311
description: Fluentbitconfig object associated with this Fluentbit
13121312
type: string
1313-
hostNetwork:
1314-
description: Host networking is requested for this pod. Use the host's
1315-
network namespace. If this option is set, the ports that will be
1316-
used must be specified. Default to false.
1317-
type: boolean
13181313
hostAliases:
1319-
description: HostAliases is an optional list of IPs and hostnames that will
1320-
be injected into the pod's hosts file if specified.
1314+
description: HostAliases is an optional list of IPs and hostnames
1315+
that will be injected into the pod's hosts file if specified.
13211316
items:
1322-
description: HostAlias holds the mapping between IP and hostnames
1317+
description: |-
1318+
HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
1319+
pod's hosts file.
13231320
properties:
1324-
ip:
1325-
description: IP address of the host file entry.
1326-
pattern: "^(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])$"
1327-
type: string
13281321
hostnames:
13291322
description: Hostnames for the above IP address.
13301323
items:
13311324
type: string
1332-
pattern: "^[a-zA-Z0-9.-]+$"
1333-
minItems: 1
13341325
type: array
13351326
x-kubernetes-list-type: atomic
1336-
type: object
1327+
ip:
1328+
description: IP address of the host file entry.
1329+
type: string
13371330
required:
1338-
- ip
1339-
- hostnames
1340-
x-kubernetes-list-map-keys:
13411331
- ip
1342-
x-kubernetes-list-type: map
1332+
type: object
13431333
type: array
1334+
hostNetwork:
1335+
description: Host networking is requested for this pod. Use the host's
1336+
network namespace. If this option is set, the ports that will be
1337+
used must be specified. Default to false.
1338+
type: boolean
13441339
image:
13451340
description: Fluent Bit image.
13461341
type: string

charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2814,30 +2814,25 @@ spec:
28142814
type: object
28152815
type: array
28162816
hostAliases:
2817-
description: HostAliases is an optional list of IPs and hostnames that will
2818-
be injected into the pod's hosts file if specified.
2817+
description: HostAliases is an optional list of IPs and hostnames
2818+
that will be injected into the pod's hosts file if specified.
28192819
items:
2820-
description: HostAlias holds the mapping between IP and hostnames
2820+
description: |-
2821+
HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
2822+
pod's hosts file.
28212823
properties:
2822-
ip:
2823-
description: IP address of the host file entry.
2824-
pattern: "^(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])$"
2825-
type: string
28262824
hostnames:
28272825
description: Hostnames for the above IP address.
28282826
items:
28292827
type: string
2830-
pattern: "^[a-zA-Z0-9.-]+$"
2831-
minItems: 1
28322828
type: array
28332829
x-kubernetes-list-type: atomic
2834-
type: object
2830+
ip:
2831+
description: IP address of the host file entry.
2832+
type: string
28352833
required:
2836-
- ip
2837-
- hostnames
2838-
x-kubernetes-list-map-keys:
28392834
- ip
2840-
x-kubernetes-list-type: map
2835+
type: object
28412836
type: array
28422837
image:
28432838
description: Fluentd image.

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

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1310,37 +1310,32 @@ spec:
13101310
fluentBitConfigName:
13111311
description: Fluentbitconfig object associated with this Fluentbit
13121312
type: string
1313-
hostNetwork:
1314-
description: Host networking is requested for this pod. Use the host's
1315-
network namespace. If this option is set, the ports that will be
1316-
used must be specified. Default to false.
1317-
type: boolean
13181313
hostAliases:
1319-
description: HostAliases is an optional list of IPs and hostnames that will
1320-
be injected into the pod's hosts file if specified.
1314+
description: HostAliases is an optional list of IPs and hostnames
1315+
that will be injected into the pod's hosts file if specified.
13211316
items:
1322-
description: HostAlias holds the mapping between IP and hostnames
1317+
description: |-
1318+
HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
1319+
pod's hosts file.
13231320
properties:
1324-
ip:
1325-
description: IP address of the host file entry.
1326-
pattern: "^(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])$"
1327-
type: string
13281321
hostnames:
13291322
description: Hostnames for the above IP address.
13301323
items:
13311324
type: string
1332-
pattern: "^[a-zA-Z0-9.-]+$"
1333-
minItems: 1
13341325
type: array
13351326
x-kubernetes-list-type: atomic
1336-
type: object
1327+
ip:
1328+
description: IP address of the host file entry.
1329+
type: string
13371330
required:
1338-
- ip
1339-
- hostnames
1340-
x-kubernetes-list-map-keys:
13411331
- ip
1342-
x-kubernetes-list-type: map
1332+
type: object
13431333
type: array
1334+
hostNetwork:
1335+
description: Host networking is requested for this pod. Use the host's
1336+
network namespace. If this option is set, the ports that will be
1337+
used must be specified. Default to false.
1338+
type: boolean
13441339
image:
13451340
description: Fluent Bit image.
13461341
type: string

config/crd/bases/fluentd.fluent.io_fluentds.yaml

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2814,30 +2814,25 @@ spec:
28142814
type: object
28152815
type: array
28162816
hostAliases:
2817-
description: HostAliases is an optional list of IPs and hostnames that will
2818-
be injected into the pod's hosts file if specified.
2817+
description: HostAliases is an optional list of IPs and hostnames
2818+
that will be injected into the pod's hosts file if specified.
28192819
items:
2820-
description: HostAlias holds the mapping between IP and hostnames
2820+
description: |-
2821+
HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
2822+
pod's hosts file.
28212823
properties:
2822-
ip:
2823-
description: IP address of the host file entry.
2824-
pattern: "^(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\\.(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])$"
2825-
type: string
28262824
hostnames:
28272825
description: Hostnames for the above IP address.
28282826
items:
28292827
type: string
2830-
pattern: "^[a-zA-Z0-9.-]+$"
2831-
minItems: 1
28322828
type: array
28332829
x-kubernetes-list-type: atomic
2834-
type: object
2830+
ip:
2831+
description: IP address of the host file entry.
2832+
type: string
28352833
required:
2836-
- ip
2837-
- hostnames
2838-
x-kubernetes-list-map-keys:
28392834
- ip
2840-
x-kubernetes-list-type: map
2835+
type: object
28412836
type: array
28422837
image:
28432838
description: Fluentd image.

manifests/setup/fluent-operator-crd.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17892,6 +17892,27 @@ spec:
1789217892
fluentBitConfigName:
1789317893
description: Fluentbitconfig object associated with this Fluentbit
1789417894
type: string
17895+
hostAliases:
17896+
description: HostAliases is an optional list of IPs and hostnames
17897+
that will be injected into the pod's hosts file if specified.
17898+
items:
17899+
description: |-
17900+
HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
17901+
pod's hosts file.
17902+
properties:
17903+
hostnames:
17904+
description: Hostnames for the above IP address.
17905+
items:
17906+
type: string
17907+
type: array
17908+
x-kubernetes-list-type: atomic
17909+
ip:
17910+
description: IP address of the host file entry.
17911+
type: string
17912+
required:
17913+
- ip
17914+
type: object
17915+
type: array
1789517916
hostNetwork:
1789617917
description: Host networking is requested for this pod. Use the host's
1789717918
network namespace. If this option is set, the ports that will be
@@ -26937,6 +26958,27 @@ spec:
2693726958
type: object
2693826959
type: object
2693926960
type: array
26961+
hostAliases:
26962+
description: HostAliases is an optional list of IPs and hostnames
26963+
that will be injected into the pod's hosts file if specified.
26964+
items:
26965+
description: |-
26966+
HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
26967+
pod's hosts file.
26968+
properties:
26969+
hostnames:
26970+
description: Hostnames for the above IP address.
26971+
items:
26972+
type: string
26973+
type: array
26974+
x-kubernetes-list-type: atomic
26975+
ip:
26976+
description: IP address of the host file entry.
26977+
type: string
26978+
required:
26979+
- ip
26980+
type: object
26981+
type: array
2694026982
image:
2694126983
description: Fluentd image.
2694226984
type: string

manifests/setup/setup.yaml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17892,6 +17892,27 @@ spec:
1789217892
fluentBitConfigName:
1789317893
description: Fluentbitconfig object associated with this Fluentbit
1789417894
type: string
17895+
hostAliases:
17896+
description: HostAliases is an optional list of IPs and hostnames
17897+
that will be injected into the pod's hosts file if specified.
17898+
items:
17899+
description: |-
17900+
HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
17901+
pod's hosts file.
17902+
properties:
17903+
hostnames:
17904+
description: Hostnames for the above IP address.
17905+
items:
17906+
type: string
17907+
type: array
17908+
x-kubernetes-list-type: atomic
17909+
ip:
17910+
description: IP address of the host file entry.
17911+
type: string
17912+
required:
17913+
- ip
17914+
type: object
17915+
type: array
1789517916
hostNetwork:
1789617917
description: Host networking is requested for this pod. Use the host's
1789717918
network namespace. If this option is set, the ports that will be
@@ -26937,6 +26958,27 @@ spec:
2693726958
type: object
2693826959
type: object
2693926960
type: array
26961+
hostAliases:
26962+
description: HostAliases is an optional list of IPs and hostnames
26963+
that will be injected into the pod's hosts file if specified.
26964+
items:
26965+
description: |-
26966+
HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
26967+
pod's hosts file.
26968+
properties:
26969+
hostnames:
26970+
description: Hostnames for the above IP address.
26971+
items:
26972+
type: string
26973+
type: array
26974+
x-kubernetes-list-type: atomic
26975+
ip:
26976+
description: IP address of the host file entry.
26977+
type: string
26978+
required:
26979+
- ip
26980+
type: object
26981+
type: array
2694026982
image:
2694126983
description: Fluentd image.
2694226984
type: string

0 commit comments

Comments
 (0)