From 68acf15d62a12f8dc4f1cb2a4c121702b6c1c68c Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Mon, 18 Nov 2024 16:40:14 +0800 Subject: [PATCH 1/7] chore(charts): change drycc-monitor-grafana to drycc-grafana --- charts/gateway/values.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/gateway/values.yaml b/charts/gateway/values.yaml index 5a8f9e8..64210cd 100644 --- a/charts/gateway/values.yaml +++ b/charts/gateway/values.yaml @@ -27,6 +27,13 @@ apps: services: - name: drycc-rabbitmq port: 15672 + - name: drycc-grafana + port: 80 + hostname: drycc-grafana.{{ .Values.global.platformDomain }} + protocol: HTTP + services: + - name: drycc-grafana + port: 80 - name: drycc-passport port: 80 hostname: drycc-passport.{{ .Values.global.platformDomain }} @@ -41,13 +48,6 @@ apps: services: - name: drycc-prometheus port: 9090 - - name: drycc-monitor-grafana - port: 80 - hostname: drycc-monitor-grafana.{{ .Values.global.platformDomain }} - protocol: HTTP - services: - - name: drycc-monitor-grafana - port: 80 global: # Admin email, used for each component to send email to administrator From 5b99a193101010e32a439f4f1b0fb0163a90039d Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Mon, 23 Dec 2024 14:14:20 +0800 Subject: [PATCH 2/7] fix(wooddpecker): secsets are deprecated --- .woodpecker.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index 7399b70..1f79e0b 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -14,11 +14,15 @@ steps: - helm package -u charts/$${CI_REPO_NAME} --version $CHART_VERSION --app-version $APP_VERSION - echo $CONTAINER_PASSWORD | helm registry login $DRYCC_REGISTRY -u $CONTAINER_USERNAME --password-stdin - helm push $${CI_REPO_NAME}-$CHART_VERSION.tgz oci://$DRYCC_REGISTRY/$([ -z $CI_COMMIT_TAG ] && echo charts-testing || echo charts) - secrets: - - dev_registry - - drycc_registry - - container_username - - container_password + environment: + DEV_REGISTRY: + from_secret: dev_registry + DRYCC_REGISTRY: + from_secret: drycc_registry + CONTAINER_USERNAME: + from_secret: container_username + CONTAINER_PASSWORD: + from_secret: container_password when: event: - push From 75a76a578690ad9ed6d8a4fca1de54dc700324bb Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Wed, 26 Mar 2025 18:20:36 +0800 Subject: [PATCH 3/7] feat(charts): add storage console --- charts/gateway/values.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/charts/gateway/values.yaml b/charts/gateway/values.yaml index 64210cd..cd64167 100644 --- a/charts/gateway/values.yaml +++ b/charts/gateway/values.yaml @@ -27,6 +27,13 @@ apps: services: - name: drycc-rabbitmq port: 15672 + - name: drycc-storage + port: 80 + hostname: drycc-storage.{{ .Values.global.platformDomain }} + protocol: HTTP + services: + - name: drycc-storage + port: 9001 - name: drycc-grafana port: 80 hostname: drycc-grafana.{{ .Values.global.platformDomain }} From 3619f86932655169ef66df01d1dc49d0027ba7a5 Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Tue, 13 May 2025 13:46:49 +0800 Subject: [PATCH 4/7] chore(gateway): remove global gateway class --- charts/gateway/templates/gateway.yaml | 2 +- charts/gateway/values.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/charts/gateway/templates/gateway.yaml b/charts/gateway/templates/gateway.yaml index 1eb0292..1d01e76 100644 --- a/charts/gateway/templates/gateway.yaml +++ b/charts/gateway/templates/gateway.yaml @@ -7,7 +7,7 @@ metadata: cert-manager.io/issuer: drycc-issuer {{- end }} spec: - gatewayClassName: {{ .Values.global.gatewayClass }} + gatewayClassName: {{ .Values.gatewayClass }} listeners: {{- range $index, $app := .Values.apps }} - name: {{ printf "%s-%v-%d" $app.protocol $app.port $index | lower }} diff --git a/charts/gateway/values.yaml b/charts/gateway/values.yaml index cd64167..93d7be9 100644 --- a/charts/gateway/values.yaml +++ b/charts/gateway/values.yaml @@ -1,3 +1,7 @@ + +# GatewayClass is cluster-scoped resource defined by the infrastructure provider. +gatewayClass: "" + # acme configuration takes effect if and only if certManagerEnabled is true acme: server: https://acme-v02.api.letsencrypt.org/directory @@ -59,7 +63,6 @@ apps: global: # Admin email, used for each component to send email to administrator email: "drycc@drycc.cc" - gatewayClass: "" # The publicly resolvable hostname to build your cluster with. # # This will be the hostname that is used to build endpoints such as "drycc.$HOSTNAME" From 4accb88d1455adbc825abb07899e9c27edcc770d Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Thu, 22 May 2025 09:07:34 +0800 Subject: [PATCH 5/7] chore(charts): remove prometheus gateway --- charts/gateway/values.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/charts/gateway/values.yaml b/charts/gateway/values.yaml index 93d7be9..98f8019 100644 --- a/charts/gateway/values.yaml +++ b/charts/gateway/values.yaml @@ -52,13 +52,6 @@ apps: services: - name: drycc-passport port: 80 - - name: drycc-prometheus - port: 80 - hostname: drycc-prometheus.{{ .Values.global.platformDomain }} - protocol: HTTP - services: - - name: drycc-prometheus - port: 9090 global: # Admin email, used for each component to send email to administrator From 4a6d6cdf7b240a1a3517694bfc1681d4e1aa47fa Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Wed, 3 Sep 2025 16:16:42 +0800 Subject: [PATCH 6/7] chore(charts): add storage console --- charts/gateway/values.yaml | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/charts/gateway/values.yaml b/charts/gateway/values.yaml index 98f8019..b6b7382 100644 --- a/charts/gateway/values.yaml +++ b/charts/gateway/values.yaml @@ -31,13 +31,6 @@ apps: services: - name: drycc-rabbitmq port: 15672 - - name: drycc-storage - port: 80 - hostname: drycc-storage.{{ .Values.global.platformDomain }} - protocol: HTTP - services: - - name: drycc-storage - port: 9001 - name: drycc-grafana port: 80 hostname: drycc-grafana.{{ .Values.global.platformDomain }} @@ -52,6 +45,20 @@ apps: services: - name: drycc-passport port: 80 + - name: drycc-storage + port: 80 + hostname: drycc-storage.{{ .Values.global.platformDomain }} + protocol: HTTP + services: + - name: drycc-storage + port: 9000 + - name: drycc-storage-console + port: 80 + hostname: drycc-storage-console.{{ .Values.global.platformDomain }} + protocol: HTTP + services: + - name: drycc-storage + port: 9001 global: # Admin email, used for each component to send email to administrator From e6febd5a127ddef7bbe0a1bc258d616c3c3dd818 Mon Sep 17 00:00:00 2001 From: duanhongyi Date: Mon, 20 Oct 2025 09:43:58 +0800 Subject: [PATCH 7/7] chore(charts): remove rabbitmq --- charts/gateway/values.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/charts/gateway/values.yaml b/charts/gateway/values.yaml index b6b7382..55761d1 100644 --- a/charts/gateway/values.yaml +++ b/charts/gateway/values.yaml @@ -24,13 +24,6 @@ apps: services: - name: drycc-controller-api port: 80 - - name: drycc-rabbitmq - port: 80 - hostname: drycc-rabbitmq.{{ .Values.global.platformDomain }} - protocol: HTTP - services: - - name: drycc-rabbitmq - port: 15672 - name: drycc-grafana port: 80 hostname: drycc-grafana.{{ .Values.global.platformDomain }}