From 6ebdef8933d8849c86c9698c589b729ff7cb2a60 Mon Sep 17 00:00:00 2001 From: zhenyus Date: Fri, 11 Apr 2025 01:22:29 +0800 Subject: [PATCH] Update ingress hosts and issuer references for alpha environment Signed-off-by: zhenyus --- .../godaddy-webhook/cluster-issuer.yaml | 25 +++++++++++++++++++ .../helm-pkg/authentication/values.alpha.yaml | 6 ++--- .../helm-pkg/centralStorage/values.alpha.yaml | 6 ++--- freeleaps/helm-pkg/chat/values.alpha.yaml | 8 +++--- freeleaps/helm-pkg/content/values.alpha.yaml | 6 ++--- freeleaps/helm-pkg/devsvc/values.alpha.yaml | 6 ++--- .../helm-pkg/freeleaps/values.alpha.yaml | 8 +++--- freeleaps/helm-pkg/frontend/values.alpha.yaml | 6 ++--- .../helm-pkg/notification/values.alpha.yaml | 6 ++--- freeleaps/helm-pkg/payment/values.alpha.yaml | 8 +++--- 10 files changed, 55 insertions(+), 30 deletions(-) diff --git a/cluster/manifests/freeleaps-controls-system/godaddy-webhook/cluster-issuer.yaml b/cluster/manifests/freeleaps-controls-system/godaddy-webhook/cluster-issuer.yaml index ca79c06c..af458c4d 100644 --- a/cluster/manifests/freeleaps-controls-system/godaddy-webhook/cluster-issuer.yaml +++ b/cluster/manifests/freeleaps-controls-system/godaddy-webhook/cluster-issuer.yaml @@ -46,6 +46,31 @@ spec: - selector: dnsZones: - freeleaps.com + dns01: + webhook: + config: + apiKeySecretRef: + name: mathmast-godaddy-api-key + key: token + production: true + ttl: 600 + groupName: acme.mathmast.com + solverName: godaddy +--- +apiVersion: cert-manager.io/v1 +kind: ClusterIssuer +metadata: + name: freeleaps-alpha-dot-com +spec: + acme: + server: https://acme-v02.api.letsencrypt.org/directory + email: acme@freeleaps-alpha.com + privateKeySecretRef: + name: freeleaps-alpha-dot-com-certs + solvers: + - selector: + dnsZones: + - freeleaps-alpha.com dns01: webhook: config: diff --git a/freeleaps/helm-pkg/authentication/values.alpha.yaml b/freeleaps/helm-pkg/authentication/values.alpha.yaml index f0578eac..a6be8c40 100644 --- a/freeleaps/helm-pkg/authentication/values.alpha.yaml +++ b/freeleaps/helm-pkg/authentication/values.alpha.yaml @@ -54,7 +54,7 @@ authentication: enabled: false ingresses: - name: authentication-ingress - host: alpha.authentication.freeleaps.mathmast.com + host: authentication.freeleaps-alpha.com class: nginx rules: - path: / @@ -67,9 +67,9 @@ authentication: tls: exists: false issuerRef: - name: mathmast-dot-com + name: freeleaps-alpha-dot-com kind: ClusterIssuer - name: alpha.authentication.freeleaps.mathmast.com-cert + name: authentication.freeleaps-alpha.com-cert configs: tz: UTC appName: authentication diff --git a/freeleaps/helm-pkg/centralStorage/values.alpha.yaml b/freeleaps/helm-pkg/centralStorage/values.alpha.yaml index 71c8aae3..88598c6a 100644 --- a/freeleaps/helm-pkg/centralStorage/values.alpha.yaml +++ b/freeleaps/helm-pkg/centralStorage/values.alpha.yaml @@ -54,7 +54,7 @@ centralStorage: enabled: false ingresses: - name: central-storage-ingress - host: alpha.central-storage.freeleaps.mathmast.com + host: central-storage.freeleaps-alpha.com class: nginx rules: - path: / @@ -67,9 +67,9 @@ centralStorage: tls: exists: false issuerRef: - name: mathmast-dot-com + name: freeleaps-alpha-dot-com kind: ClusterIssuer - name: alpha.central-storage.freeleaps.mathmast.com-cert + name: central-storage.freeleaps-alpha.com-cert configs: tz: UTC appName: central_storage diff --git a/freeleaps/helm-pkg/chat/values.alpha.yaml b/freeleaps/helm-pkg/chat/values.alpha.yaml index 86f1015b..a29e3943 100644 --- a/freeleaps/helm-pkg/chat/values.alpha.yaml +++ b/freeleaps/helm-pkg/chat/values.alpha.yaml @@ -54,7 +54,7 @@ chat: enabled: false ingresses: - name: chat-ingress - host: alpha.chat.freeleaps.mathmast.com + host: chat.freeleaps-alpha.com class: nginx rules: - path: / @@ -67,9 +67,9 @@ chat: tls: exists: false issuerRef: - name: mathmast-dot-com + name: freeleaps-alpha-dot-com kind: ClusterIssuer - name: alpha.chat.freeleaps.mathmast.com-cert + name: chat.freeleaps-alpha.com-cert configs: tz: UTC appName: chat @@ -79,7 +79,7 @@ chat: mongodbUri: mongodb+srv://jetli:8IHKx6dZK8BfugGp@freeleaps2.hanbj.mongodb.net/ mongodbPort: 27017 emailFrom: freeleaps@freeleaps.com - siteUrlRoot: https://alpha.freeleaps.mathmast.com + siteUrlRoot: https://freeleaps-alpha.com jwtSecretKey: 8f87ca8c3c9c3df09a9c78e0adb0927855568f6072d9efc892534aee35f5867b jwtAlgorithm: HS256 stripeApiKey: sk_test_51Ogsw5B0IyqaSJBrwczlr820jnmvA1qQQGoLZ2XxOsIzikpmXo4pRLjw4XVMTEBR8DdVTYySiAv1XX53Zv5xqynF00GfMqttFd diff --git a/freeleaps/helm-pkg/content/values.alpha.yaml b/freeleaps/helm-pkg/content/values.alpha.yaml index 6f4026ec..af0923ca 100644 --- a/freeleaps/helm-pkg/content/values.alpha.yaml +++ b/freeleaps/helm-pkg/content/values.alpha.yaml @@ -54,7 +54,7 @@ content: enabled: false ingresses: - name: content-ingress - host: alpha.content.freeleaps.mathmast.com + host: content.freeleaps-alpha.com class: nginx rules: - path: / @@ -67,9 +67,9 @@ content: tls: exists: false issuerRef: - name: mathmast-dot-com + name: freeleaps-alpha-dot-com kind: ClusterIssuer - name: alpha.content.freeleaps.mathmast.com-cert + name: content.freeleaps-alpha.com-cert configs: tz: UTC appName: content diff --git a/freeleaps/helm-pkg/devsvc/values.alpha.yaml b/freeleaps/helm-pkg/devsvc/values.alpha.yaml index e93dc367..8ee5252b 100644 --- a/freeleaps/helm-pkg/devsvc/values.alpha.yaml +++ b/freeleaps/helm-pkg/devsvc/values.alpha.yaml @@ -54,7 +54,7 @@ devsvc: enabled: false ingresses: - name: devsvc-ingress - host: alpha.devsvc.freeleaps.mathmast.com + host: devsvc.freeleaps-alpha.com class: nginx rules: - path: / @@ -67,9 +67,9 @@ devsvc: tls: exists: false issuerRef: - name: mathmast-dot-com + name: freeleaps-alpha-dot-com kind: ClusterIssuer - name: alpha.devsvc.freeleaps.mathmast.com-cert + name: devsvc.freeleaps-alpha.com-cert configs: tz: UTC appName: devsvc diff --git a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml index 8dcbf83f..5ae9d3d4 100644 --- a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml +++ b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml @@ -33,7 +33,7 @@ freeleaps: enabled: false ingresses: - name: freeleaps-ingress - host: alpha.api.freeleaps.mathmast.com + host: api.freeleaps-alpha.com class: nginx rules: - path: / @@ -46,9 +46,9 @@ freeleaps: tls: exists: false issuerRef: - name: mathmast-dot-com + name: freeleaps-alpha-dot-com kind: ClusterIssuer - name: alpha.api.freeleaps.mathmast.com-cert + name: api.freeleaps-alpha.com-cert configs: tz: UTC appName: freeleaps @@ -58,7 +58,7 @@ freeleaps: mongodbUri: mongodb+srv://jetli:8IHKx6dZK8BfugGp@freeleaps2.hanbj.mongodb.net/ mongodbPort: 27017 emailFrom: freeleaps@freeleaps.com - siteUrlRoot: https://alpha.freeleaps.mathmast.com + siteUrlRoot: https://freeleaps-alpha.com jwtSecretKey: 8f87ca8c3c9c3df09a9c78e0adb0927855568f6072d9efc892534aee35f5867b jwtAlgorithm: HS256 stripeApiKey: sk_test_51Ogsw5B0IyqaSJBrwczlr820jnmvA1qQQGoLZ2XxOsIzikpmXo4pRLjw4XVMTEBR8DdVTYySiAv1XX53Zv5xqynF00GfMqttFd diff --git a/freeleaps/helm-pkg/frontend/values.alpha.yaml b/freeleaps/helm-pkg/frontend/values.alpha.yaml index abfcf6cb..6646fb73 100644 --- a/freeleaps/helm-pkg/frontend/values.alpha.yaml +++ b/freeleaps/helm-pkg/frontend/values.alpha.yaml @@ -29,7 +29,7 @@ frontend: targetPort: 8080 ingresses: - name: frontend-ingress - host: alpha.freeleaps.mathmast.com + host: freeleaps-alpha.com class: nginx rules: - path: / @@ -42,9 +42,9 @@ frontend: tls: exists: false issuerRef: - name: mathmast-dot-com + name: freeleaps-alpha-dot-com kind: ClusterIssuer - name: alpha.freeleaps.mathmast.com-cert + name: freeleaps-alpha.com-cert annotations: nginx.ingress.kubernetes.io/proxy-read-timeout: '3600' nginx.ingress.kubernetes.io/proxy-send-timeout: '3600' diff --git a/freeleaps/helm-pkg/notification/values.alpha.yaml b/freeleaps/helm-pkg/notification/values.alpha.yaml index 9da25096..91a1c742 100644 --- a/freeleaps/helm-pkg/notification/values.alpha.yaml +++ b/freeleaps/helm-pkg/notification/values.alpha.yaml @@ -54,7 +54,7 @@ notification: enabled: false ingresses: - name: notification-ingress - host: alpha.notification.freeleaps.mathmast.com + host: notification.freeleaps-alpha.com class: nginx rules: - path: / @@ -67,9 +67,9 @@ notification: tls: exists: false issuerRef: - name: mathmast-dot-com + name: freeleaps-alpha-dot-com kind: ClusterIssuer - name: alpha.notification.freeleaps.mathmast.com-cert + name: notification.freeleaps-alpha.com-cert configs: tz: UTC appName: notification diff --git a/freeleaps/helm-pkg/payment/values.alpha.yaml b/freeleaps/helm-pkg/payment/values.alpha.yaml index 99e5b2af..80235bca 100644 --- a/freeleaps/helm-pkg/payment/values.alpha.yaml +++ b/freeleaps/helm-pkg/payment/values.alpha.yaml @@ -54,7 +54,7 @@ payment: enabled: false ingresses: - name: payment-ingress - host: alpha.payment.freeleaps.mathmast.com + host: payment.freeleaps-alpha.com class: nginx rules: - path: / @@ -67,9 +67,9 @@ payment: tls: exists: false issuerRef: - name: mathmast-dot-com + name: freeleaps-alpha-dot-com kind: ClusterIssuer - name: alpha.payment.freeleaps.mathmast.com-cert + name: payment.freeleaps-alpha.com-cert configs: tz: UTC appName: payment @@ -79,6 +79,6 @@ payment: mongodbPort: 27017 mongodbUri: mongodb+srv://jetli:8IHKx6dZK8BfugGp@freeleaps2.hanbj.mongodb.net/ stripeApiKey: sk_test_51Ogsw5B0IyqaSJBrwczlr820jnmvA1qQQGoLZ2XxOsIzikpmXo4pRLjw4XVMTEBR8DdVTYySiAv1XX53Zv5xqynF00GfMqttFd - siteUrlRoot: https://alpha.freeleaps.mathmast.com + siteUrlRoot: https://freeleaps-alpha.com metricsEnabled: 'false' probesEnabled: 'true'