feat: autogenerate HostAliases documentation and structure in CRDs

Signed-off-by: Tomáš Novák <[email protected]>
fluent · Nov 23, 2024 · 454fb67 · 454fb67
1 parent 30e77bf
commit 454fb67
Show file tree

Hide file tree

Showing 6 changed files with 130 additions and 66 deletions.
diff --git a/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml b/charts/fluent-operator/charts/fluent-bit-crds/crds/fluentbit.fluent.io_fluentbits.yaml
@@ -1310,37 +1310,32 @@ spec:
               fluentBitConfigName:
                 description: Fluentbitconfig object associated with this Fluentbit
                 type: string
-              hostNetwork:
-                description: Host networking is requested for this pod. Use the host's
-                  network namespace. If this option is set, the ports that will be
-                  used must be specified. Default to false.
-                type: boolean
               hostAliases:
-                description: HostAliases is an optional list of IPs and hostnames that will
-                  be injected into the pod's hosts file if specified.
+                description: HostAliases is an optional list of IPs and hostnames
+                  that will be injected into the pod's hosts file if specified.
                 items:
-                  description: HostAlias holds the mapping between IP and hostnames
+                  description: |-
+                    HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
+                    pod's hosts file.
                   properties:
-                    ip:
-                      description: IP address of the host file entry.
-                      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])$"
-                      type: string
                     hostnames:
                       description: Hostnames for the above IP address.
                       items:
                         type: string
-                        pattern: "^[a-zA-Z0-9.-]+$"
-                      minItems: 1
                       type: array
                       x-kubernetes-list-type: atomic
-                  type: object
+                    ip:
+                      description: IP address of the host file entry.
+                      type: string
                   required:
-                    - ip
-                    - hostnames
-                  x-kubernetes-list-map-keys:
                   - ip
-                  x-kubernetes-list-type: map
+                  type: object
                 type: array
+              hostNetwork:
+                description: Host networking is requested for this pod. Use the host's
+                  network namespace. If this option is set, the ports that will be
+                  used must be specified. Default to false.
+                type: boolean
               image:
                 description: Fluent Bit image.
                 type: string

diff --git a/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml b/charts/fluent-operator/charts/fluentd-crds/crds/fluentd.fluent.io_fluentds.yaml
@@ -2814,30 +2814,25 @@ spec:
                   type: object
                 type: array
               hostAliases:
-                description: HostAliases is an optional list of IPs and hostnames that will
-                  be injected into the pod's hosts file if specified.
+                description: HostAliases is an optional list of IPs and hostnames
+                  that will be injected into the pod's hosts file if specified.
                 items:
-                  description: HostAlias holds the mapping between IP and hostnames
+                  description: |-
+                    HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
+                    pod's hosts file.
                   properties:
-                    ip:
-                      description: IP address of the host file entry.
-                      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])$"
-                      type: string
                     hostnames:
                       description: Hostnames for the above IP address.
                       items:
                         type: string
-                        pattern: "^[a-zA-Z0-9.-]+$"
-                      minItems: 1
                       type: array
                       x-kubernetes-list-type: atomic
-                  type: object
+                    ip:
+                      description: IP address of the host file entry.
+                      type: string
                   required:
-                    - ip
-                    - hostnames
-                  x-kubernetes-list-map-keys:
                   - ip
-                  x-kubernetes-list-type: map
+                  type: object
                 type: array
               image:
                 description: Fluentd image.

diff --git a/config/crd/bases/fluentbit.fluent.io_fluentbits.yaml b/config/crd/bases/fluentbit.fluent.io_fluentbits.yaml
@@ -1310,37 +1310,32 @@ spec:
               fluentBitConfigName:
                 description: Fluentbitconfig object associated with this Fluentbit
                 type: string
-              hostNetwork:
-                description: Host networking is requested for this pod. Use the host's
-                  network namespace. If this option is set, the ports that will be
-                  used must be specified. Default to false.
-                type: boolean
               hostAliases:
-                description: HostAliases is an optional list of IPs and hostnames that will
-                  be injected into the pod's hosts file if specified.
+                description: HostAliases is an optional list of IPs and hostnames
+                  that will be injected into the pod's hosts file if specified.
                 items:
-                  description: HostAlias holds the mapping between IP and hostnames
+                  description: |-
+                    HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
+                    pod's hosts file.
                   properties:
-                    ip:
-                      description: IP address of the host file entry.
-                      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])$"
-                      type: string
                     hostnames:
                       description: Hostnames for the above IP address.
                       items:
                         type: string
-                        pattern: "^[a-zA-Z0-9.-]+$"
-                      minItems: 1
                       type: array
                       x-kubernetes-list-type: atomic
-                  type: object
+                    ip:
+                      description: IP address of the host file entry.
+                      type: string
                   required:
-                    - ip
-                    - hostnames
-                  x-kubernetes-list-map-keys:
                   - ip
-                  x-kubernetes-list-type: map
+                  type: object
                 type: array
+              hostNetwork:
+                description: Host networking is requested for this pod. Use the host's
+                  network namespace. If this option is set, the ports that will be
+                  used must be specified. Default to false.
+                type: boolean
               image:
                 description: Fluent Bit image.
                 type: string

diff --git a/config/crd/bases/fluentd.fluent.io_fluentds.yaml b/config/crd/bases/fluentd.fluent.io_fluentds.yaml
@@ -2814,30 +2814,25 @@ spec:
                   type: object
                 type: array
               hostAliases:
-                description: HostAliases is an optional list of IPs and hostnames that will
-                  be injected into the pod's hosts file if specified.
+                description: HostAliases is an optional list of IPs and hostnames
+                  that will be injected into the pod's hosts file if specified.
                 items:
-                  description: HostAlias holds the mapping between IP and hostnames
+                  description: |-
+                    HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
+                    pod's hosts file.
                   properties:
-                    ip:
-                      description: IP address of the host file entry.
-                      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])$"
-                      type: string
                     hostnames:
                       description: Hostnames for the above IP address.
                       items:
                         type: string
-                        pattern: "^[a-zA-Z0-9.-]+$"
-                      minItems: 1
                       type: array
                       x-kubernetes-list-type: atomic
-                  type: object
+                    ip:
+                      description: IP address of the host file entry.
+                      type: string
                   required:
-                    - ip
-                    - hostnames
-                  x-kubernetes-list-map-keys:
                   - ip
-                  x-kubernetes-list-type: map
+                  type: object
                 type: array
               image:
                 description: Fluentd image.

diff --git a/manifests/setup/fluent-operator-crd.yaml b/manifests/setup/fluent-operator-crd.yaml
@@ -17892,6 +17892,27 @@ spec:
               fluentBitConfigName:
                 description: Fluentbitconfig object associated with this Fluentbit
                 type: string
+              hostAliases:
+                description: HostAliases is an optional list of IPs and hostnames
+                  that will be injected into the pod's hosts file if specified.
+                items:
+                  description: |-
+                    HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
+                    pod's hosts file.
+                  properties:
+                    hostnames:
+                      description: Hostnames for the above IP address.
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    ip:
+                      description: IP address of the host file entry.
+                      type: string
+                  required:
+                  - ip
+                  type: object
+                type: array
               hostNetwork:
                 description: Host networking is requested for this pod. Use the host's
                   network namespace. If this option is set, the ports that will be
@@ -26937,6 +26958,27 @@ spec:
                       type: object
                   type: object
                 type: array
+              hostAliases:
+                description: HostAliases is an optional list of IPs and hostnames
+                  that will be injected into the pod's hosts file if specified.
+                items:
+                  description: |-
+                    HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
+                    pod's hosts file.
+                  properties:
+                    hostnames:
+                      description: Hostnames for the above IP address.
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    ip:
+                      description: IP address of the host file entry.
+                      type: string
+                  required:
+                  - ip
+                  type: object
+                type: array
               image:
                 description: Fluentd image.
                 type: string

diff --git a/manifests/setup/setup.yaml b/manifests/setup/setup.yaml
@@ -17892,6 +17892,27 @@ spec:
               fluentBitConfigName:
                 description: Fluentbitconfig object associated with this Fluentbit
                 type: string
+              hostAliases:
+                description: HostAliases is an optional list of IPs and hostnames
+                  that will be injected into the pod's hosts file if specified.
+                items:
+                  description: |-
+                    HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
+                    pod's hosts file.
+                  properties:
+                    hostnames:
+                      description: Hostnames for the above IP address.
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    ip:
+                      description: IP address of the host file entry.
+                      type: string
+                  required:
+                  - ip
+                  type: object
+                type: array
               hostNetwork:
                 description: Host networking is requested for this pod. Use the host's
                   network namespace. If this option is set, the ports that will be
@@ -26937,6 +26958,27 @@ spec:
                       type: object
                   type: object
                 type: array
+              hostAliases:
+                description: HostAliases is an optional list of IPs and hostnames
+                  that will be injected into the pod's hosts file if specified.
+                items:
+                  description: |-
+                    HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the
+                    pod's hosts file.
+                  properties:
+                    hostnames:
+                      description: Hostnames for the above IP address.
+                      items:
+                        type: string
+                      type: array
+                      x-kubernetes-list-type: atomic
+                    ip:
+                      description: IP address of the host file entry.
+                      type: string
+                  required:
+                  - ip
+                  type: object
+                type: array
               image:
                 description: Fluentd image.
                 type: string