SetHostnameAsFQDN option is added to all components. Default is true (y…

…tsaurus#302) * SetHostnameAsFQDN option is added to all components. Default is true * SetHostnameAsFQDN is true by default and the value is getting from instanceSpec in one place in server.go * forgot lint-generated
leo-astorsky · Aug 13, 2024 · 88af2c9 · 88af2c9
1 parent 08a4e79
commit 88af2c9
Show file tree

Hide file tree

Showing 10 changed files with 196 additions and 1 deletion.
diff --git a/api/v1/ytsaurus_types.go b/api/v1/ytsaurus_types.go
@@ -263,6 +263,9 @@ type InstanceSpec struct {
 	Tolerations       []corev1.Toleration    `json:"tolerations,omitempty"`
 	PodLabels         map[string]string      `json:"podLabels,omitempty"`
 	PodAnnotations    map[string]string      `json:"podAnnotations,omitempty"`
+	// SetHostnameAsFQDN indicates whether to set the hostname as FQDN.
+	//+kubebuilder:default:=true
+	SetHostnameAsFQDN *bool `json:"setHostnameAsFqdn,omitempty"`
 	// Component config for native RPC bus transport.
 	//+optional
 	NativeTransport *RPCTransportSpec `json:"nativeTransport,omitempty"`

diff --git a/api/v1/zz_generated.deepcopy.go b/api/v1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/cluster.ytsaurus.tech_remoteexecnodes.yaml b/config/crd/bases/cluster.ytsaurus.tech_remoteexecnodes.yaml
@@ -1115,6 +1115,11 @@ spec:
                 type: object
               runtimeClassName:
                 type: string
+              setHostnameAsFqdn:
+                default: true
+                description: SetHostnameAsFQDN indicates whether to set the hostname
+                  as FQDN.
+                type: boolean
               sidecars:
                 description: List of sidecar containers as yaml of core/v1 Container.
                 items:

diff --git a/config/crd/bases/cluster.ytsaurus.tech_remoteytsaurus.yaml b/config/crd/bases/cluster.ytsaurus.tech_remoteytsaurus.yaml
@@ -868,6 +868,11 @@ spec:
                 type: object
               runtimeClassName:
                 type: string
+              setHostnameAsFqdn:
+                default: true
+                description: SetHostnameAsFQDN indicates whether to set the hostname
+                  as FQDN.
+                type: boolean
               structuredLoggers:
                 items:
                   properties:

diff --git a/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml b/config/crd/bases/cluster.ytsaurus.tech_ytsaurus.yaml
@@ -986,6 +986,11 @@ spec:
                     type: object
                   runtimeClassName:
                     type: string
+                  setHostnameAsFqdn:
+                    default: true
+                    description: SetHostnameAsFQDN indicates whether to set the hostname
+                      as FQDN.
+                    type: boolean
                   structuredLoggers:
                     items:
                       properties:
@@ -3368,6 +3373,11 @@ spec:
                       type: object
                     runtimeClassName:
                       type: string
+                    setHostnameAsFqdn:
+                      default: true
+                      description: SetHostnameAsFQDN indicates whether to set the
+                        hostname as FQDN.
+                      type: boolean
                     structuredLoggers:
                       items:
                         properties:
@@ -5748,6 +5758,11 @@ spec:
                     type: object
                   runtimeClassName:
                     type: string
+                  setHostnameAsFqdn:
+                    default: true
+                    description: SetHostnameAsFQDN indicates whether to set the hostname
+                      as FQDN.
+                    type: boolean
                   structuredLoggers:
                     items:
                       properties:
@@ -8319,6 +8334,11 @@ spec:
                       type: object
                     runtimeClassName:
                       type: string
+                    setHostnameAsFqdn:
+                      default: true
+                      description: SetHostnameAsFQDN indicates whether to set the
+                        hostname as FQDN.
+                      type: boolean
                     sidecars:
                       description: List of sidecar containers as yaml of core/v1 Container.
                       items:
@@ -10736,6 +10756,11 @@ spec:
                       description: Service Type string describes ingress methods for
                         a service
                       type: string
+                    setHostnameAsFqdn:
+                      default: true
+                      description: SetHostnameAsFQDN indicates whether to set the
+                        hostname as FQDN.
+                      type: boolean
                     structuredLoggers:
                       items:
                         properties:
@@ -13157,6 +13182,11 @@ spec:
                     type: object
                   runtimeClassName:
                     type: string
+                  setHostnameAsFqdn:
+                    default: true
+                    description: SetHostnameAsFQDN indicates whether to set the hostname
+                      as FQDN.
+                    type: boolean
                   structuredLoggers:
                     items:
                       properties:
@@ -15584,6 +15614,11 @@ spec:
                     type: object
                   runtimeClassName:
                     type: string
+                  setHostnameAsFqdn:
+                    default: true
+                    description: SetHostnameAsFQDN indicates whether to set the hostname
+                      as FQDN.
+                    type: boolean
                   sidecars:
                     description: List of sidecar containers as yaml of core/v1 Container.
                     items:
@@ -17957,6 +17992,11 @@ spec:
                     type: object
                   runtimeClassName:
                     type: string
+                  setHostnameAsFqdn:
+                    default: true
+                    description: SetHostnameAsFQDN indicates whether to set the hostname
+                      as FQDN.
+                    type: boolean
                   structuredLoggers:
                     items:
                       properties:
@@ -20323,6 +20363,11 @@ spec:
                     type: object
                   runtimeClassName:
                     type: string
+                  setHostnameAsFqdn:
+                    default: true
+                    description: SetHostnameAsFQDN indicates whether to set the hostname
+                      as FQDN.
+                    type: boolean
                   structuredLoggers:
                     items:
                       properties:
@@ -22707,6 +22752,11 @@ spec:
                       description: Service Type string describes ingress methods for
                         a service
                       type: string
+                    setHostnameAsFqdn:
+                      default: true
+                      description: SetHostnameAsFQDN indicates whether to set the
+                        hostname as FQDN.
+                      type: boolean
                     structuredLoggers:
                       items:
                         properties:
@@ -25105,6 +25155,11 @@ spec:
                     type: object
                   runtimeClassName:
                     type: string
+                  setHostnameAsFqdn:
+                    default: true
+                    description: SetHostnameAsFQDN indicates whether to set the hostname
+                      as FQDN.
+                    type: boolean
                   structuredLoggers:
                     items:
                       properties:
@@ -27490,6 +27545,11 @@ spec:
                       type: object
                     runtimeClassName:
                       type: string
+                    setHostnameAsFqdn:
+                      default: true
+                      description: SetHostnameAsFQDN indicates whether to set the
+                        hostname as FQDN.
+                      type: boolean
                     sidecars:
                       description: List of sidecar containers as yaml of core/v1 Container.
                       items:
@@ -29939,6 +29999,11 @@ spec:
                       type: object
                     runtimeClassName:
                       type: string
+                    setHostnameAsFqdn:
+                      default: true
+                      description: SetHostnameAsFQDN indicates whether to set the
+                        hostname as FQDN.
+                      type: boolean
                     structuredLoggers:
                       items:
                         properties:
@@ -32342,6 +32407,11 @@ spec:
                       description: Service Type string describes ingress methods for
                         a service
                       type: string
+                    setHostnameAsFqdn:
+                      default: true
+                      description: SetHostnameAsFQDN indicates whether to set the
+                        hostname as FQDN.
+                      type: boolean
                     structuredLoggers:
                       items:
                         properties:
@@ -34920,6 +34990,11 @@ spec:
                     type: object
                   runtimeClassName:
                     type: string
+                  setHostnameAsFqdn:
+                    default: true
+                    description: SetHostnameAsFQDN indicates whether to set the hostname
+                      as FQDN.
+                    type: boolean
                   structuredLoggers:
                     items:
                       properties:

diff --git a/docs/api.md b/docs/api.md
@@ -283,6 +283,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 
 
@@ -320,6 +321,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 | `tags` _string array_ | List of the node tags. |  |  |
 | `rack` _string_ | Name of the node rack. |  |  |
@@ -377,6 +379,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 
 
@@ -468,6 +471,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 | `tags` _string array_ | List of the node tags. |  |  |
 | `rack` _string_ | Name of the node rack. |  |  |
@@ -514,6 +518,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 | `serviceType` _[ServiceType](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#servicetype-v1-core)_ |  | NodePort |  |
 | `httpNodePort` _integer_ |  |  |  |
@@ -624,6 +629,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 
 
@@ -828,6 +834,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 | `cellTagMasterCaches` _integer_ |  |  |  |
 | `hostAddressesMasterCaches` _string array_ |  |  |  |
@@ -886,6 +893,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 | `cellTag` _integer_ |  |  |  |
 | `hostAddresses` _string array_ |  |  |  |
@@ -966,6 +974,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 
 
@@ -1003,6 +1012,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 
 
@@ -1040,6 +1050,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 | `serviceType` _[ServiceType](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#servicetype-v1-core)_ |  |  |  |
 | `nodePort` _integer_ |  |  |  |
@@ -1152,6 +1163,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 | `tags` _string array_ | List of the node tags. |  |  |
 | `rack` _string_ | Name of the node rack. |  |  |
@@ -1220,6 +1232,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 | `cellTagMasterCaches` _integer_ |  |  |  |
 | `hostAddressesMasterCaches` _string array_ |  |  |  |
@@ -1262,6 +1275,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 
 
@@ -1392,6 +1406,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 | `serviceType` _[ServiceType](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#servicetype-v1-core)_ |  |  |  |
 | `minPort` _integer_ |  | 32000 |  |
@@ -1450,6 +1465,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 | `tags` _string array_ | List of the node tags. |  |  |
 | `rack` _string_ | Name of the node rack. |  |  |
@@ -1616,6 +1632,7 @@ _Appears in:_
 | `tolerations` _[Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.28/#toleration-v1-core) array_ |  |  |  |
 | `podLabels` _object (keys:string, values:string)_ |  |  |  |
 | `podAnnotations` _object (keys:string, values:string)_ |  |  |  |
+| `setHostnameAsFqdn` _boolean_ | SetHostnameAsFQDN indicates whether to set the hostname as FQDN. | true |  |
 | `nativeTransport` _[RPCTransportSpec](#rpctransportspec)_ | Component config for native RPC bus transport. |  |  |
 
 

diff --git a/pkg/components/server.go b/pkg/components/server.go
@@ -302,7 +302,7 @@ func (s *serverImpl) rebuildStatefulSet() *appsv1.StatefulSet {
 	statefulSet.Spec.Template.Spec = corev1.PodSpec{
 		RuntimeClassName:   s.instanceSpec.RuntimeClassName,
 		ImagePullSecrets:   s.commonSpec.ImagePullSecrets,
-		SetHostnameAsFQDN:  ptr.Bool(true),
+		SetHostnameAsFQDN:  s.instanceSpec.SetHostnameAsFQDN,
 		EnableServiceLinks: ptr.Bool(false),
 		Containers: []corev1.Container{
 			{