From d3e63f2fc0a88b41c947bd9cc4065f976080dc53 Mon Sep 17 00:00:00 2001 From: zhenyus Date: Fri, 7 Mar 2025 03:25:26 +0800 Subject: [PATCH] feat(helm): update Gitea configuration and add certificates for alpha and production environments Signed-off-by: zhenyus --- ...ertificate.yaml => certificate-alpha.yaml} | 0 .../3rd/gitea/patch/certificate-prod.yaml | 13 ++++ freeleaps/helm-pkg/3rd/gitea/values.prod.yaml | 33 +++++----- freeleaps/helm-pkg/devsvc/values.prod.yaml | 60 +++++++++++++++++++ 4 files changed, 92 insertions(+), 14 deletions(-) rename freeleaps/helm-pkg/3rd/gitea/patch/{certificate.yaml => certificate-alpha.yaml} (100%) create mode 100644 freeleaps/helm-pkg/3rd/gitea/patch/certificate-prod.yaml diff --git a/freeleaps/helm-pkg/3rd/gitea/patch/certificate.yaml b/freeleaps/helm-pkg/3rd/gitea/patch/certificate-alpha.yaml similarity index 100% rename from freeleaps/helm-pkg/3rd/gitea/patch/certificate.yaml rename to freeleaps/helm-pkg/3rd/gitea/patch/certificate-alpha.yaml diff --git a/freeleaps/helm-pkg/3rd/gitea/patch/certificate-prod.yaml b/freeleaps/helm-pkg/3rd/gitea/patch/certificate-prod.yaml new file mode 100644 index 00000000..3cab5f8f --- /dev/null +++ b/freeleaps/helm-pkg/3rd/gitea/patch/certificate-prod.yaml @@ -0,0 +1,13 @@ +apiVersion: cert-manager.io/v1 +kind: Certificate +metadata: + name: gitea.freeleaps.mathmast.com-cert + namespace: freeleaps-prod +spec: + commonName: gitea.freeleaps.mathmast.com + dnsNames: + - gitea.freeleaps.mathmast.com + issuerRef: + name: mathmast-dot-com + kind: ClusterIssuer + secretName: gitea.freeleaps.mathmast.com-cert \ No newline at end of file diff --git a/freeleaps/helm-pkg/3rd/gitea/values.prod.yaml b/freeleaps/helm-pkg/3rd/gitea/values.prod.yaml index e8a01ae3..ddb18319 100644 --- a/freeleaps/helm-pkg/3rd/gitea/values.prod.yaml +++ b/freeleaps/helm-pkg/3rd/gitea/values.prod.yaml @@ -14,7 +14,7 @@ global: ## - myRegistryKeySecretName ## imagePullSecrets: [] - storageClass: "" + storageClass: "azure-disk-std-lrs" hostAliases: [] # - ip: 192.168.137.2 # hostnames: @@ -176,7 +176,10 @@ ingress: paths: - path: / pathType: Prefix - tls: [] + tls: + - secretName: gitea.freeleaps.mathmast.com-cert + hosts: + - gitea.freeleaps.mathmast.com # - secretName: chart-example-tls # hosts: # - git.example.com @@ -272,11 +275,11 @@ persistence: create: true mount: true claimName: gitea-shared-storage - size: 10Gi + size: 15Gi accessModes: - ReadWriteOnce labels: {} - storageClass: + storageClass: azure-disk-std-lrs subPath: volumeName: "" annotations: @@ -456,7 +459,7 @@ gitea: existingSecret: username: gitea_admin password: r8sA8CPHD9!bt6d - email: "gitea@local.domain" + email: "helpdesk@freeleaps.com" passwordMode: keepUpdated ## @param gitea.metrics.enabled Enable Gitea metrics @@ -467,10 +470,11 @@ gitea: ## @param gitea.metrics.serviceMonitor.scrapeTimeout Timeout after which the scrape is ended. If not specified, global Prometheus scrape timeout is used. ## @param gitea.metrics.serviceMonitor.tlsConfig TLS configuration to use when scraping the metric endpoint by Prometheus. metrics: - enabled: false + enabled: true serviceMonitor: - enabled: false - # additionalLabels: + enabled: true + additionalLabels: + release: kube-prometheus-stack # prometheus-release: prom1 interval: "" relabelings: [] @@ -514,6 +518,7 @@ gitea: ## @param gitea.config.server.SSH_PORT SSH port for rootlful Gitea image ## @param gitea.config.server.SSH_LISTEN_PORT SSH port for rootless Gitea image config: + APP_NAME: "Freeleaps Codebase Service" # APP_NAME: "Gitea: Git with a cup of tea" # RUN_MODE: dev server: @@ -652,20 +657,20 @@ postgresql-ha: global: postgresql: database: gitea - password: gitea + password: HFf#Xo4QtfK^CW?@ username: gitea enabled: true postgresql: - repmgrPassword: changeme2 - postgresPassword: changeme1 - password: changeme4 + repmgrPassword: WGZ47gbUTLvo + postgresPassword: X9H2*9M2ZWYmuZ + password: bhYmZ3ivfD@udWc@8jrB4@ pgpool: - adminPassword: changeme3 + adminPassword: Rk(*4vc%wFVu5>C| service: ports: postgresql: 5432 persistence: - size: 10Gi + size: 25Gi ## @section PostgreSQL # diff --git a/freeleaps/helm-pkg/devsvc/values.prod.yaml b/freeleaps/helm-pkg/devsvc/values.prod.yaml index e69de29b..a484c522 100644 --- a/freeleaps/helm-pkg/devsvc/values.prod.yaml +++ b/freeleaps/helm-pkg/devsvc/values.prod.yaml @@ -0,0 +1,60 @@ +global: + registry: docker.io + repository: freeleaps + nodeSelector: {} +devsvc: + replicas: 1 + image: + registry: docker.io + repository: null + name: devsvc + tag: snapshot-ab89bd4 + imagePullPolicy: IfNotPresent + ports: + - name: http + containerPort: 8007 + protocol: TCP + resources: + requests: + cpu: '100m' + memory: 128Mi + limits: + cpu: '200m' + memory: 256Mi + probes: {} + services: + - name: devsvc-service + type: ClusterIP + port: 8007 + targetPort: 8007 + ingresses: + - name: devsvc-ingress + host: alpha.devsvc.freeleaps.mathmast.com + class: nginx + rules: + - path: / + pathType: Prefix + backend: + service: + name: devsvc-service + port: + number: 8007 + tls: + exists: false + issuerRef: + name: mathmast-dot-com + kind: ClusterIssuer + name: alpha.devsvc.freeleaps.mathmast.com-cert + configs: + tz: UTC + appName: devsvc + serviceApiAccessHost: 0.0.0.0 + serviceApiAccessPort: 8007 + mongodbName: freeleaps2 + mongodbUri: mongodb://freeleaps-alpha-mongo-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/ + giteaToken: 1d90e6eba4dbe8979878d2f55d9c7a0c2ab782df + giteaUrl: http://freeleaps-alpha-gitea-http.freeleaps-alpha.svc.freeleaps.cluster:3000 + giteaDepotOrganization: products + codeDepotHttpPort: 443 + codeDepotSshPort: 22 + codeDepotDomainName: 'https://alpha.freeleaps.mathmast.com'