From 70340a5678b665ed283ca5c77b13959a1642a7c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Marchand?= Date: Mon, 11 Dec 2023 14:52:26 +0100 Subject: [PATCH 1/3] Add dnsConfig support for admin MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Frédéric Marchand --- mailu/templates/admin/deployment.yaml | 6 ++++++ mailu/values.yaml | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/mailu/templates/admin/deployment.yaml b/mailu/templates/admin/deployment.yaml index 9c44c6bf..76828d94 100644 --- a/mailu/templates/admin/deployment.yaml +++ b/mailu/templates/admin/deployment.yaml @@ -57,6 +57,12 @@ spec: {{- if .Values.admin.terminationGracePeriodSeconds }} terminationGracePeriodSeconds: {{ .Values.admin.terminationGracePeriodSeconds }} {{- end }} + {{- if .Values.admin.dnsPolicy }} + dnsPolicy: {{ .Values.admin.dnsPolicy | quote }} + {{- end }} + {{- if .Values.admin.dnsConfig }} + dnsConfig: {{- include "common.tplvalues.render" (dict "value" .Values.admin.dnsConfig "context" $) | nindent 8 }} + {{- end }} {{- if .Values.admin.initContainers }} initContainers: {{- include "common.tplvalues.render" (dict "value" .Values.admin.initContainers "context" $) | nindent 8 }} {{- end }} diff --git a/mailu/values.yaml b/mailu/values.yaml index f690cf7a..f8944635 100644 --- a/mailu/values.yaml +++ b/mailu/values.yaml @@ -1047,6 +1047,14 @@ admin: ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods terminationGracePeriodSeconds: 2 + ## @param front.dnsPolicy DNS Policy of the front pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy + dnsPolicy: "" + + ## @param front.dnsConfig DNS settings for the front pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config + dnsConfig: {} + ## @param admin.affinity Affinity for admin pod assignment ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity affinity: {} From 62bb789b5c00dd8f45c8ba8ffa558b1a2329a050 Mon Sep 17 00:00:00 2001 From: fastlorenzo Date: Mon, 23 Dec 2024 00:53:51 +0100 Subject: [PATCH 2/3] fix typo Signed-off-by: fastlorenzo --- mailu/README.md | 118 +++++++++++++++++++++++----------------------- mailu/values.yaml | 4 +- 2 files changed, 62 insertions(+), 60 deletions(-) diff --git a/mailu/README.md b/mailu/README.md index 06d2937a..d13f2187 100644 --- a/mailu/README.md +++ b/mailu/README.md @@ -383,64 +383,66 @@ Check that the deployed pods are all running. ### Admin parameters -| Name | Description | Value | -| --------------------------------------------- | ------------------------------------------------------------------------------------- | ------------------- | -| `admin.enabled` | Enable access to the admin interface | `true` | -| `admin.uri` | URI to access the admin interface | `/admin` | -| `admin.logLevel` | Override default log level | `""` | -| `admin.image.repository` | Pod image repository | `mailu/admin` | -| `admin.image.tag` | Pod image tag (defaults to mailuVersion if set, otherwise Chart.AppVersion) | `""` | -| `admin.image.pullPolicy` | Pod image pull policy | `IfNotPresent` | -| `admin.persistence.size` | Pod pvc size | `20Gi` | -| `admin.persistence.storageClass` | Pod pvc storage class | `""` | -| `admin.persistence.accessModes` | Pod pvc access modes | `["ReadWriteOnce"]` | -| `admin.persistence.claimNameOverride` | Pod pvc name override | `""` | -| `admin.persistence.annotations` | Pod pvc annotations | `{}` | -| `admin.resources.limits` | The resources limits for the container | `{}` | -| `admin.resources.requests` | The requested resources for the container | `{}` | -| `admin.livenessProbe.enabled` | Enable livenessProbe | `true` | -| `admin.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `3` | -| `admin.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `10` | -| `admin.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` | -| `admin.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | -| `admin.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `1` | -| `admin.readinessProbe.enabled` | Enable readinessProbe | `true` | -| `admin.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `10` | -| `admin.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `10` | -| `admin.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `1` | -| `admin.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `3` | -| `admin.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | -| `admin.startupProbe.enabled` | Enable startupProbe | `false` | -| `admin.startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `10` | -| `admin.startupProbe.periodSeconds` | Period seconds for startupProbe | `10` | -| `admin.startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `1` | -| `admin.startupProbe.failureThreshold` | Failure threshold for startupProbe | `3` | -| `admin.startupProbe.successThreshold` | Success threshold for startupProbe | `1` | -| `admin.podLabels` | Add extra labels to pod | `{}` | -| `admin.podAnnotations` | Add extra annotations to the pod | `{}` | -| `admin.nodeSelector` | Node labels selector for pod assignment | `{}` | -| `admin.initContainers` | Add additional init containers to the pod | `[]` | -| `admin.priorityClassName` | Pods' priorityClassName | `""` | -| `admin.podSecurityContext.enabled` | Enabled pods' Security Context | `false` | -| `admin.podSecurityContext.fsGroup` | Set pods' Security Context fsGroup | `1001` | -| `admin.containerSecurityContext.enabled` | Enabled containers' Security Context | `false` | -| `admin.containerSecurityContext.runAsUser` | Set containers' Security Context runAsUser | `1001` | -| `admin.containerSecurityContext.runAsNonRoot` | Set container's Security Context runAsNonRoot | `false` | -| `admin.terminationGracePeriodSeconds` | In seconds, time given to the pod to terminate gracefully | `2` | -| `admin.affinity` | Affinity for admin pod assignment | `{}` | -| `admin.tolerations` | Tolerations for pod assignment | `[]` | -| `admin.revisionHistoryLimit` | Configure the revisionHistoryLimit of the deployment | `3` | -| `admin.hostAliases` | Pod pod host aliases | `[]` | -| `admin.schedulerName` | Name of the k8s scheduler (other than default) | `""` | -| `admin.service.annotations` | Admin service annotations | `{}` | -| `admin.topologySpreadConstraints` | Topology Spread Constraints for pod assignment | `[]` | -| `admin.updateStrategy.type` | Can be set to RollingUpdate or OnDelete | `RollingUpdate` | -| `admin.extraEnvVars` | Extra environment variable to pass to the running container | `[]` | -| `admin.extraEnvVarsCM` | Name of existing ConfigMap containing extra environment variables to mount in the pod | `""` | -| `admin.extraEnvVarsSecret` | Name of existing Secret containing extra environment variables to mount in the pod | `""` | -| `admin.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the pod | `[]` | -| `admin.extraVolumes` | Optionally specify extra list of additional volumes for the pod(s) | `[]` | -| `admin.extraContainers` | Add additional containers to the pod | `[]` | +| Name | Description | Value | +| --------------------------------------------- | --------------------------------------------------------------------------------------------- | ------------------- | +| `admin.enabled` | Enable access to the admin interface | `true` | +| `admin.uri` | URI to access the admin interface | `/admin` | +| `admin.logLevel` | Override default log level | `""` | +| `admin.image.repository` | Pod image repository | `mailu/admin` | +| `admin.image.tag` | Pod image tag (defaults to mailuVersion if set, otherwise Chart.AppVersion) | `""` | +| `admin.image.pullPolicy` | Pod image pull policy | `IfNotPresent` | +| `admin.persistence.size` | Pod pvc size | `20Gi` | +| `admin.persistence.storageClass` | Pod pvc storage class | `""` | +| `admin.persistence.accessModes` | Pod pvc access modes | `["ReadWriteOnce"]` | +| `admin.persistence.claimNameOverride` | Pod pvc name override | `""` | +| `admin.persistence.annotations` | Pod pvc annotations | `{}` | +| `admin.resources.limits` | The resources limits for the container | `{}` | +| `admin.resources.requests` | The requested resources for the container | `{}` | +| `admin.livenessProbe.enabled` | Enable livenessProbe | `true` | +| `admin.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `3` | +| `admin.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `10` | +| `admin.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` | +| `admin.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | +| `admin.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `1` | +| `admin.readinessProbe.enabled` | Enable readinessProbe | `true` | +| `admin.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `10` | +| `admin.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `10` | +| `admin.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `1` | +| `admin.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `3` | +| `admin.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | +| `admin.startupProbe.enabled` | Enable startupProbe | `false` | +| `admin.startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `10` | +| `admin.startupProbe.periodSeconds` | Period seconds for startupProbe | `10` | +| `admin.startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `1` | +| `admin.startupProbe.failureThreshold` | Failure threshold for startupProbe | `3` | +| `admin.startupProbe.successThreshold` | Success threshold for startupProbe | `1` | +| `admin.podLabels` | Add extra labels to pod | `{}` | +| `admin.podAnnotations` | Add extra annotations to the pod | `{}` | +| `admin.nodeSelector` | Node labels selector for pod assignment | `{}` | +| `admin.initContainers` | Add additional init containers to the pod | `[]` | +| `admin.priorityClassName` | Pods' priorityClassName | `""` | +| `admin.podSecurityContext.enabled` | Enabled pods' Security Context | `false` | +| `admin.podSecurityContext.fsGroup` | Set pods' Security Context fsGroup | `1001` | +| `admin.containerSecurityContext.enabled` | Enabled containers' Security Context | `false` | +| `admin.containerSecurityContext.runAsUser` | Set containers' Security Context runAsUser | `1001` | +| `admin.containerSecurityContext.runAsNonRoot` | Set container's Security Context runAsNonRoot | `false` | +| `admin.terminationGracePeriodSeconds` | In seconds, time given to the pod to terminate gracefully | `2` | +| `admin.dnsPolicy` | DNS Policy of the front pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) | `""` | +| `admin.dnsConfig` | DNS settings for the front pod | `{}` | +| `admin.affinity` | Affinity for admin pod assignment | `{}` | +| `admin.tolerations` | Tolerations for pod assignment | `[]` | +| `admin.revisionHistoryLimit` | Configure the revisionHistoryLimit of the deployment | `3` | +| `admin.hostAliases` | Pod pod host aliases | `[]` | +| `admin.schedulerName` | Name of the k8s scheduler (other than default) | `""` | +| `admin.service.annotations` | Admin service annotations | `{}` | +| `admin.topologySpreadConstraints` | Topology Spread Constraints for pod assignment | `[]` | +| `admin.updateStrategy.type` | Can be set to RollingUpdate or OnDelete | `RollingUpdate` | +| `admin.extraEnvVars` | Extra environment variable to pass to the running container | `[]` | +| `admin.extraEnvVarsCM` | Name of existing ConfigMap containing extra environment variables to mount in the pod | `""` | +| `admin.extraEnvVarsSecret` | Name of existing Secret containing extra environment variables to mount in the pod | `""` | +| `admin.extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for the pod | `[]` | +| `admin.extraVolumes` | Optionally specify extra list of additional volumes for the pod(s) | `[]` | +| `admin.extraContainers` | Add additional containers to the pod | `[]` | ### Redis parameters diff --git a/mailu/values.yaml b/mailu/values.yaml index f8944635..bce4024e 100644 --- a/mailu/values.yaml +++ b/mailu/values.yaml @@ -1047,11 +1047,11 @@ admin: ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods terminationGracePeriodSeconds: 2 - ## @param front.dnsPolicy DNS Policy of the front pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) + ## @param admin.dnsPolicy DNS Policy of the front pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy dnsPolicy: "" - ## @param front.dnsConfig DNS settings for the front pod + ## @param admin.dnsConfig DNS settings for the front pod ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config dnsConfig: {} From 59ed0ef88debd3f4b6b07cece81269deec760400 Mon Sep 17 00:00:00 2001 From: fastlorenzo Date: Mon, 23 Dec 2024 00:55:22 +0100 Subject: [PATCH 3/3] fix typo Signed-off-by: fastlorenzo --- mailu/README.md | 4 ++-- mailu/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mailu/README.md b/mailu/README.md index d13f2187..f67ce945 100644 --- a/mailu/README.md +++ b/mailu/README.md @@ -427,8 +427,8 @@ Check that the deployed pods are all running. | `admin.containerSecurityContext.runAsUser` | Set containers' Security Context runAsUser | `1001` | | `admin.containerSecurityContext.runAsNonRoot` | Set container's Security Context runAsNonRoot | `false` | | `admin.terminationGracePeriodSeconds` | In seconds, time given to the pod to terminate gracefully | `2` | -| `admin.dnsPolicy` | DNS Policy of the front pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) | `""` | -| `admin.dnsConfig` | DNS settings for the front pod | `{}` | +| `admin.dnsPolicy` | DNS Policy of the admin pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) | `""` | +| `admin.dnsConfig` | DNS settings for the admin pod | `{}` | | `admin.affinity` | Affinity for admin pod assignment | `{}` | | `admin.tolerations` | Tolerations for pod assignment | `[]` | | `admin.revisionHistoryLimit` | Configure the revisionHistoryLimit of the deployment | `3` | diff --git a/mailu/values.yaml b/mailu/values.yaml index bce4024e..007c196b 100644 --- a/mailu/values.yaml +++ b/mailu/values.yaml @@ -1047,11 +1047,11 @@ admin: ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods terminationGracePeriodSeconds: 2 - ## @param admin.dnsPolicy DNS Policy of the front pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) + ## @param admin.dnsPolicy DNS Policy of the admin pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy dnsPolicy: "" - ## @param admin.dnsConfig DNS settings for the front pod + ## @param admin.dnsConfig DNS settings for the admin pod ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config dnsConfig: {}