From a439151862df881fa2a3c2458237c6d9b602fc07 Mon Sep 17 00:00:00 2001 From: mprudnikov Date: Thu, 26 Dec 2024 16:41:41 +0700 Subject: [PATCH 1/3] =?UTF-8?q?[Navi]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC?= =?UTF-8?q?=D0=B5=D1=82=D1=80=D0=B0=20$enableServiceLinks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- charts/navi-castle/README.md | 27 ++++++++++--------- charts/navi-castle/templates/statefulset.yaml | 1 + charts/navi-castle/values.yaml | 2 ++ charts/navi-front/README.md | 27 ++++++++++--------- charts/navi-front/templates/deployment.yaml | 1 + charts/navi-front/values.yaml | 2 ++ 6 files changed, 34 insertions(+), 26 deletions(-) diff --git a/charts/navi-castle/README.md b/charts/navi-castle/README.md index 9145e9a79..d2162f6aa 100644 --- a/charts/navi-castle/README.md +++ b/charts/navi-castle/README.md @@ -50,19 +50,20 @@ See the [documentation](https://docs.2gis.com/en/on-premise/navigation) to learn ### Common settings -| Name | Description | Value | -| ------------------------------- | --------------------------------------------------------------------------------------------------------------------------- | ----- | -| `replicaCount` | A replica count for the pod. | `1` | -| `imagePullSecrets` | Kubernetes image pull secrets. | `[]` | -| `nameOverride` | Base name to use in all the Kubernetes entities deployed by this chart. | `""` | -| `fullnameOverride` | Base fullname to use in all the Kubernetes entities deployed by this chart. | `""` | -| `podAnnotations` | Kubernetes [pod annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/). | `{}` | -| `podSecurityContext` | Kubernetes [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/). | `{}` | -| `securityContext` | Kubernetes [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/). | `{}` | -| `nodeSelector` | Kubernetes [node selectors](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector). | `{}` | -| `tolerations` | Kubernetes [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) settings. | `[]` | -| `affinity` | Kubernetes pod [affinity settings](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity). | `{}` | -| `terminationGracePeriodSeconds` | Maximum time allowed for graceful shutdown. | `60` | +| Name | Description | Value | +| ------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ | +| `enableServiceLinks` | Services injection into containers environment [Accessing the Service](https://kubernetes.io/docs/tutorials/services/connect-applications-service/#accessing-the-service) | `true` | +| `replicaCount` | A replica count for the pod. | `1` | +| `imagePullSecrets` | Kubernetes image pull secrets. | `[]` | +| `nameOverride` | Base name to use in all the Kubernetes entities deployed by this chart. | `""` | +| `fullnameOverride` | Base fullname to use in all the Kubernetes entities deployed by this chart. | `""` | +| `podAnnotations` | Kubernetes [pod annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/). | `{}` | +| `podSecurityContext` | Kubernetes [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/). | `{}` | +| `securityContext` | Kubernetes [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/). | `{}` | +| `nodeSelector` | Kubernetes [node selectors](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector). | `{}` | +| `tolerations` | Kubernetes [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) settings. | `[]` | +| `affinity` | Kubernetes pod [affinity settings](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity). | `{}` | +| `terminationGracePeriodSeconds` | Maximum time allowed for graceful shutdown. | `60` | ### Service account settings diff --git a/charts/navi-castle/templates/statefulset.yaml b/charts/navi-castle/templates/statefulset.yaml index c6ef8fedc..c4853928f 100644 --- a/charts/navi-castle/templates/statefulset.yaml +++ b/charts/navi-castle/templates/statefulset.yaml @@ -61,6 +61,7 @@ spec: - name: {{ include "castle.fullname" . }}-data emptyDir: {} {{- end }} + enableServiceLinks: {{ .Values.enableServiceLinks }} terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }} containers: - name: castle-nginx diff --git a/charts/navi-castle/values.yaml b/charts/navi-castle/values.yaml index a8a2e9385..0bbcaa069 100644 --- a/charts/navi-castle/values.yaml +++ b/charts/navi-castle/values.yaml @@ -36,6 +36,7 @@ dgctlStorage: # @section Common settings +# @param enableServiceLinks Services injection into containers environment [Accessing the Service](https://kubernetes.io/docs/tutorials/services/connect-applications-service/#accessing-the-service) # @param replicaCount A replica count for the pod. # @param imagePullSecrets Kubernetes image pull secrets. # @param nameOverride Base name to use in all the Kubernetes entities deployed by this chart. @@ -48,6 +49,7 @@ dgctlStorage: # @param affinity Kubernetes pod [affinity settings](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity). # @param terminationGracePeriodSeconds Maximum time allowed for graceful shutdown. +enableServiceLinks: false replicaCount: 1 imagePullSecrets: [] nameOverride: '' diff --git a/charts/navi-front/README.md b/charts/navi-front/README.md index 10fbab960..edff8cbd8 100644 --- a/charts/navi-front/README.md +++ b/charts/navi-front/README.md @@ -28,19 +28,20 @@ See the [documentation](https://docs.2gis.com/en/on-premise/navigation) to learn ### Common settings -| Name | Description | Value | -| ---------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------- | ----- | -| `replicaCount` | A replica count for the pod. | `1` | -| `revisionHistoryLimit` | Revision history limit (used for [rolling back](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) a deployment). | `3` | -| `imagePullSecrets` | Kubernetes image pull secrets. | `[]` | -| `nameOverride` | Base name to use in all the Kubernetes entities deployed by this chart. | `""` | -| `fullnameOverride` | Base fullname to use in all the Kubernetes entities deployed by this chart. | `""` | -| `podAnnotations` | Kubernetes [pod annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/). | `{}` | -| `podSecurityContext` | Kubernetes [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/). | `{}` | -| `securityContext` | Kubernetes [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/). | `{}` | -| `nodeSelector` | Kubernetes [node selectors](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector). | `{}` | -| `tolerations` | Kubernetes [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) settings. | `[]` | -| `affinity` | Kubernetes pod [affinity settings](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity). | `{}` | +| Name | Description | Value | +| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------ | +| `enableServiceLinks` | Services injection into containers environment [Accessing the Service](https://kubernetes.io/docs/tutorials/services/connect-applications-service/#accessing-the-service) | `true` | +| `replicaCount` | A replica count for the pod. | `1` | +| `revisionHistoryLimit` | Revision history limit (used for [rolling back](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) a deployment). | `3` | +| `imagePullSecrets` | Kubernetes image pull secrets. | `[]` | +| `nameOverride` | Base name to use in all the Kubernetes entities deployed by this chart. | `""` | +| `fullnameOverride` | Base fullname to use in all the Kubernetes entities deployed by this chart. | `""` | +| `podAnnotations` | Kubernetes [pod annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/). | `{}` | +| `podSecurityContext` | Kubernetes [pod security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/). | `{}` | +| `securityContext` | Kubernetes [security context](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/). | `{}` | +| `nodeSelector` | Kubernetes [node selectors](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector). | `{}` | +| `tolerations` | Kubernetes [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) settings. | `[]` | +| `affinity` | Kubernetes pod [affinity settings](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity). | `{}` | ### Deployment settings diff --git a/charts/navi-front/templates/deployment.yaml b/charts/navi-front/templates/deployment.yaml index 56d91a27e..429636974 100644 --- a/charts/navi-front/templates/deployment.yaml +++ b/charts/navi-front/templates/deployment.yaml @@ -23,6 +23,7 @@ spec: labels: {{- include "front.selectorLabels" . | nindent 8 }} spec: + enableServiceLinks: {{ .Values.enableServiceLinks }} {{- with .Values.imagePullSecrets }} imagePullSecrets: {{- toYaml . | nindent 8 }} diff --git a/charts/navi-front/values.yaml b/charts/navi-front/values.yaml index 983b9d14c..2f631278e 100644 --- a/charts/navi-front/values.yaml +++ b/charts/navi-front/values.yaml @@ -7,6 +7,7 @@ dgctlDockerRegistry: '' # @section Common settings +# @param enableServiceLinks Services injection into containers environment [Accessing the Service](https://kubernetes.io/docs/tutorials/services/connect-applications-service/#accessing-the-service) # @param replicaCount A replica count for the pod. # @param revisionHistoryLimit Revision history limit (used for [rolling back](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) a deployment). # @param imagePullSecrets Kubernetes image pull secrets. @@ -19,6 +20,7 @@ dgctlDockerRegistry: '' # @param tolerations Kubernetes [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) settings. # @param affinity Kubernetes pod [affinity settings](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity). +enableServiceLinks: true replicaCount: 1 revisionHistoryLimit: 3 imagePullSecrets: [] From 43482ca4c483a7796ed098da6f272d819bb0c9d2 Mon Sep 17 00:00:00 2001 From: mprudnikov Date: Thu, 26 Dec 2024 16:43:32 +0700 Subject: [PATCH 2/3] =?UTF-8?q?[Navi]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC?= =?UTF-8?q?=D0=B5=D1=82=D1=80=D0=B0=20$enableServiceLinks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- charts/navi-castle/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/navi-castle/values.yaml b/charts/navi-castle/values.yaml index 0bbcaa069..7ab159fca 100644 --- a/charts/navi-castle/values.yaml +++ b/charts/navi-castle/values.yaml @@ -49,7 +49,7 @@ dgctlStorage: # @param affinity Kubernetes pod [affinity settings](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity). # @param terminationGracePeriodSeconds Maximum time allowed for graceful shutdown. -enableServiceLinks: false +enableServiceLinks: true replicaCount: 1 imagePullSecrets: [] nameOverride: '' From 4ab2cd6ed5021e70834c52cee335876efd540dae Mon Sep 17 00:00:00 2001 From: mprudnikov Date: Thu, 26 Dec 2024 17:00:20 +0700 Subject: [PATCH 3/3] =?UTF-8?q?[Navi]=20=D0=9F=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20linter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- charts/traffic-proxy/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/traffic-proxy/values.yaml b/charts/traffic-proxy/values.yaml index 45e9abb32..4a3c3da3c 100644 --- a/charts/traffic-proxy/values.yaml +++ b/charts/traffic-proxy/values.yaml @@ -76,7 +76,7 @@ proxy: errorLog: level: error - accessLog: off + accessLog: 'off' # accessLog: '/dev/stdout main' keepaliveTimeout: 65