From 37e30009636a26d879d5e6579450fdd738a714f9 Mon Sep 17 00:00:00 2001
From: duanhongyi <duanhongyi@doopai.com>
Date: Mon, 29 Jan 2024 17:31:35 +0800
Subject: [PATCH 01/12] chore(gateway): bump gateway api v1

---
 charts/gateway/templates/drycc-gateway.yaml | 6 +++++-
 charts/gateway/templates/drycc-route.yaml   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/charts/gateway/templates/drycc-gateway.yaml b/charts/gateway/templates/drycc-gateway.yaml
index 21fe11f..1eb0292 100644
--- a/charts/gateway/templates/drycc-gateway.yaml
+++ b/charts/gateway/templates/drycc-gateway.yaml
@@ -1,7 +1,11 @@
-apiVersion: gateway.networking.k8s.io/v1beta1
+apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
   name: drycc-gateway
+  {{- if .Values.global.certManagerEnabled}}
+  annotations:
+    cert-manager.io/issuer: drycc-issuer
+  {{- end }}
 spec:
   gatewayClassName: {{ .Values.global.gatewayClass }}
   listeners:
diff --git a/charts/gateway/templates/drycc-route.yaml b/charts/gateway/templates/drycc-route.yaml
index 87005d8..97f04e5 100644
--- a/charts/gateway/templates/drycc-route.yaml
+++ b/charts/gateway/templates/drycc-route.yaml
@@ -1,6 +1,6 @@
 {{ range $index, $app := .Values.apps }}
 ---
-apiVersion: gateway.networking.k8s.io/{{ if (eq $app.protocol "HTTP") }}v1beta1{{ else }}v1alpha2{{ end }}
+apiVersion: gateway.networking.k8s.io/{{ if (eq $app.protocol "HTTP") }}v1{{ else }}v1alpha2{{ end }}
 kind: {{ $app.protocol }}Route
 metadata:
   name: {{ $app.name }}

From e00ed58397141689ac06b80a81217722514375d0 Mon Sep 17 00:00:00 2001
From: duanhongyi <duanhongyi@doopai.com>
Date: Wed, 6 Mar 2024 13:45:26 +0800
Subject: [PATCH 02/12] chore(gateway): change secrets name

---
 .../templates/{drycc-certificate.yaml => certificate.yaml}  | 4 ++--
 .../gateway/templates/{drycc-gateway.yaml => gateway.yaml}  | 4 ++--
 .../{drycc-issuer-secret.yaml => issuer-secret.yaml}        | 2 +-
 charts/gateway/templates/{drycc-issuer.yaml => issuer.yaml} | 6 +++---
 charts/gateway/templates/{drycc-route.yaml => route.yaml}   | 0
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename charts/gateway/templates/{drycc-certificate.yaml => certificate.yaml} (86%)
 rename charts/gateway/templates/{drycc-gateway.yaml => gateway.yaml} (93%)
 rename charts/gateway/templates/{drycc-issuer-secret.yaml => issuer-secret.yaml} (92%)
 rename charts/gateway/templates/{drycc-issuer.yaml => issuer.yaml} (90%)
 rename charts/gateway/templates/{drycc-route.yaml => route.yaml} (100%)

diff --git a/charts/gateway/templates/drycc-certificate.yaml b/charts/gateway/templates/certificate.yaml
similarity index 86%
rename from charts/gateway/templates/drycc-certificate.yaml
rename to charts/gateway/templates/certificate.yaml
index a1d491a..13251ce 100644
--- a/charts/gateway/templates/drycc-certificate.yaml
+++ b/charts/gateway/templates/certificate.yaml
@@ -12,8 +12,8 @@ spec:
   {{- end }}
   issuerRef:
     kind: Issuer
-    name: drycc-issuer
+    name: gateway-issuer
   privateKey:
     rotationPolicy: Always
-  secretName: drycc-auto-tls
+  secretName: gateway-auto-tls
 {{- end }}
diff --git a/charts/gateway/templates/drycc-gateway.yaml b/charts/gateway/templates/gateway.yaml
similarity index 93%
rename from charts/gateway/templates/drycc-gateway.yaml
rename to charts/gateway/templates/gateway.yaml
index 1eb0292..cf6d019 100644
--- a/charts/gateway/templates/drycc-gateway.yaml
+++ b/charts/gateway/templates/gateway.yaml
@@ -4,7 +4,7 @@ metadata:
   name: drycc-gateway
   {{- if .Values.global.certManagerEnabled}}
   annotations:
-    cert-manager.io/issuer: drycc-issuer
+    cert-manager.io/issuer: gateway-issuer
   {{- end }}
 spec:
   gatewayClassName: {{ .Values.global.gatewayClass }}
@@ -30,7 +30,7 @@ spec:
       certificateRefs:
       - group: ""
         kind: Secret
-        name: drycc-auto-tls
+        name: gateway-auto-tls
       mode: Terminate
     allowedRoutes:
       namespaces:
diff --git a/charts/gateway/templates/drycc-issuer-secret.yaml b/charts/gateway/templates/issuer-secret.yaml
similarity index 92%
rename from charts/gateway/templates/drycc-issuer-secret.yaml
rename to charts/gateway/templates/issuer-secret.yaml
index 4d69efc..01fad67 100644
--- a/charts/gateway/templates/drycc-issuer-secret.yaml
+++ b/charts/gateway/templates/issuer-secret.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: drycc-issuer-secret
+  name: gateway-issuer-secret
   labels:
     heritage: drycc
 type: Opaque
diff --git a/charts/gateway/templates/drycc-issuer.yaml b/charts/gateway/templates/issuer.yaml
similarity index 90%
rename from charts/gateway/templates/drycc-issuer.yaml
rename to charts/gateway/templates/issuer.yaml
index b0d46da..b6557c8 100644
--- a/charts/gateway/templates/drycc-issuer.yaml
+++ b/charts/gateway/templates/issuer.yaml
@@ -2,7 +2,7 @@
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
-  name: drycc-issuer
+  name: gateway-issuer
 spec:
   acme:
     # Email address used for ACME registration
@@ -13,12 +13,12 @@ spec:
     externalAccountBinding:
       keyID: {{ .Values.acme.externalAccountBinding.keyID }}
       keySecretRef:
-        name: drycc-issuer-secret
+        name: gateway-issuer-secret
         key: secret
     {{ end }}
     # Name of a secret used to store the ACME account private key
     privateKeySecretRef:
-      name: drycc-issuer
+      name: gateway-issuer
     # Enable HTTP01 validations
     # http01: {}
     solvers:
diff --git a/charts/gateway/templates/drycc-route.yaml b/charts/gateway/templates/route.yaml
similarity index 100%
rename from charts/gateway/templates/drycc-route.yaml
rename to charts/gateway/templates/route.yaml

From 98325e241451a0f9b7b7d8acb05e7723ff04f8dc Mon Sep 17 00:00:00 2001
From: duanhongyi <duanhongyi@doopai.com>
Date: Mon, 18 Mar 2024 16:43:53 +0800
Subject: [PATCH 03/12] chore(woodpecker): migrations woodpecker-ci to 2

---
 .woodpecker.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 2c2aad1..3c4c2d2 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -1,11 +1,9 @@
-platform: linux/amd64
-
 labels:
   type: exec
+  platform: linux/amd64
 
-pipeline:
+steps:
 - name: generate-chart
-  type: local
   image: bash
   commands:
   - export VERSION=$(sed 's#v##' <<< $CI_COMMIT_TAG)

From 5f2f6c40ccf9d57d4ad2a2419573fe56bda7e242 Mon Sep 17 00:00:00 2001
From: duanhongyi <duanhongyi@doopai.com>
Date: Wed, 20 Mar 2024 14:18:16 +0800
Subject: [PATCH 04/12] chore(charts): change canary app version

---
 .woodpecker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker.yml b/.woodpecker.yml
index 3c4c2d2..7399b70 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -8,7 +8,7 @@ steps:
   commands:
   - export VERSION=$(sed 's#v##' <<< $CI_COMMIT_TAG)
   - export IMAGE_TAG=$([ ! -z $CI_COMMIT_TAG ] && echo \"$VERSION\" || echo \"canary\")
-  - export APP_VERSION=$([ ! -z $CI_COMMIT_TAG ] && echo $VERSION || echo 1.0.0)
+  - export APP_VERSION=$([ -z $CI_COMMIT_TAG ] && echo $CI_COMMIT_SHA || echo $VERSION)
   - export CHART_VERSION=$([ -z $CI_COMMIT_TAG ] && echo 1.0.0 || echo $VERSION)
   - sed -i "s/imageTag:\ \"canary\"/imageTag:\ $IMAGE_TAG/g" charts/$${CI_REPO_NAME}/values.yaml
   - helm package -u charts/$${CI_REPO_NAME} --version $CHART_VERSION --app-version $APP_VERSION

From aaf875321e225b3259ca71db03d55c24d2102579 Mon Sep 17 00:00:00 2001
From: duanhongyi <duanhongyi@doopai.com>
Date: Mon, 8 Apr 2024 08:41:11 +0800
Subject: [PATCH 05/12] fix(cert-manager): auto tls error

---
 charts/gateway/templates/certificate.yaml   | 6 +++---
 charts/gateway/templates/gateway.yaml       | 4 ++--
 charts/gateway/templates/issuer-secret.yaml | 2 +-
 charts/gateway/templates/issuer.yaml        | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/charts/gateway/templates/certificate.yaml b/charts/gateway/templates/certificate.yaml
index 13251ce..ca93b38 100644
--- a/charts/gateway/templates/certificate.yaml
+++ b/charts/gateway/templates/certificate.yaml
@@ -2,7 +2,7 @@
 apiVersion: cert-manager.io/v1
 kind: Certificate
 metadata:
-  name: drycc-certificate
+  name: drycc-auto-tls
 spec:
   dnsNames:
   {{- range $app := .Values.apps }}
@@ -12,8 +12,8 @@ spec:
   {{- end }}
   issuerRef:
     kind: Issuer
-    name: gateway-issuer
+    name: drycc-issuer
   privateKey:
     rotationPolicy: Always
-  secretName: gateway-auto-tls
+  secretName: drycc-auto-tls
 {{- end }}
diff --git a/charts/gateway/templates/gateway.yaml b/charts/gateway/templates/gateway.yaml
index cf6d019..1eb0292 100644
--- a/charts/gateway/templates/gateway.yaml
+++ b/charts/gateway/templates/gateway.yaml
@@ -4,7 +4,7 @@ metadata:
   name: drycc-gateway
   {{- if .Values.global.certManagerEnabled}}
   annotations:
-    cert-manager.io/issuer: gateway-issuer
+    cert-manager.io/issuer: drycc-issuer
   {{- end }}
 spec:
   gatewayClassName: {{ .Values.global.gatewayClass }}
@@ -30,7 +30,7 @@ spec:
       certificateRefs:
       - group: ""
         kind: Secret
-        name: gateway-auto-tls
+        name: drycc-auto-tls
       mode: Terminate
     allowedRoutes:
       namespaces:
diff --git a/charts/gateway/templates/issuer-secret.yaml b/charts/gateway/templates/issuer-secret.yaml
index 01fad67..4d69efc 100644
--- a/charts/gateway/templates/issuer-secret.yaml
+++ b/charts/gateway/templates/issuer-secret.yaml
@@ -3,7 +3,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: gateway-issuer-secret
+  name: drycc-issuer-secret
   labels:
     heritage: drycc
 type: Opaque
diff --git a/charts/gateway/templates/issuer.yaml b/charts/gateway/templates/issuer.yaml
index b6557c8..b0d46da 100644
--- a/charts/gateway/templates/issuer.yaml
+++ b/charts/gateway/templates/issuer.yaml
@@ -2,7 +2,7 @@
 apiVersion: cert-manager.io/v1
 kind: Issuer
 metadata:
-  name: gateway-issuer
+  name: drycc-issuer
 spec:
   acme:
     # Email address used for ACME registration
@@ -13,12 +13,12 @@ spec:
     externalAccountBinding:
       keyID: {{ .Values.acme.externalAccountBinding.keyID }}
       keySecretRef:
-        name: gateway-issuer-secret
+        name: drycc-issuer-secret
         key: secret
     {{ end }}
     # Name of a secret used to store the ACME account private key
     privateKeySecretRef:
-      name: gateway-issuer
+      name: drycc-issuer
     # Enable HTTP01 validations
     # http01: {}
     solvers:

From 68acf15d62a12f8dc4f1cb2a4c121702b6c1c68c Mon Sep 17 00:00:00 2001
From: duanhongyi <duanhongyi@doopai.com>
Date: Mon, 18 Nov 2024 16:40:14 +0800
Subject: [PATCH 06/12] 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 <duanhongyi@doopai.com>
Date: Mon, 23 Dec 2024 14:14:20 +0800
Subject: [PATCH 07/12] 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 <duanhongyi@doopai.com>
Date: Wed, 26 Mar 2025 18:20:36 +0800
Subject: [PATCH 08/12] 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 <duanhongyi@doopai.com>
Date: Tue, 13 May 2025 13:46:49 +0800
Subject: [PATCH 09/12] 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 <duanhongyi@users.noreply.github.com>
Date: Thu, 22 May 2025 09:07:34 +0800
Subject: [PATCH 10/12] 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 <duanhongyi@doopai.com>
Date: Wed, 3 Sep 2025 16:16:42 +0800
Subject: [PATCH 11/12] 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 <duanhongyi@users.noreply.github.com>
Date: Mon, 20 Oct 2025 09:43:58 +0800
Subject: [PATCH 12/12] 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 }}
