There can be more than Notion and Miro. AFFiNE(pronounced [ə‘fain]) is a next-gen knowledge base that brings planning, sorting and creating all together. Privacy first, open-source, customizable and ready to use.
TypeScript appcrdteditorelectronknowledge-basemarkdownmironotesnotionnotion-alternativerustrust-langrust-languagetabletableviewwhiteboardwikiworkspace
chore: make DOC_SERVICE_ENDPOINT dynamic computed (#10029)
Brooooooklyn18513c6e55ff
diff --git a/.github/helm/affine/charts/doc/templates/_helpers.tpl b/.github/helm/affine/charts/doc/templates/_helpers.tplindex 7741afd2b3..6837b8047f 100644--- a/.github/helm/affine/charts/doc/templates/_helpers.tpl+++ b/.github/helm/affine/charts/doc/templates/_helpers.tpl@@ -56,8 +56,8 @@ Create the name of the service account to use*/}}{{- define "doc.serviceAccountName" -}}{{- if .Values.serviceAccount.create }}-{{- default (include "doc.fullname" .) .Values.serviceAccount.name }}+{{- default (include "doc.fullname" .) .Values.global.docService.name }}{{- else }}-{{- default "default" .Values.serviceAccount.name }}+{{- default "default" .Values.global.docService.name }}{{- end }}{{- end }}diff --git a/.github/helm/affine/charts/doc/templates/service.yaml b/.github/helm/affine/charts/doc/templates/service.yamlindex 2944165321..ce9db659b6 100644--- a/.github/helm/affine/charts/doc/templates/service.yaml+++ b/.github/helm/affine/charts/doc/templates/service.yaml@@ -11,7 +11,7 @@ metadata:spec:type: {{ .Values.service.type }}ports:- - port: {{ .Values.service.port }}+ - port: {{ .Values.global.docService.port }}targetPort: httpprotocol: TCPname: httpdiff --git a/.github/helm/affine/charts/doc/templates/tests/test-connection.yaml b/.github/helm/affine/charts/doc/templates/tests/test-connection.yamlindex 3df384e693..e8fdab28f8 100644--- a/.github/helm/affine/charts/doc/templates/tests/test-connection.yaml+++ b/.github/helm/affine/charts/doc/templates/tests/test-connection.yaml@@ -11,5 +11,5 @@ spec:- name: wgetimage: busyboxcommand: ['wget']- args: ['{{ include "doc.fullname" . }}:{{ .Values.service.port }}']+ args: ['{{ include "doc.fullname" . }}:{{ .Values.global.docService.port }}']restartPolicy: Neverdiff --git a/.github/helm/affine/charts/doc/values.yaml b/.github/helm/affine/charts/doc/values.yamlindex eeb0496cb8..71d960043d 100644--- a/.github/helm/affine/charts/doc/values.yaml+++ b/.github/helm/affine/charts/doc/values.yaml@@ -18,7 +18,6 @@ app:serviceAccount:create: trueannotations: {}- name: 'affine-doc'podAnnotations: {}diff --git a/.github/helm/affine/charts/graphql/templates/deployment.yaml b/.github/helm/affine/charts/graphql/templates/deployment.yamlindex e9267e9d4a..7ead6812e1 100644--- a/.github/helm/affine/charts/graphql/templates/deployment.yaml+++ b/.github/helm/affine/charts/graphql/templates/deployment.yaml@@ -119,7 +119,7 @@ spec:- name: DOC_MERGE_INTERVALvalue: "{{ .Values.app.doc.mergeInterval }}"- name: DOC_SERVICE_ENDPOINT- value: "{{ .Values.global.docService.endpoint }}"+ value: "http://{{ .Values.global.docService.name }}:{{ .Values.global.docService.port }}"{{ if .Values.app.experimental.enableJwstCodec }}- name: DOC_MERGE_USE_JWST_CODECvalue: "true"diff --git a/.github/helm/affine/charts/renderer/templates/deployment.yaml b/.github/helm/affine/charts/renderer/templates/deployment.yamlindex 01fe5df9fc..eaf855682c 100644--- a/.github/helm/affine/charts/renderer/templates/deployment.yaml+++ b/.github/helm/affine/charts/renderer/templates/deployment.yaml@@ -95,7 +95,7 @@ spec:key: secretAccessKey{{ end }}- name: DOC_SERVICE_ENDPOINT- value: "{{ .Values.global.docService.endpoint }}"+ value: "http://{{ .Values.global.docService.name }}:{{ .Values.global.docService.port }}"ports:- name: httpcontainerPort: {{ .Values.service.port }}diff --git a/.github/helm/affine/charts/sync/templates/deployment.yaml b/.github/helm/affine/charts/sync/templates/deployment.yamlindex 77cfea22b3..e0f772a771 100644--- a/.github/helm/affine/charts/sync/templates/deployment.yaml+++ b/.github/helm/affine/charts/sync/templates/deployment.yaml@@ -74,7 +74,7 @@ spec:- name: AFFINE_SERVER_HOSTvalue: "{{ .Values.app.host }}"- name: DOC_SERVICE_ENDPOINT- value: "{{ .Values.global.docService.endpoint }}"+ value: "http://{{ .Values.global.docService.name }}:{{ .Values.global.docService.port }}"ports:- name: httpcontainerPort: {{ .Values.service.port }}diff --git a/.github/helm/affine/values.yaml b/.github/helm/affine/values.yamlindex 1615a825a7..671cef0887 100644--- a/.github/helm/affine/values.yaml+++ b/.github/helm/affine/values.yaml@@ -40,7 +40,8 @@ global:gke:enabled: truedocService:- endpoint: 'http://affine-doc:3020'+ name: 'affine-doc'+ port: 3020graphql:service:@@ -66,7 +67,6 @@ renderer:doc:service:type: ClusterIP- port: 3020annotations:cloud.google.com/backend-config: '{"default": "affine-api-backendconfig"}'