From 8a2dac971878d8b2a7bface6b0f7584843d3b6ba Mon Sep 17 00:00:00 2001 From: DarkSky <25152247+darkskygit@users.noreply.github.com> Date: Thu, 29 Jun 2023 16:25:43 +0800 Subject: [PATCH] fix: incorrect formatting (#2917) --- .../affine-cloud/templates/deployment.yaml | 79 +++++++++---------- .../helm/affine-cloud/templates/secret.yaml | 6 +- .../helm/affine-cloud/templates/services.yaml | 12 +-- .prettierignore | 1 + 4 files changed, 47 insertions(+), 51 deletions(-) diff --git a/.github/helm/affine-cloud/templates/deployment.yaml b/.github/helm/affine-cloud/templates/deployment.yaml index 14319e8011..c8d8d6fbe7 100644 --- a/.github/helm/affine-cloud/templates/deployment.yaml +++ b/.github/helm/affine-cloud/templates/deployment.yaml @@ -1,58 +1,51 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: { { include "affine-cloud.fullname" . } } - labels: { { - include "affine-cloud.labels" . | nindent 4 } } + name: "{{ include "affine-cloud.fullname" . }}" + labels: + {{- include "affine-cloud.labels" . | nindent 4 }} spec: replicas: 1 selector: - matchLabels: { { - include "affine-cloud.selectorLabels" . | nindent 6 } } + matchLabels: + {{- include "affine-cloud.selectorLabels" . | nindent 6 }} strategy: type: RollingUpdate rollingUpdate: maxUnavailable: 2 template: metadata: - labels: { { - include "affine-cloud.selectorLabels" . | nindent 8 } } + labels: + {{- include "affine-cloud.selectorLabels" . | nindent 8 }} spec: restartPolicy: Always containers: - - name: affine-cloud - image: 'ghcr.io/toeverything/cloud-self-hosted:{{ .Values.affineCloud.tag | default .Chart.AppVersion }}' - env: - - name: PG_USER - value: { { .Values.postgresql.auth.username } } - - name: PG_PASS - value: { { .Values.postgresql.auth.password } } - - name: PG_DATABASE - value: { { .Values.postgresql.auth.database } } - - name: PG_HOST - value: - { - { - .Values.postgresql.fullnameOverride | default (printf "%s-postgresql" .Release.Name), - }, - } - - name: DATABASE_URL - value: - { - { - .Values.affineCloud.databaseUrl | default "postgresql://$(PG_USER):$(PG_PASS)@$(PG_HOST)/$(PG_DATABASE)", - }, - } - envFrom: - - secretRef: - name: affine-cloud-secret - ports: - - containerPort: 3000 - livenessProbe: - httpGet: - path: /api/healthz - port: 3000 - failureThreshold: 1 - initialDelaySeconds: 10 - periodSeconds: 10 - resources: - limits: - cpu: '{{ .Values.affineCloud.resources.cpu }}' - memory: '{{ .Values.affineCloud.resources.memory }}' + - name: affine-cloud + image: "ghcr.io/toeverything/cloud-self-hosted:{{ .Values.affineCloud.tag | default .Chart.AppVersion }}" + env: + - name: PG_USER + value: "{{ .Values.postgresql.auth.username }}" + - name: PG_PASS + value: "{{ .Values.postgresql.auth.password }}" + - name: PG_DATABASE + value: "{{ .Values.postgresql.auth.database }}" + - name: PG_HOST + value: "{{ .Values.postgresql.fullnameOverride | default (printf "%s-postgresql" .Release.Name) }}" + - name: DATABASE_URL + value: "{{ .Values.affineCloud.databaseUrl | default "postgresql://$(PG_USER):$(PG_PASS)@$(PG_HOST)/$(PG_DATABASE)" }}" + envFrom: + - secretRef: + name: affine-cloud-secret + ports: + - containerPort: 3000 + livenessProbe: + httpGet: + path: /api/healthz + port: 3000 + failureThreshold: 1 + initialDelaySeconds: 10 + periodSeconds: 10 + resources: + limits: + cpu: "{{ .Values.affineCloud.resources.cpu }}" + memory: "{{ .Values.affineCloud.resources.memory }}" diff --git a/.github/helm/affine-cloud/templates/secret.yaml b/.github/helm/affine-cloud/templates/secret.yaml index 22106c2a3f..f6879af5e8 100644 --- a/.github/helm/affine-cloud/templates/secret.yaml +++ b/.github/helm/affine-cloud/templates/secret.yaml @@ -4,6 +4,6 @@ metadata: name: affine-cloud-secret type: Opaque data: - SIGN_KEY: '{{ .Values.affineCloud.signKey }}' - MAIL_ACCOUNT: '{{ .Values.affineCloud.mail.account }}' - MAIL_PASSWORD: '{{ .Values.affineCloud.mail.password }}' + SIGN_KEY: "{{ .Values.affineCloud.signKey }}" + MAIL_ACCOUNT: "{{ .Values.affineCloud.mail.account }}" + MAIL_PASSWORD: "{{ .Values.affineCloud.mail.password }}" diff --git a/.github/helm/affine-cloud/templates/services.yaml b/.github/helm/affine-cloud/templates/services.yaml index c63da63c73..2529d4569d 100644 --- a/.github/helm/affine-cloud/templates/services.yaml +++ b/.github/helm/affine-cloud/templates/services.yaml @@ -1,13 +1,15 @@ apiVersion: v1 kind: Service metadata: - name: { { include "affine-cloud.fullname" . } } - labels: { { - include "affine-cloud.labels" . | nindent 4 } } + name: "{{ include "affine-cloud.fullname" . }}" + labels: + {{- include "affine-cloud.labels" . | nindent 4 }} spec: - type: '{{ .Values.affineCloud.service.type }}' + type: "{{ .Values.affineCloud.service.type }}" ports: - name: http protocol: TCP - port: { { .Values.affineCloud.service.port } } + port: {{ .Values.affineCloud.service.port }} targetPort: 3000 - selector: { { - include "affine-cloud.selectorLabels" . | nindent 4 } } + selector: + {{- include "affine-cloud.selectorLabels" . | nindent 4 }} diff --git a/.prettierignore b/.prettierignore index a4f73c2e47..af1303b00f 100644 --- a/.prettierignore +++ b/.prettierignore @@ -9,3 +9,4 @@ out dist .yarn tests/affine-legacy/0.7.0-canary.18/static +.github/helm