From 6ec45c4df229b815fdec18f65c6a7ffe0d3f657a Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Mon, 19 Aug 2024 11:51:30 +0800 Subject: [PATCH 01/19] chore: support gcp multi cluster ingress --- .../charts/web/templates/ingress.yaml | 4 +- .../web/templates/multi-cluster-ingress.yaml | 24 ++++++++++++ .../web/templates/multi-cluster-service.yaml | 37 +++++++++++++++++++ .../charts/web/templates/service.yaml | 2 + manifests/bucketeer/charts/web/values.yaml | 19 ++++++++++ 5 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml create mode 100644 manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml diff --git a/manifests/bucketeer/charts/web/templates/ingress.yaml b/manifests/bucketeer/charts/web/templates/ingress.yaml index ae9078a100..23dd26fd2e 100644 --- a/manifests/bucketeer/charts/web/templates/ingress.yaml +++ b/manifests/bucketeer/charts/web/templates/ingress.yaml @@ -1,3 +1,4 @@ +{{- if .Values.ingress.enabled }} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -22,4 +23,5 @@ spec: rules: - host: {{ .Values.ingress.host }} http: - paths: {{- toYaml .Values.ingress.rulePaths | nindent 10 }} \ No newline at end of file + paths: {{- toYaml .Values.ingress.rulePaths | nindent 10 }} +{{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml new file mode 100644 index 0000000000..d2edeca2e1 --- /dev/null +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml @@ -0,0 +1,24 @@ +{{- if and .Values.multiClusterIngress.enabled .Values.env.gcpEnabled }} +apiVersion: networking.gke.io/v1 +kind: MultiClusterIngress +metadata: + name: {{ .Values.multiClusterIngress.name }} + namespace: {{ .Values.namespace }} + labels: + app: {{ template "web.name" . }} + chart: {{ template "web.chart" . }} + release: {{ template "web.fullname" . }} + heritage: {{ .Release.Service }} + annotations: + networking.gke.io/static-ip: {{ .Values.multiClusterIngress.staticIPName }} +spec: + template: + spec: + backend: + serviceName: {{ template "web.fullname" . }} + servicePort: {{ .Values.service.httpPort }} + rules: + - host: {{ .Values.multiClusterIngress.host }} + http: + paths: {{- toYaml .Values.multiClusterIngress.rulePaths | nindent 14 }} +{{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml new file mode 100644 index 0000000000..7068032612 --- /dev/null +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml @@ -0,0 +1,37 @@ +{{- if and .Values.multiClusterService.enabled .Values.env.gcpEnabled }} +apiVersion: networking.gke.io/v1 +kind: MultiClusterService +metadata: + name: {{ .Values.multiClusterService.name }} + namespace: {{ .Values.namespace }} + labels: + app: {{ template "web.name" . }} + chart: {{ template "web.chart" . }} + release: {{ template "web.fullname" . }} + heritage: {{ .Release.Service }} + annotations: + cloud.google.com/backend-config: '{"default": "{{ template "web.fullname" . }}"}' + cloud.google.com/app-protocols: '{"http-service":"HTTP2"}' + cloud.google.com/neg: '{"ingress": true}' +spec: + template: + spec: + selector: + app: {{ template "web.name" . }} + release: {{ template "web.fullname" . }} + ports: + - name: grpc-service + port: {{ .Values.service.grpcPort }} + targetPort: envoy-grpc + protocol: TCP + - name: http-service + port: {{ .Values.service.httpPort }} + targetPort: envoy-http + protocol: TCP + - name: metrics + port: {{ .Values.env.metricsPort }} + protocol: TCP + - name: admin + port: {{ .Values.envoy.adminPort }} + protocol: TCP +{{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/web/templates/service.yaml b/manifests/bucketeer/charts/web/templates/service.yaml index 320718678f..366adb29da 100644 --- a/manifests/bucketeer/charts/web/templates/service.yaml +++ b/manifests/bucketeer/charts/web/templates/service.yaml @@ -1,3 +1,4 @@ +{{- if .Values.service.enabled }} apiVersion: v1 kind: Service metadata: @@ -34,3 +35,4 @@ spec: selector: app: {{ template "web.name" . }} release: {{ template "web.fullname" . }} +{{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/web/values.yaml b/manifests/bucketeer/charts/web/values.yaml index cfe064aa65..853d03a51f 100644 --- a/manifests/bucketeer/charts/web/values.yaml +++ b/manifests/bucketeer/charts/web/values.yaml @@ -118,6 +118,7 @@ envoy: adminPort: 8001 resources: {} service: + enabled: true type: NodePort grpcPort: 9000 httpPort: 9003 @@ -134,6 +135,7 @@ resources: {} serviceAccount: annotations: {} ingress: + enabled: true name: web host: staticIPName: @@ -144,3 +146,20 @@ ingress: name: web port: number: 9003 + +multiClusterService: + enabled: false + name: web-multi-cluster-service + + +multiClusterIngress: + enabled: false + name: web-multi-cluster-ingress + host: web-gateway.bucketeer.io + staticIPName: web-multi-cluster-static-ip + rulePaths: + - path: / + pathType: Prefix + backend: + serviceName: web + servicePort: 9003 \ No newline at end of file From 9dd604872a77a514e0dfe90c5ec0a6453cfde488 Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Tue, 20 Aug 2024 17:17:28 +0800 Subject: [PATCH 02/19] chore: use one boolean --- .../charts/web/templates/ingress.yaml | 2 +- .../web/templates/multi-cluster-ingress.yaml | 10 +++---- .../web/templates/multi-cluster-service.yaml | 4 +-- .../charts/web/templates/service.yaml | 2 +- manifests/bucketeer/charts/web/values.yaml | 30 ++++++++----------- 5 files changed, 22 insertions(+), 26 deletions(-) diff --git a/manifests/bucketeer/charts/web/templates/ingress.yaml b/manifests/bucketeer/charts/web/templates/ingress.yaml index 23dd26fd2e..f6667574c1 100644 --- a/manifests/bucketeer/charts/web/templates/ingress.yaml +++ b/manifests/bucketeer/charts/web/templates/ingress.yaml @@ -1,4 +1,4 @@ -{{- if .Values.ingress.enabled }} +{{- if not .Values.gcpMultiCluster.enabled }} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml index d2edeca2e1..d8c4591ae3 100644 --- a/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml @@ -1,8 +1,8 @@ -{{- if and .Values.multiClusterIngress.enabled .Values.env.gcpEnabled }} +{{- if .Values.gcpMultiCluster.enabled }} apiVersion: networking.gke.io/v1 kind: MultiClusterIngress metadata: - name: {{ .Values.multiClusterIngress.name }} + name: {{ .Values.gcpMultiCluster.ingress.name }} namespace: {{ .Values.namespace }} labels: app: {{ template "web.name" . }} @@ -10,7 +10,7 @@ metadata: release: {{ template "web.fullname" . }} heritage: {{ .Release.Service }} annotations: - networking.gke.io/static-ip: {{ .Values.multiClusterIngress.staticIPName }} + networking.gke.io/static-ip: {{ .Values.gcpMultiCluster.ingress.staticIPName }} spec: template: spec: @@ -18,7 +18,7 @@ spec: serviceName: {{ template "web.fullname" . }} servicePort: {{ .Values.service.httpPort }} rules: - - host: {{ .Values.multiClusterIngress.host }} + - host: {{ .Values.gcpMultiCluster.ingress.host }} http: - paths: {{- toYaml .Values.multiClusterIngress.rulePaths | nindent 14 }} + paths: {{- toYaml .Values.gcpMultiCluster.ingress.rulePaths | nindent 14 }} {{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml index 7068032612..1e2e37b975 100644 --- a/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml @@ -1,8 +1,8 @@ -{{- if and .Values.multiClusterService.enabled .Values.env.gcpEnabled }} +{{- if .Values.gcpMultiCluster.enabled }} apiVersion: networking.gke.io/v1 kind: MultiClusterService metadata: - name: {{ .Values.multiClusterService.name }} + name: {{ .Values.gcpMultiCluster.service.name }} namespace: {{ .Values.namespace }} labels: app: {{ template "web.name" . }} diff --git a/manifests/bucketeer/charts/web/templates/service.yaml b/manifests/bucketeer/charts/web/templates/service.yaml index 366adb29da..36e7e7537f 100644 --- a/manifests/bucketeer/charts/web/templates/service.yaml +++ b/manifests/bucketeer/charts/web/templates/service.yaml @@ -1,4 +1,4 @@ -{{- if .Values.service.enabled }} +{{- if not .Values.gcpMultiCluster.enabled }} apiVersion: v1 kind: Service metadata: diff --git a/manifests/bucketeer/charts/web/values.yaml b/manifests/bucketeer/charts/web/values.yaml index 853d03a51f..f31eca9710 100644 --- a/manifests/bucketeer/charts/web/values.yaml +++ b/manifests/bucketeer/charts/web/values.yaml @@ -118,7 +118,6 @@ envoy: adminPort: 8001 resources: {} service: - enabled: true type: NodePort grpcPort: 9000 httpPort: 9003 @@ -135,7 +134,6 @@ resources: {} serviceAccount: annotations: {} ingress: - enabled: true name: web host: staticIPName: @@ -147,19 +145,17 @@ ingress: port: number: 9003 -multiClusterService: +gcpMultiCluster: enabled: false - name: web-multi-cluster-service - - -multiClusterIngress: - enabled: false - name: web-multi-cluster-ingress - host: web-gateway.bucketeer.io - staticIPName: web-multi-cluster-static-ip - rulePaths: - - path: / - pathType: Prefix - backend: - serviceName: web - servicePort: 9003 \ No newline at end of file + service: + name: web-multi-cluster-service + ingress: + name: web-multi-cluster-ingress + host: web-gateway.bucketeer.io + staticIPName: web-multi-cluster-static-ip + rulePaths: + - path: / + pathType: Prefix + backend: + serviceName: web + servicePort: 9003 From 286d68cea64774f29a3a936b87f2f88452456d6b Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Wed, 21 Aug 2024 09:54:19 +0800 Subject: [PATCH 03/19] chore: remove pathType --- manifests/bucketeer/charts/web/values.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/manifests/bucketeer/charts/web/values.yaml b/manifests/bucketeer/charts/web/values.yaml index f31eca9710..3b7663a4ad 100644 --- a/manifests/bucketeer/charts/web/values.yaml +++ b/manifests/bucketeer/charts/web/values.yaml @@ -155,7 +155,6 @@ gcpMultiCluster: staticIPName: web-multi-cluster-static-ip rulePaths: - path: / - pathType: Prefix backend: serviceName: web servicePort: 9003 From 4ca9edb3efa7dbd0c3144a34e4fa6f7faf97dca4 Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Wed, 21 Aug 2024 11:20:14 +0800 Subject: [PATCH 04/19] chore: tls support --- .../charts/web/templates/multi-cluster-ingress.yaml | 2 ++ manifests/bucketeer/charts/web/values.yaml | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml index d8c4591ae3..3450da86e7 100644 --- a/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml @@ -17,6 +17,8 @@ spec: backend: serviceName: {{ template "web.fullname" . }} servicePort: {{ .Values.service.httpPort }} + tls: + - secretName: {{ .Values.gcpMultiCluster.ingress.secretName }} rules: - host: {{ .Values.gcpMultiCluster.ingress.host }} http: diff --git a/manifests/bucketeer/charts/web/values.yaml b/manifests/bucketeer/charts/web/values.yaml index 3b7663a4ad..0d4792687b 100644 --- a/manifests/bucketeer/charts/web/values.yaml +++ b/manifests/bucketeer/charts/web/values.yaml @@ -151,8 +151,9 @@ gcpMultiCluster: name: web-multi-cluster-service ingress: name: web-multi-cluster-ingress - host: web-gateway.bucketeer.io - staticIPName: web-multi-cluster-static-ip + host: + staticIPName: + secretName: rulePaths: - path: / backend: From 1c413f71b4026a87dec648fcc21bde381cd77ab0 Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Wed, 21 Aug 2024 12:39:53 +0800 Subject: [PATCH 05/19] chore: multi-cluster-service protocol --- .../bucketeer/charts/web/templates/multi-cluster-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml index 1e2e37b975..cfe5d42027 100644 --- a/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml @@ -11,7 +11,7 @@ metadata: heritage: {{ .Release.Service }} annotations: cloud.google.com/backend-config: '{"default": "{{ template "web.fullname" . }}"}' - cloud.google.com/app-protocols: '{"http-service":"HTTP2"}' + networking.gke.io/app-protocols: '{"http-service":"HTTP2"}' cloud.google.com/neg: '{"ingress": true}' spec: template: From 998ba3907ba5440e8eff439155031ea4da5c2c86 Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Wed, 21 Aug 2024 13:18:31 +0800 Subject: [PATCH 06/19] chore: backend config --- .../bucketeer/charts/web/templates/multi-cluster-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml index cfe5d42027..d9eb3431b4 100644 --- a/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml @@ -10,7 +10,7 @@ metadata: release: {{ template "web.fullname" . }} heritage: {{ .Release.Service }} annotations: - cloud.google.com/backend-config: '{"default": "{{ template "web.fullname" . }}"}' + cloud.google.com/backend-config: '{"ports": {"{{ .Values.service.httpPort }}":"{{ template "web.fullname" . }}"}}' networking.gke.io/app-protocols: '{"http-service":"HTTP2"}' cloud.google.com/neg: '{"ingress": true}' spec: From 535d517fdacc14438ea9a4a4f2b768dd6364de6c Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Thu, 22 Aug 2024 08:36:39 +0800 Subject: [PATCH 07/19] chore: multi cluster for api --- .../charts/api/templates/ingress.yaml | 2 ++ .../api/templates/multi-cluster-ingress.yaml | 26 +++++++++++++++ .../api/templates/multi-cluster-service.yaml | 33 +++++++++++++++++++ .../charts/api/templates/service.yaml | 2 ++ manifests/bucketeer/charts/api/values.yaml | 14 ++++++++ manifests/bucketeer/charts/web/values.yaml | 1 - 6 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 manifests/bucketeer/charts/api/templates/multi-cluster-ingress.yaml create mode 100644 manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml diff --git a/manifests/bucketeer/charts/api/templates/ingress.yaml b/manifests/bucketeer/charts/api/templates/ingress.yaml index 7a0694fe3d..5ba258eba9 100644 --- a/manifests/bucketeer/charts/api/templates/ingress.yaml +++ b/manifests/bucketeer/charts/api/templates/ingress.yaml @@ -1,3 +1,4 @@ +{{- if not .Values.gcpMultiCluster.enabled }} apiVersion: networking.k8s.io/v1 kind: Ingress metadata: @@ -23,3 +24,4 @@ spec: - host: {{ .Values.ingress.host }} http: paths: {{- toYaml .Values.ingress.rulePaths | nindent 10 }} +{{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/api/templates/multi-cluster-ingress.yaml b/manifests/bucketeer/charts/api/templates/multi-cluster-ingress.yaml new file mode 100644 index 0000000000..bc7c926aca --- /dev/null +++ b/manifests/bucketeer/charts/api/templates/multi-cluster-ingress.yaml @@ -0,0 +1,26 @@ +{{- if .Values.gcpMultiCluster.enabled }} +apiVersion: networking.gke.io/v1 +kind: MultiClusterIngress +metadata: + name: {{ .Values.gcpMultiCluster.ingress.name }} + namespace: {{ .Values.namespace }} + labels: + app: {{ template "api.name" . }} + chart: {{ template "api.chart" . }} + release: {{ template "api.fullname" . }} + heritage: {{ .Release.Service }} + annotations: + networking.gke.io/static-ip: {{ .Values.gcpMultiCluster.ingress.staticIPName }} +spec: + template: + spec: + backend: + serviceName: {{ template "api.fullname" . }} + servicePort: {{ .Values.service.externalPort }} + tls: + - secretName: {{ .Values.gcpMultiCluster.ingress.secretName }} + rules: + - host: {{ .Values.gcpMultiCluster.ingress.host }} + http: + paths: {{- toYaml .Values.gcpMultiCluster.ingress.rulePaths | nindent 14 }} +{{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml b/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml new file mode 100644 index 0000000000..39bc2fd784 --- /dev/null +++ b/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml @@ -0,0 +1,33 @@ +{{- if .Values.gcpMultiCluster.enabled }} +apiVersion: networking.gke.io/v1 +kind: MultiClusterService +metadata: + name: {{ .Values.gcpMultiCluster.service.name }} + namespace: {{ .Values.namespace }} + labels: + app: {{ template "api.name" . }} + chart: {{ template "api.chart" . }} + release: {{ template "api.fullname" . }} + heritage: {{ .Release.Service }} + annotations: + cloud.google.com/backend-config: '{"ports": {"{{ .Values.service.externalPort }}":"{{ template "api.fullname" . }}"}}' + networking.gke.io/app-protocols: '{"service":"HTTP2"}' + cloud.google.com/neg: '{"ingress": true}' +spec: + template: + spec: + selector: + app: {{ template "api.name" . }} + release: {{ template "api.fullname" . }} + ports: + - name: service + port: {{ .Values.service.externalPort }} + targetPort: {{ .Values.envoy.port }} + protocol: TCP + - name: metrics + port: {{ .Values.env.metricsPort }} + protocol: TCP + - name: admin + port: {{ .Values.envoy.adminPort }} + protocol: TCP +{{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/api/templates/service.yaml b/manifests/bucketeer/charts/api/templates/service.yaml index 44fdf82177..dc194a1553 100644 --- a/manifests/bucketeer/charts/api/templates/service.yaml +++ b/manifests/bucketeer/charts/api/templates/service.yaml @@ -1,3 +1,4 @@ +{{- if not .Values.gcpMultiCluster.enabled }} apiVersion: v1 kind: Service metadata: @@ -30,3 +31,4 @@ spec: selector: app: {{ template "api.name" . }} release: {{ template "api.fullname" . }} +{{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/api/values.yaml b/manifests/bucketeer/charts/api/values.yaml index c159f06d78..6337ca75a5 100644 --- a/manifests/bucketeer/charts/api/values.yaml +++ b/manifests/bucketeer/charts/api/values.yaml @@ -86,3 +86,17 @@ health: resources: {} serviceAccount: annotations: {} +gcpMultiCluster: + enabled: false + service: + name: api-multi-cluster-service + ingress: + name: api-multi-cluster-ingress + host: + staticIPName: + secretName: + rulePaths: + - path: / + backend: + serviceName: api + servicePort: 9000 diff --git a/manifests/bucketeer/charts/web/values.yaml b/manifests/bucketeer/charts/web/values.yaml index 0d4792687b..1bddbdfb86 100644 --- a/manifests/bucketeer/charts/web/values.yaml +++ b/manifests/bucketeer/charts/web/values.yaml @@ -144,7 +144,6 @@ ingress: name: web port: number: 9003 - gcpMultiCluster: enabled: false service: From e5bb5aaac20c60ae2e6751fcee51ae2620ee8aa2 Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Thu, 5 Sep 2024 13:47:24 +0800 Subject: [PATCH 08/19] chore: specify backend-config health check protocol --- manifests/bucketeer/charts/api/templates/backend-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/manifests/bucketeer/charts/api/templates/backend-config.yaml b/manifests/bucketeer/charts/api/templates/backend-config.yaml index 2c267b2869..0ab358b21a 100644 --- a/manifests/bucketeer/charts/api/templates/backend-config.yaml +++ b/manifests/bucketeer/charts/api/templates/backend-config.yaml @@ -7,6 +7,7 @@ metadata: spec: healthCheck: requestPath: /health + type: HTTP2 timeoutSec: 40 connectionDraining: drainingTimeoutSec: 60 From 10bc60de15287e717eef7ef2207142de1296bf98 Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Thu, 5 Sep 2024 14:15:31 +0800 Subject: [PATCH 09/19] chore: specify backend-config health check protocol --- manifests/bucketeer/charts/web/templates/backend-config.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/manifests/bucketeer/charts/web/templates/backend-config.yaml b/manifests/bucketeer/charts/web/templates/backend-config.yaml index 7fda712602..4b33ebad2e 100644 --- a/manifests/bucketeer/charts/web/templates/backend-config.yaml +++ b/manifests/bucketeer/charts/web/templates/backend-config.yaml @@ -5,6 +5,9 @@ metadata: name: {{ template "web.fullname" . }} namespace: {{ .Values.namespace }} spec: + healthCheck: + requestPath: /health + type: HTTP2 timeoutSec: 300 connectionDraining: drainingTimeoutSec: 60 From daedfcd1ae95ab24f68a9c53a8198827ba2e2424 Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Thu, 5 Sep 2024 14:25:08 +0800 Subject: [PATCH 10/19] chore: uss mci service name --- .../bucketeer/charts/api/templates/multi-cluster-ingress.yaml | 2 +- .../bucketeer/charts/web/templates/multi-cluster-ingress.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/bucketeer/charts/api/templates/multi-cluster-ingress.yaml b/manifests/bucketeer/charts/api/templates/multi-cluster-ingress.yaml index bc7c926aca..d06273abc1 100644 --- a/manifests/bucketeer/charts/api/templates/multi-cluster-ingress.yaml +++ b/manifests/bucketeer/charts/api/templates/multi-cluster-ingress.yaml @@ -15,7 +15,7 @@ spec: template: spec: backend: - serviceName: {{ template "api.fullname" . }} + serviceName: {{ .Values.gcpMultiCluster.service.name }} servicePort: {{ .Values.service.externalPort }} tls: - secretName: {{ .Values.gcpMultiCluster.ingress.secretName }} diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml index 3450da86e7..c4036f6cf2 100644 --- a/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml @@ -15,7 +15,7 @@ spec: template: spec: backend: - serviceName: {{ template "web.fullname" . }} + serviceName: {{ .Values.gcpMultiCluster.service.name }} servicePort: {{ .Values.service.httpPort }} tls: - secretName: {{ .Values.gcpMultiCluster.ingress.secretName }} From eec0988cbc7e2a5d486aca56d25bba55493afd6e Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Thu, 5 Sep 2024 14:29:27 +0800 Subject: [PATCH 11/19] chore: uss mci service name --- manifests/bucketeer/charts/api/values.yaml | 2 +- manifests/bucketeer/charts/web/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/bucketeer/charts/api/values.yaml b/manifests/bucketeer/charts/api/values.yaml index 6337ca75a5..fe653667de 100644 --- a/manifests/bucketeer/charts/api/values.yaml +++ b/manifests/bucketeer/charts/api/values.yaml @@ -98,5 +98,5 @@ gcpMultiCluster: rulePaths: - path: / backend: - serviceName: api + serviceName: api-multi-cluster-service servicePort: 9000 diff --git a/manifests/bucketeer/charts/web/values.yaml b/manifests/bucketeer/charts/web/values.yaml index 1bddbdfb86..5e1c239873 100644 --- a/manifests/bucketeer/charts/web/values.yaml +++ b/manifests/bucketeer/charts/web/values.yaml @@ -156,5 +156,5 @@ gcpMultiCluster: rulePaths: - path: / backend: - serviceName: web + serviceName: web-multi-cluster-service servicePort: 9003 From 3be873bc48e3444574497b38303c7a4d09333177 Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Thu, 5 Sep 2024 17:51:47 +0800 Subject: [PATCH 12/19] chore: multi backend config --- .../templates/multi-cluster-backend-config.yaml | 14 ++++++++++++++ .../api/templates/multi-cluster-service.yaml | 2 +- .../templates/multi-cluster-backend-config.yaml | 14 ++++++++++++++ .../web/templates/multi-cluster-service.yaml | 2 +- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml create mode 100644 manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml diff --git a/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml b/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml new file mode 100644 index 0000000000..8cbed11897 --- /dev/null +++ b/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml @@ -0,0 +1,14 @@ +{{- if .Values.env.gcpEnabled }} +apiVersion: cloud.google.com/v1beta1 +kind: BackendConfig +metadata: + name: {{ template "api.fullname" . }}-mcs-backend-config + namespace: {{ .Values.namespace }} +spec: + healthCheck: + requestPath: /health + type: HTTP2 + timeoutSec: 40 + connectionDraining: + drainingTimeoutSec: 60 +{{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml b/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml index 39bc2fd784..e88fe8d65a 100644 --- a/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml +++ b/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml @@ -10,7 +10,7 @@ metadata: release: {{ template "api.fullname" . }} heritage: {{ .Release.Service }} annotations: - cloud.google.com/backend-config: '{"ports": {"{{ .Values.service.externalPort }}":"{{ template "api.fullname" . }}"}}' + cloud.google.com/backend-config: '{"ports": {"{{ .Values.service.externalPort }}":"{{ template "api.fullname" . }}-mcs-backend-config"}}' networking.gke.io/app-protocols: '{"service":"HTTP2"}' cloud.google.com/neg: '{"ingress": true}' spec: diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml new file mode 100644 index 0000000000..13e3baa11e --- /dev/null +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml @@ -0,0 +1,14 @@ +{{- if .Values.env.gcpEnabled }} +apiVersion: cloud.google.com/v1 +kind: BackendConfig +metadata: + name: {{ template "web.fullname" . }}-mcs-backend-config + namespace: {{ .Values.namespace }} +spec: + healthCheck: + requestPath: /health + type: HTTP2 + timeoutSec: 300 + connectionDraining: + drainingTimeoutSec: 60 +{{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml index d9eb3431b4..c1327ea088 100644 --- a/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml @@ -10,7 +10,7 @@ metadata: release: {{ template "web.fullname" . }} heritage: {{ .Release.Service }} annotations: - cloud.google.com/backend-config: '{"ports": {"{{ .Values.service.httpPort }}":"{{ template "web.fullname" . }}"}}' + cloud.google.com/backend-config: '{"ports": {"{{ .Values.service.httpPort }}":"{{ template "web.fullname" . }}-mcs-backend-config"}}' networking.gke.io/app-protocols: '{"http-service":"HTTP2"}' cloud.google.com/neg: '{"ingress": true}' spec: From 48710e1fd97ba0d34dbe2ccce675f963307c05e0 Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Thu, 5 Sep 2024 18:02:16 +0800 Subject: [PATCH 13/19] chore: make backend-config enabled --- manifests/bucketeer/charts/api/templates/backend-config.yaml | 2 +- .../charts/api/templates/multi-cluster-backend-config.yaml | 2 +- manifests/bucketeer/charts/web/templates/backend-config.yaml | 2 +- .../charts/web/templates/multi-cluster-backend-config.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/bucketeer/charts/api/templates/backend-config.yaml b/manifests/bucketeer/charts/api/templates/backend-config.yaml index 0ab358b21a..d797eb1b37 100644 --- a/manifests/bucketeer/charts/api/templates/backend-config.yaml +++ b/manifests/bucketeer/charts/api/templates/backend-config.yaml @@ -1,4 +1,4 @@ -{{- if .Values.env.gcpEnabled }} +{{- if and .Values.env.gcpEnabled (not .Values.gcpMultiCluster.enabled) }} apiVersion: cloud.google.com/v1beta1 kind: BackendConfig metadata: diff --git a/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml b/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml index 8cbed11897..996b3c1119 100644 --- a/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml +++ b/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml @@ -1,4 +1,4 @@ -{{- if .Values.env.gcpEnabled }} +{{- if and .Values.env.gcpEnabled .Values.gcpMultiCluster.enabled }} apiVersion: cloud.google.com/v1beta1 kind: BackendConfig metadata: diff --git a/manifests/bucketeer/charts/web/templates/backend-config.yaml b/manifests/bucketeer/charts/web/templates/backend-config.yaml index 4b33ebad2e..781d73be35 100644 --- a/manifests/bucketeer/charts/web/templates/backend-config.yaml +++ b/manifests/bucketeer/charts/web/templates/backend-config.yaml @@ -1,4 +1,4 @@ -{{- if .Values.env.gcpEnabled }} +{{- if and .Values.env.gcpEnabled (not .Values.gcpMultiCluster.enabled) }} apiVersion: cloud.google.com/v1 kind: BackendConfig metadata: diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml index 13e3baa11e..c3024fa838 100644 --- a/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml @@ -1,4 +1,4 @@ -{{- if .Values.env.gcpEnabled }} +{{- if and .Values.env.gcpEnabled .Values.gcpMultiCluster.enabled }} apiVersion: cloud.google.com/v1 kind: BackendConfig metadata: From 64c4c2add2ebdecc20981b42900ddec46d376fd6 Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Fri, 6 Sep 2024 14:48:18 +0800 Subject: [PATCH 14/19] chore: add config cluster option --- .../charts/api/templates/multi-cluster-backend-config.yaml | 2 +- .../bucketeer/charts/api/templates/multi-cluster-ingress.yaml | 2 +- .../bucketeer/charts/api/templates/multi-cluster-service.yaml | 2 +- manifests/bucketeer/charts/api/values.yaml | 1 + .../charts/web/templates/multi-cluster-backend-config.yaml | 2 +- .../bucketeer/charts/web/templates/multi-cluster-ingress.yaml | 2 +- .../bucketeer/charts/web/templates/multi-cluster-service.yaml | 2 +- manifests/bucketeer/charts/web/values.yaml | 1 + 8 files changed, 8 insertions(+), 6 deletions(-) diff --git a/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml b/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml index 996b3c1119..92b9640a62 100644 --- a/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml +++ b/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.env.gcpEnabled .Values.gcpMultiCluster.enabled }} +{{- if and .Values.env.gcpEnabled .Values.gcpMultiCluster.enabled .Values.gcpMultiCluster.configCluster }} apiVersion: cloud.google.com/v1beta1 kind: BackendConfig metadata: diff --git a/manifests/bucketeer/charts/api/templates/multi-cluster-ingress.yaml b/manifests/bucketeer/charts/api/templates/multi-cluster-ingress.yaml index d06273abc1..19d72a07b0 100644 --- a/manifests/bucketeer/charts/api/templates/multi-cluster-ingress.yaml +++ b/manifests/bucketeer/charts/api/templates/multi-cluster-ingress.yaml @@ -1,4 +1,4 @@ -{{- if .Values.gcpMultiCluster.enabled }} +{{- if and .Values.gcpMultiCluster.enabled .Values.gcpMultiCluster.configCluster }} apiVersion: networking.gke.io/v1 kind: MultiClusterIngress metadata: diff --git a/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml b/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml index e88fe8d65a..1a56dc99dd 100644 --- a/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml +++ b/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml @@ -1,4 +1,4 @@ -{{- if .Values.gcpMultiCluster.enabled }} +{{- if and .Values.gcpMultiCluster.enabled .Values.gcpMultiCluster.configCluster }} apiVersion: networking.gke.io/v1 kind: MultiClusterService metadata: diff --git a/manifests/bucketeer/charts/api/values.yaml b/manifests/bucketeer/charts/api/values.yaml index fe653667de..8fd98d98c3 100644 --- a/manifests/bucketeer/charts/api/values.yaml +++ b/manifests/bucketeer/charts/api/values.yaml @@ -87,6 +87,7 @@ resources: {} serviceAccount: annotations: {} gcpMultiCluster: + configCluster: false enabled: false service: name: api-multi-cluster-service diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml index c3024fa838..c4620e8e89 100644 --- a/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.env.gcpEnabled .Values.gcpMultiCluster.enabled }} +{{- if and .Values.env.gcpEnabled .Values.gcpMultiCluster.enabled .Values.gcpMultiCluster.configCluster }} apiVersion: cloud.google.com/v1 kind: BackendConfig metadata: diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml index c4036f6cf2..a88ef5662a 100644 --- a/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-ingress.yaml @@ -1,4 +1,4 @@ -{{- if .Values.gcpMultiCluster.enabled }} +{{- if and .Values.gcpMultiCluster.enabled .Values.gcpMultiCluster.configCluster }} apiVersion: networking.gke.io/v1 kind: MultiClusterIngress metadata: diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml index c1327ea088..eab9c1894e 100644 --- a/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml @@ -1,4 +1,4 @@ -{{- if .Values.gcpMultiCluster.enabled }} +{{- if and .Values.gcpMultiCluster.enabled .Values.gcpMultiCluster.configCluster }} apiVersion: networking.gke.io/v1 kind: MultiClusterService metadata: diff --git a/manifests/bucketeer/charts/web/values.yaml b/manifests/bucketeer/charts/web/values.yaml index 5e1c239873..4938be3a62 100644 --- a/manifests/bucketeer/charts/web/values.yaml +++ b/manifests/bucketeer/charts/web/values.yaml @@ -145,6 +145,7 @@ ingress: port: number: 9003 gcpMultiCluster: + configCluster: false enabled: false service: name: web-multi-cluster-service From 43b97fe144e9a11d238849fe8ae1b0e7e2bc979b Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Fri, 6 Sep 2024 14:55:01 +0800 Subject: [PATCH 15/19] chore: remove config cluster option for backend config --- .../charts/api/templates/multi-cluster-backend-config.yaml | 2 +- .../charts/web/templates/multi-cluster-backend-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml b/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml index 92b9640a62..996b3c1119 100644 --- a/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml +++ b/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.env.gcpEnabled .Values.gcpMultiCluster.enabled .Values.gcpMultiCluster.configCluster }} +{{- if and .Values.env.gcpEnabled .Values.gcpMultiCluster.enabled }} apiVersion: cloud.google.com/v1beta1 kind: BackendConfig metadata: diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml index c4620e8e89..c3024fa838 100644 --- a/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.env.gcpEnabled .Values.gcpMultiCluster.enabled .Values.gcpMultiCluster.configCluster }} +{{- if and .Values.env.gcpEnabled .Values.gcpMultiCluster.enabled }} apiVersion: cloud.google.com/v1 kind: BackendConfig metadata: From edcb55e6accd05b6a35cc390c8166270f3427a9e Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Mon, 9 Sep 2024 09:16:56 +0800 Subject: [PATCH 16/19] chore: keep standard svc --- .../charts/api/templates/backend-config.yaml | 2 +- .../templates/multi-cluster-backend-config.yaml | 14 -------------- .../api/templates/multi-cluster-service.yaml | 2 +- .../bucketeer/charts/api/templates/service.yaml | 6 ++---- .../charts/web/templates/backend-config.yaml | 2 +- .../templates/multi-cluster-backend-config.yaml | 14 -------------- .../web/templates/multi-cluster-service.yaml | 2 +- .../bucketeer/charts/web/templates/service.yaml | 6 ++---- manifests/bucketeer/charts/web/values.yaml | 1 - 9 files changed, 8 insertions(+), 41 deletions(-) delete mode 100644 manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml delete mode 100644 manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml diff --git a/manifests/bucketeer/charts/api/templates/backend-config.yaml b/manifests/bucketeer/charts/api/templates/backend-config.yaml index d797eb1b37..0ab358b21a 100644 --- a/manifests/bucketeer/charts/api/templates/backend-config.yaml +++ b/manifests/bucketeer/charts/api/templates/backend-config.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.env.gcpEnabled (not .Values.gcpMultiCluster.enabled) }} +{{- if .Values.env.gcpEnabled }} apiVersion: cloud.google.com/v1beta1 kind: BackendConfig metadata: diff --git a/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml b/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml deleted file mode 100644 index 996b3c1119..0000000000 --- a/manifests/bucketeer/charts/api/templates/multi-cluster-backend-config.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if and .Values.env.gcpEnabled .Values.gcpMultiCluster.enabled }} -apiVersion: cloud.google.com/v1beta1 -kind: BackendConfig -metadata: - name: {{ template "api.fullname" . }}-mcs-backend-config - namespace: {{ .Values.namespace }} -spec: - healthCheck: - requestPath: /health - type: HTTP2 - timeoutSec: 40 - connectionDraining: - drainingTimeoutSec: 60 -{{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml b/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml index 1a56dc99dd..38c15ef35b 100644 --- a/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml +++ b/manifests/bucketeer/charts/api/templates/multi-cluster-service.yaml @@ -10,7 +10,7 @@ metadata: release: {{ template "api.fullname" . }} heritage: {{ .Release.Service }} annotations: - cloud.google.com/backend-config: '{"ports": {"{{ .Values.service.externalPort }}":"{{ template "api.fullname" . }}-mcs-backend-config"}}' + cloud.google.com/backend-config: '{"ports": {"{{ .Values.service.externalPort }}":"{{ template "api.fullname" . }}"}}' networking.gke.io/app-protocols: '{"service":"HTTP2"}' cloud.google.com/neg: '{"ingress": true}' spec: diff --git a/manifests/bucketeer/charts/api/templates/service.yaml b/manifests/bucketeer/charts/api/templates/service.yaml index dc194a1553..c5e1b97b0d 100644 --- a/manifests/bucketeer/charts/api/templates/service.yaml +++ b/manifests/bucketeer/charts/api/templates/service.yaml @@ -1,4 +1,3 @@ -{{- if not .Values.gcpMultiCluster.enabled }} apiVersion: v1 kind: Service metadata: @@ -16,7 +15,7 @@ metadata: envoy: "true" metrics: "true" spec: - type: NodePort + type: ClusterIP ports: - name: service port: {{ .Values.service.externalPort }} @@ -30,5 +29,4 @@ spec: protocol: TCP selector: app: {{ template "api.name" . }} - release: {{ template "api.fullname" . }} -{{- end }} \ No newline at end of file + release: {{ template "api.fullname" . }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/web/templates/backend-config.yaml b/manifests/bucketeer/charts/web/templates/backend-config.yaml index 781d73be35..4b33ebad2e 100644 --- a/manifests/bucketeer/charts/web/templates/backend-config.yaml +++ b/manifests/bucketeer/charts/web/templates/backend-config.yaml @@ -1,4 +1,4 @@ -{{- if and .Values.env.gcpEnabled (not .Values.gcpMultiCluster.enabled) }} +{{- if .Values.env.gcpEnabled }} apiVersion: cloud.google.com/v1 kind: BackendConfig metadata: diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml deleted file mode 100644 index c3024fa838..0000000000 --- a/manifests/bucketeer/charts/web/templates/multi-cluster-backend-config.yaml +++ /dev/null @@ -1,14 +0,0 @@ -{{- if and .Values.env.gcpEnabled .Values.gcpMultiCluster.enabled }} -apiVersion: cloud.google.com/v1 -kind: BackendConfig -metadata: - name: {{ template "web.fullname" . }}-mcs-backend-config - namespace: {{ .Values.namespace }} -spec: - healthCheck: - requestPath: /health - type: HTTP2 - timeoutSec: 300 - connectionDraining: - drainingTimeoutSec: 60 -{{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml b/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml index eab9c1894e..307d1e7001 100644 --- a/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml +++ b/manifests/bucketeer/charts/web/templates/multi-cluster-service.yaml @@ -10,7 +10,7 @@ metadata: release: {{ template "web.fullname" . }} heritage: {{ .Release.Service }} annotations: - cloud.google.com/backend-config: '{"ports": {"{{ .Values.service.httpPort }}":"{{ template "web.fullname" . }}-mcs-backend-config"}}' + cloud.google.com/backend-config: '{"ports": {"{{ .Values.service.httpPort }}":"{{ template "web.fullname" . }}"}}' networking.gke.io/app-protocols: '{"http-service":"HTTP2"}' cloud.google.com/neg: '{"ingress": true}' spec: diff --git a/manifests/bucketeer/charts/web/templates/service.yaml b/manifests/bucketeer/charts/web/templates/service.yaml index 36e7e7537f..f15ea2f5fe 100644 --- a/manifests/bucketeer/charts/web/templates/service.yaml +++ b/manifests/bucketeer/charts/web/templates/service.yaml @@ -1,4 +1,3 @@ -{{- if not .Values.gcpMultiCluster.enabled }} apiVersion: v1 kind: Service metadata: @@ -16,7 +15,7 @@ metadata: envoy: "true" metrics: "true" spec: - type: {{ .Values.service.type }} + type: ClusterIP ports: - name: grpc-service port: {{ .Values.service.grpcPort }} @@ -34,5 +33,4 @@ spec: protocol: TCP selector: app: {{ template "web.name" . }} - release: {{ template "web.fullname" . }} -{{- end }} \ No newline at end of file + release: {{ template "web.fullname" . }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/web/values.yaml b/manifests/bucketeer/charts/web/values.yaml index 4938be3a62..307a7e4fa7 100644 --- a/manifests/bucketeer/charts/web/values.yaml +++ b/manifests/bucketeer/charts/web/values.yaml @@ -118,7 +118,6 @@ envoy: adminPort: 8001 resources: {} service: - type: NodePort grpcPort: 9000 httpPort: 9003 health: From 6c9431ef2cc6a44a7458fe5520f31896972089b3 Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Mon, 9 Sep 2024 16:02:29 +0800 Subject: [PATCH 17/19] chore: NOTES.txt --- .../bucketeer/charts/web/templates/NOTES.txt | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/manifests/bucketeer/charts/web/templates/NOTES.txt b/manifests/bucketeer/charts/web/templates/NOTES.txt index d34c3e7216..306ea12987 100644 --- a/manifests/bucketeer/charts/web/templates/NOTES.txt +++ b/manifests/bucketeer/charts/web/templates/NOTES.txt @@ -1,15 +1,3 @@ -1. Get the application URL by running these commands: -{{- if contains "NodePort" .Values.service.type }} - export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "web.fullname" . }}) - export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") - echo http://$NODE_IP:$NODE_PORT -{{- else if contains "LoadBalancer" .Values.service.type }} - NOTE: It may take a few minutes for the LoadBalancer IP to be available. - You can watch the status of by running 'kubectl get svc -w {{ template "web.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "web.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') - echo http://$SERVICE_IP:{{ .Values.service.port }} -{{- else if contains "ClusterIP" .Values.service.type }} - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "web.name" . }},release={{ template "web.fullname" . }}" -o jsonpath="{.items[0].metadata.name}") - echo "Visit http://127.0.0.1:8080 to use your application" - kubectl port-forward $POD_NAME 8080:80 -{{- end }} +export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "api.fullname" . }}) +export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") +echo http://$NODE_IP:$NODE_PORT \ No newline at end of file From ddb9c88fbeb0f33e69cab080fcb410e40cc32be4 Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Mon, 9 Sep 2024 16:15:21 +0800 Subject: [PATCH 18/19] chore: empty NOTES.txt --- manifests/bucketeer/charts/api/templates/NOTES.txt | 3 --- manifests/bucketeer/charts/web/templates/NOTES.txt | 3 --- 2 files changed, 6 deletions(-) diff --git a/manifests/bucketeer/charts/api/templates/NOTES.txt b/manifests/bucketeer/charts/api/templates/NOTES.txt index 306ea12987..e69de29bb2 100644 --- a/manifests/bucketeer/charts/api/templates/NOTES.txt +++ b/manifests/bucketeer/charts/api/templates/NOTES.txt @@ -1,3 +0,0 @@ -export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "api.fullname" . }}) -export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") -echo http://$NODE_IP:$NODE_PORT \ No newline at end of file diff --git a/manifests/bucketeer/charts/web/templates/NOTES.txt b/manifests/bucketeer/charts/web/templates/NOTES.txt index 306ea12987..e69de29bb2 100644 --- a/manifests/bucketeer/charts/web/templates/NOTES.txt +++ b/manifests/bucketeer/charts/web/templates/NOTES.txt @@ -1,3 +0,0 @@ -export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "api.fullname" . }}) -export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") -echo http://$NODE_IP:$NODE_PORT \ No newline at end of file From 7f9d85bebe679814b5db8c758c15da43e7f924d7 Mon Sep 17 00:00:00 2001 From: Cyka <1354250064mdzz@gmail.com> Date: Mon, 9 Sep 2024 16:23:54 +0800 Subject: [PATCH 19/19] chore: service type --- manifests/bucketeer/charts/api/templates/NOTES.txt | 14 ++++++++++++++ .../bucketeer/charts/api/templates/service.yaml | 2 +- manifests/bucketeer/charts/api/values.yaml | 1 + manifests/bucketeer/charts/web/templates/NOTES.txt | 14 ++++++++++++++ .../bucketeer/charts/web/templates/service.yaml | 2 +- manifests/bucketeer/charts/web/values.yaml | 1 + 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/manifests/bucketeer/charts/api/templates/NOTES.txt b/manifests/bucketeer/charts/api/templates/NOTES.txt index e69de29bb2..11448c5114 100644 --- a/manifests/bucketeer/charts/api/templates/NOTES.txt +++ b/manifests/bucketeer/charts/api/templates/NOTES.txt @@ -0,0 +1,14 @@ +{{- if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "api.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get svc -w {{ template "api.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "api.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + echo http://$SERVICE_IP:{{ .Values.service.externalPort }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "api.name" . }},release={{ template "api.fullname" . }}" -o jsonpath="{.items[0].metadata.name}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl port-forward $POD_NAME 8080:80 +{{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/api/templates/service.yaml b/manifests/bucketeer/charts/api/templates/service.yaml index c5e1b97b0d..24dc736c0b 100644 --- a/manifests/bucketeer/charts/api/templates/service.yaml +++ b/manifests/bucketeer/charts/api/templates/service.yaml @@ -15,7 +15,7 @@ metadata: envoy: "true" metrics: "true" spec: - type: ClusterIP + type: {{ .Values.service.type }} ports: - name: service port: {{ .Values.service.externalPort }} diff --git a/manifests/bucketeer/charts/api/values.yaml b/manifests/bucketeer/charts/api/values.yaml index 8fd98d98c3..9146aca00f 100644 --- a/manifests/bucketeer/charts/api/values.yaml +++ b/manifests/bucketeer/charts/api/values.yaml @@ -62,6 +62,7 @@ envoy: maxRequests: 3500 maxConnections: 3500 service: + type: ClusterIP externalPort: 9000 ingress: name: api diff --git a/manifests/bucketeer/charts/web/templates/NOTES.txt b/manifests/bucketeer/charts/web/templates/NOTES.txt index e69de29bb2..062a64fee7 100644 --- a/manifests/bucketeer/charts/web/templates/NOTES.txt +++ b/manifests/bucketeer/charts/web/templates/NOTES.txt @@ -0,0 +1,14 @@ +{{- if contains "NodePort" .Values.service.type }} + export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "web.fullname" . }}) + export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") + echo http://$NODE_IP:$NODE_PORT +{{- else if contains "LoadBalancer" .Values.service.type }} + NOTE: It may take a few minutes for the LoadBalancer IP to be available. + You can watch the status of by running 'kubectl get svc -w {{ template "web.fullname" . }}' + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "web.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + echo http://$SERVICE_IP:{{ .Values.service.httpPort }} +{{- else if contains "ClusterIP" .Values.service.type }} + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "web.name" . }},release={{ template "web.fullname" . }}" -o jsonpath="{.items[0].metadata.name}") + echo "Visit http://127.0.0.1:8080 to use your application" + kubectl port-forward $POD_NAME 8080:80 +{{- end }} \ No newline at end of file diff --git a/manifests/bucketeer/charts/web/templates/service.yaml b/manifests/bucketeer/charts/web/templates/service.yaml index f15ea2f5fe..c72531af8f 100644 --- a/manifests/bucketeer/charts/web/templates/service.yaml +++ b/manifests/bucketeer/charts/web/templates/service.yaml @@ -15,7 +15,7 @@ metadata: envoy: "true" metrics: "true" spec: - type: ClusterIP + type: {{ .Values.service.type }} ports: - name: grpc-service port: {{ .Values.service.grpcPort }} diff --git a/manifests/bucketeer/charts/web/values.yaml b/manifests/bucketeer/charts/web/values.yaml index 307a7e4fa7..485b17ac82 100644 --- a/manifests/bucketeer/charts/web/values.yaml +++ b/manifests/bucketeer/charts/web/values.yaml @@ -118,6 +118,7 @@ envoy: adminPort: 8001 resources: {} service: + type: ClusterIP grpcPort: 9000 httpPort: 9003 health: