From fc5ee21ebc2be07c0e5f90e278359d5768f9e5ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Barrag=C3=A1n=20Merino?= Date: Tue, 9 Jul 2024 18:08:53 +0200 Subject: [PATCH] feat: delete repl service --- charts/penpot/README.md | 7 ++--- .../penpot/templates/backend-deployment.yml | 11 +------- charts/penpot/templates/backend-service.yml | 27 +++---------------- .../penpot/templates/frontend-deployment.yml | 2 +- charts/penpot/values.yaml | 23 +++++----------- 5 files changed, 13 insertions(+), 57 deletions(-) diff --git a/charts/penpot/README.md b/charts/penpot/README.md index 9814373..1e5df5d 100644 --- a/charts/penpot/README.md +++ b/charts/penpot/README.md @@ -40,11 +40,8 @@ $ helm install my-release penpot/penpot | backend.resources | object | `{"limits":{},"requests":{}}` | Penpot backend resource requests and limits. Check [the official doc](https://kubernetes.io/docs/user-guide/compute-resources/) | | backend.resources.limits | object | `{}` | The resources limits for the Penpot backend containers | | backend.resources.requests | object | `{}` | The requested resources for the Penpot backend containers | -| backend.service.http.port | int | `6060` | The http service port to use. | -| backend.service.http.type | string | `"ClusterIP"` | The http service type to create. | -| backend.service.prepl.enabled | bool | `false` | Whether to enable the prepl service in the backend. | -| backend.service.prepl.port | int | `6063` | The prepl service port to use. | -| backend.service.prepl.type | string | `"ClusterIP"` | The prepl service type to create. | +| backend.service.port | int | `6060` | The http service port to use. | +| backend.service.type | string | `"ClusterIP"` | The http service type to create. | | backend.tolerations | list | `[]` | Tolerations for Penpot pods assignment. Check [the official doc](https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/) | ### Configuration parameters diff --git a/charts/penpot/templates/backend-deployment.yml b/charts/penpot/templates/backend-deployment.yml index 8227d84..10662ad 100644 --- a/charts/penpot/templates/backend-deployment.yml +++ b/charts/penpot/templates/backend-deployment.yml @@ -65,10 +65,6 @@ spec: {{- end }} - name: PENPOT_TELEMETRY_ENABLED value: {{ .Values.config.telemetryEnabled | quote }} - {{- if .Values.backend.service.prepl.enabled }} - - name: PENPOT_PREPL_HOST - value: "0.0.0.0" - {{- end }} {{/* PosgreSQL connection settings */}} - name: PENPOT_DATABASE_URI {{- if .Values.config.postgresql.host }} @@ -380,13 +376,8 @@ spec: readOnly: false ports: - name: http - containerPort: {{ .Values.backend.service.http.port }} + containerPort: {{ .Values.backend.service.port }} protocol: TCP - {{- if .Values.backend.service.prepl.enabled }} - - name: prepl - containerPort: {{ .Values.backend.service.prepl.port }} - protocol: TCP - {{- end }} resources: {{- toYaml .Values.backend.resources | nindent 12 }} {{- with .Values.backend.nodeSelector }} diff --git a/charts/penpot/templates/backend-service.yml b/charts/penpot/templates/backend-service.yml index a245c47..28951e1 100644 --- a/charts/penpot/templates/backend-service.yml +++ b/charts/penpot/templates/backend-service.yml @@ -8,30 +8,9 @@ metadata: spec: selector: {{- include "penpot.backendSelectorLabels" . | nindent 4 }} - type: {{ .Values.backend.service.http.type }} + type: {{ .Values.backend.service.type }} ports: - - port: {{ .Values.backend.service.http.port }} - targetPort: {{ .Values.backend.service.http.port }} + - port: {{ .Values.backend.service.port }} + targetPort: {{ .Values.backend.service.port }} protocol: TCP name: http - ---- - -{{- if .Values.backend.service.prepl.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: {{ include "penpot.fullname" . }}-backend-prepl - namespace: {{ .Release.Namespace }} - labels: - {{- include "penpot.labels" . | nindent 4 }} -spec: - selector: - {{- include "penpot.backendSelectorLabels" . | nindent 4 }} - type: {{ .Values.backend.service.prepl.type }} - ports: - - port: {{ .Values.backend.service.prepl.port }} - targetPort: {{ .Values.backend.service.prepl.port }} - protocol: TCP - name: prepl -{{- end }} diff --git a/charts/penpot/templates/frontend-deployment.yml b/charts/penpot/templates/frontend-deployment.yml index b79f887..e2eb5a7 100644 --- a/charts/penpot/templates/frontend-deployment.yml +++ b/charts/penpot/templates/frontend-deployment.yml @@ -47,7 +47,7 @@ spec: - name: PENPOT_FLAGS value: "$PENPOT_FLAGS {{ .Values.config.flags }}" - name: PENPOT_BACKEND_URI - value: {{ print "http://" (include "penpot.fullname" .) "-backend:" .Values.backend.service.http.port }} + value: {{ print "http://" (include "penpot.fullname" .) "-backend:" .Values.backend.service.port }} - name: PENPOT_EXPORTER_URI value: {{ print "http://" (include "penpot.fullname" .) "-exporter:" .Values.exporter.service.port }} volumeMounts: diff --git a/charts/penpot/values.yaml b/charts/penpot/values.yaml index 84fafac..f3275b3 100644 --- a/charts/penpot/values.yaml +++ b/charts/penpot/values.yaml @@ -320,23 +320,12 @@ backend: # @section -- Backend parameters replicaCount: 1 service: - http: - # -- The http service type to create. - # @section -- Backend parameters - type: ClusterIP - # -- The http service port to use. - # @section -- Backend parameters - port: 6060 - prepl: - # -- Whether to enable the prepl service in the backend. - # @section -- Backend parameters - enabled: false - # -- The prepl service type to create. - # @section -- Backend parameters - type: ClusterIP - # -- The prepl service port to use. - # @section -- Backend parameters - port: 6063 + # -- The http service type to create. + # @section -- Backend parameters + type: ClusterIP + # -- The http service port to use. + # @section -- Backend parameters + port: 6060 # -- An optional map of annotations to be applied to the controller Deployment # @section -- Backend parameters deploymentAnnotations: {}