feat: allow to set hostNetwork flag for operator

teoincontatto · teoincontatto · commit f6b40b7fb7ef · 2025-02-27T09:51:51.000+01:00
diff --git a/stackgres-k8s/install/helm/stackgres-operator/templates/mutating-webhook-configuration.yaml b/stackgres-k8s/install/helm/stackgres-operator/templates/mutating-webhook-configuration.yaml
@@ -25,7 +25,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/mutation/sgcluster'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -49,7 +49,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/mutation/sgpgconfig'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -73,7 +73,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/mutation/sgpoolconfig'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -97,7 +97,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/mutation/sginstanceprofile'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -121,7 +121,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/mutation/sgbackup'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -145,7 +145,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/mutation/sgdistributedlogs'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -169,7 +169,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/mutation/sgdbops'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -193,7 +193,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/mutation/sgobjectstorage'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -217,7 +217,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/mutation/sgscript'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -241,7 +241,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/mutation/sgshardedcluster'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -265,7 +265,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/mutation/sgshardedbackup'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -289,7 +289,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/mutation/sgshardeddbops'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -313,7 +313,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/mutation/sgstream'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
diff --git a/stackgres-k8s/install/helm/stackgres-operator/templates/operator-deployment.yaml b/stackgres-k8s/install/helm/stackgres-operator/templates/operator-deployment.yaml
@@ -54,6 +54,9 @@ spec:
         fsGroup: 1000
         {{- end }}
         {{- end }}
+      {{- with .Values.operator.hostNetwork }}
+      hostNetwork: {{ . }}
+      {{- end }}
       containers:
       {{- if not (and .Values.developer.externalOperatorIp .Values.developer.externalOperatorPort) }}
       - name: {{ .Release.Name }}
@@ -144,11 +147,11 @@ spec:
           - name: DEBUG_OPERATOR_SUSPEND
             value: "{{ .Values.developer.enableJvmDebugSuspend }}"
           {{- end }}
-          {{- with .Values.operator.internalHttpPort }}
+          {{- with .Values.operator.listenHttpPort }}
           - name: OPERATOR_HTTP_PORT
             value: {{ . }}
           {{- end }}
-          {{- with .Values.operator.internalHttpsPort }}
+          {{- with .Values.operator.listenHttpsPort }}
           - name: OPERATOR_HTTPS_PORT
             value: {{ . }}
           {{- end }}
diff --git a/stackgres-k8s/install/helm/stackgres-operator/templates/operator-service.yaml b/stackgres-k8s/install/helm/stackgres-operator/templates/operator-service.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
     - name: https
       protocol: TCP
-      port: {{ .Values.operator.port }}
+      port: {{ .Values.operator.servicePort }}
       targetPort: https
 {{ else }}
 apiVersion: v1
@@ -25,7 +25,7 @@ metadata:
   name: {{ .Release.Name }}
 spec:
   ports:
-   - port: {{ .Values.operator.port }}
+   - port: {{ .Values.operator.servicePort }}
      targetPort: {{ .Values.developer.externalOperatorPort }}
 ---
 kind: Endpoints
diff --git a/stackgres-k8s/install/helm/stackgres-operator/templates/validating-webhook-configuration.yaml b/stackgres-k8s/install/helm/stackgres-operator/templates/validating-webhook-configuration.yaml
@@ -25,7 +25,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/validation/sgcluster'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -49,7 +49,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/validation/sgpgconfig'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -73,7 +73,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/validation/sgpoolconfig'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -97,7 +97,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/validation/sginstanceprofile'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -121,7 +121,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/validation/sgbackup'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -145,7 +145,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/validation/sgdistributedlogs'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -169,7 +169,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/validation/sgdbops'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -193,7 +193,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/validation/sgobjectstorage'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -217,7 +217,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/validation/sgscript'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -241,7 +241,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/validation/sgshardedcluster'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -265,7 +265,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/validation/sgshardedbackup'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -289,7 +289,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/validation/sgshardeddbops'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
@@ -313,7 +313,7 @@ webhooks:
         namespace: {{ .Release.Namespace }}
         name: {{ .Release.Name }}
         path: '/stackgres/validation/sgstream'
-        port: {{ .Values.operator.port }}
+        port: {{ .Values.operator.servicePort }}
     admissionReviewVersions: ["v1"]
     {{- if .Values.allowedNamespaces }}
     namespaceSelector:
diff --git a/stackgres-k8s/install/helm/stackgres-operator/values.yaml b/stackgres-k8s/install/helm/stackgres-operator/values.yaml
@@ -43,10 +43,14 @@ operator:
   service:
     # -- Section to configure Operator Service annotations
     annotations: {}
-  # Section to configure Operator port
-  # port: 443
-  # internalHttpPort: 8080
-  # internalHttpsPort: 8443
+  # -- Operator Service port
+  # servicePort: 443
+  # -- Operator listening port for HTTP
+  # listenHttpPort: 8080
+  # -- Operator listening port for HTTPS
+  # listenHttpsPort: 8443
+  # -- Operator hostNetwork flag
+  # hostNetwork: false
 
 # Section to configure REST API Pod
 restapi:
diff --git a/stackgres-k8s/src/common/src/main/resources/crds/SGConfig.yaml b/stackgres-k8s/src/common/src/main/resources/crds/SGConfig.yaml
@@ -265,6 +265,13 @@ spec:
 
                       > This value can only be set in operator helm chart or with the environment variable `OPERATOR_HTTPS_PORT`.
                     default: 8443
+                  hostNetwork:
+                    type: boolean
+                    description: |
+                      Host networking 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.
+
+                      > This value can only be set in operator helm chart.
+                    default: false
               restapi:
                 type: object
                 description: Section to configure REST API Pod
