Merge branch 'master' of https://dev.azure.com/freeleaps/freeleaps-ops/_git/freeleaps-ops

2025-02-22 20:33:29 +08:00 · 2025-02-22 20:33:29 +08:00 · 178c4738f7
commit 178c4738f7
parent 1c663ed0f1 7a36e89343
3 changed files with 124 additions and 160 deletions
--- a/freeleaps/helm-pkg/authentication/values.alpha.yaml
+++ b/freeleaps/helm-pkg/authentication/values.alpha.yaml
@ -5,68 +5,55 @@ global:
 authentication:
  replicas: 1
  image:
-    registry:
-    repository: freeleaps
+    registry: docker.io
+    repository: null
    name: authentication
-    tag: 1.0.0
+    tag: snapshot-0a7c742
    imagePullPolicy: IfNotPresent
  ports:
-    - name: http
-      containerPort: 8004
-      protocol: TCP
+  - name: http
+    containerPort: 8004
+    protocol: TCP
  resources:
    requests:
-      cpu: "0.5"
-      memory: "512Mi"
+      cpu: '0.5'
+      memory: 512Mi
    limits:
-      cpu: "1"
-      memory: "1Gi"
-  # FIXME: Wait until the developers implements the probes APIs
+      cpu: '1'
+      memory: 1Gi
  probes: {}
  services:
-    - name: authentication-service
-      type: ClusterIP
-      port: 8004
-      targetPort: 8004
-  # Defaults to {}, which means doesn't have any ingress
+  - name: authentication-service
+    type: ClusterIP
+    port: 8004
+    targetPort: 8004
  ingresses:
-    - name: authentication-ingress
-      host: alpha.authentication.freeleaps.mathmast.com
-      class: nginx
-      rules:
-        - path: "/*"
-          pathType: ImplementationSpecific
-          backend:
-            service:
-              name: authentication-service
-              port:
-                number: 8004
-      tls:
-        exists: false
-        issuerRef:
-          name: mathmast-dot-com
-          kind: ClusterIssuer
-        name: alpha.authentication.freeleaps.mathmast.com-cert
+  - name: authentication-ingress
+    host: alpha.authentication.freeleaps.mathmast.com
+    class: nginx
+    rules:
+    - path: /*
+      pathType: ImplementationSpecific
+      backend:
+        service:
+          name: authentication-service
+          port:
+            number: 8004
+    tls:
+      exists: false
+      issuerRef:
+        name: mathmast-dot-com
+        kind: ClusterIssuer
+      name: alpha.authentication.freeleaps.mathmast.com-cert
  configs:
-    # TZ
-    tz: "America/Settle"
-    # APP_NAME
-    appName: "authentication"
-    # DEVSVC_WEBAPI_URL_BASE
-    devsvcWebapiUrlBase: "http://devsvc.freeleaps-alpha.svc.freeleaps.cluster:8007/api/devsvc"
-    # NOTIFICATION_WEBAPI_URL_BASE
-    notificationWebapiUrlBase: "http://notification.svc.freeleaps-alpha.freeleaps.cluster:8003/api/notification"
-    # JWT_SECRET_KEY
-    jwtSecretKey: "8f87ca8c3c9c3df09a9c78e0adb0927855568f6072d9efc892534aee35f5867b"
-    # JWT_ALGORITHM
-    jwtAlgorithm: "HS256"
-    # SERVICE_API_ACCESS_HOST
-    serviceApiAccessHost: "0.0.0.0"
-    # SERVICE_API_ACCESS_PORT
-    serviceApiAccessPort: "8004"
-    # MONGODB_NAME
-    mongodbName: "freeleaps2"
-    # MONGODB_PORT
-    mongodbPort: "27017"
-    # MONGODB_URI
-    mongodbUri: "mongodb://freeleaps-alpha-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/"
+    tz: America/Settle
+    appName: authentication
+    devsvcWebapiUrlBase: http://devsvc.freeleaps-alpha.svc.freeleaps.cluster:8007/api/devsvc
+    notificationWebapiUrlBase: http://notification.svc.freeleaps-alpha.freeleaps.cluster:8003/api/notification
+    jwtSecretKey: 8f87ca8c3c9c3df09a9c78e0adb0927855568f6072d9efc892534aee35f5867b
+    jwtAlgorithm: HS256
+    serviceApiAccessHost: 0.0.0.0
+    serviceApiAccessPort: '8004'
+    mongodbName: freeleaps2
+    mongodbPort: '27017'
+    mongodbUri: mongodb://freeleaps-alpha-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/
--- a/freeleaps/helm-pkg/central-storage/values.alpha.yaml
+++ b/freeleaps/helm-pkg/central-storage/values.alpha.yaml
@ -5,64 +5,53 @@ global:
 central-storage:
  replicas: 1
  image:
-    registry:
-    repository: freeleaps
+    registry: docker.io
+    repository: null
    name: central_storage
-    tag: 1.0.0
+    tag: snapshot-0a7c742
    imagePullPolicy: IfNotPresent
  ports:
-    - name: http
-      containerPort: 8005
-      protocol: TCP
+  - name: http
+    containerPort: 8005
+    protocol: TCP
  resources:
    requests:
-      cpu: "0.5"
-      memory: "512Mi"
+      cpu: '0.5'
+      memory: 512Mi
    limits:
-      cpu: "1"
-      memory: "1Gi"
-  # FIXME: Wait until the developers implements the probes APIs
+      cpu: '1'
+      memory: 1Gi
  probes: {}
  services:
-    - name: central-storage-service
-      type: ClusterIP
-      port: 8005
-      targetPort: 8005
-  # Defaults to {}, which means doesn't have any ingress
-  ingresses: 
-    - name: central-storage-ingress
-      host: alpha.central-storage.freeleaps.mathmast.com
-      class: nginx
-      rules:
-        - path: "/*"
-          pathType: ImplementationSpecific
-          backend:
-            service:
-              name: central-storage-service
-              port:
-                number: 8005
-      tls:
-        exists: false
-        issuerRef:
-          name: mathmast-dot-com
-          kind: ClusterIssuer
-        name: alpha.central-storage.freeleaps.mathmast.com-cert
+  - name: central-storage-service
+    type: ClusterIP
+    port: 8005
+    targetPort: 8005
+  ingresses:
+  - name: central-storage-ingress
+    host: alpha.central-storage.freeleaps.mathmast.com
+    class: nginx
+    rules:
+    - path: /*
+      pathType: ImplementationSpecific
+      backend:
+        service:
+          name: central-storage-service
+          port:
+            number: 8005
+    tls:
+      exists: false
+      issuerRef:
+        name: mathmast-dot-com
+        kind: ClusterIssuer
+      name: alpha.central-storage.freeleaps.mathmast.com-cert
  configs:
-    # TZ
-    tz: "America/Settle"
-    # APP_NAME
-    appName: "central_storage"
-    # SERVICE_API_ACCESS_HOST
-    serviceApiAccessHost: "0.0.0.0"
-    # SERVICE_API_ACCESS_PORT
-    serviceApiAccessPort: "8005"
-    # MONGODB_NAME
-    mongodbName: "freeleaps2"
-    # MONGODB_PORT
-    mongodbPort: "27017"
-    # MONGODB_URI
-    mongodbUri: "mongodb://freeleaps-alpha-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/"
-    # AZURE_STORAGE_DOCUMENT_API_KEY
-    azureStorageDocumentApiKey: "xbiFtFeQ6v5dozgVM99fZ9huUomL7QcLu6s0y8zYHtIXZ8XdneKDMcg4liQr/9oNlVoRFcZhWjLY+ASt9cjICQ=="
-    # AZURE_STORAGE_DOCUMENT_API_ENDPOINT
-    azureStorageDocumentApiEndpoint: "https://freeleaps1document.blob.core.windows.net/"
+    tz: America/Settle
+    appName: central_storage
+    serviceApiAccessHost: 0.0.0.0
+    serviceApiAccessPort: '8005'
+    mongodbName: freeleaps2
+    mongodbPort: '27017'
+    mongodbUri: mongodb://freeleaps-alpha-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/
+    azureStorageDocumentApiKey: xbiFtFeQ6v5dozgVM99fZ9huUomL7QcLu6s0y8zYHtIXZ8XdneKDMcg4liQr/9oNlVoRFcZhWjLY+ASt9cjICQ==
+    azureStorageDocumentApiEndpoint: https://freeleaps1document.blob.core.windows.net/
--- a/freeleaps/helm-pkg/content/values.alpha.yaml
+++ b/freeleaps/helm-pkg/content/values.alpha.yaml
@ -5,65 +5,53 @@ global:
 content:
  replicas: 1
  image:
-    registry:
-    repository: freeleaps
+    registry: docker.io
+    repository: null
    name: content
-    tag: 1.0.0
+    tag: snapshot-0a7c742
    imagePullPolicy: IfNotPresent
  ports:
-    - name: http
-      containerPort: 8013
-      protocol: TCP
+  - name: http
+    containerPort: 8013
+    protocol: TCP
  resources:
    requests:
-      cpu: "0.5"
-      memory: "512Mi"
+      cpu: '0.5'
+      memory: 512Mi
    limits:
-      cpu: "1"
-      memory: "1Gi"
-  # FIXME: Wait until the developers implements the probes APIs
+      cpu: '1'
+      memory: 1Gi
  probes: {}
  services:
-    - name: content-service
-      type: ClusterIP
-      port: 8013
-      targetPort: 8013
-  # Defaults to {}, which means doesn't have any ingress
-  ingresses: 
-    - name: content-ingress
-      host: alpha.content.freeleaps.mathmast.com
-      class: nginx
-      rules:
-        - path: "/*"
-          pathType: ImplementationSpecific
-          backend:
-            service:
-              name: content-service
-              port:
-                number: 8013
-      tls:
-        exists: false
-        issuerRef:
-          name: mathmast-dot-com
-          kind: ClusterIssuer
-        name: alpha.content.freeleaps.mathmast.com-cert
+  - name: content-service
+    type: ClusterIP
+    port: 8013
+    targetPort: 8013
+  ingresses:
+  - name: content-ingress
+    host: alpha.content.freeleaps.mathmast.com
+    class: nginx
+    rules:
+    - path: /*
+      pathType: ImplementationSpecific
+      backend:
+        service:
+          name: content-service
+          port:
+            number: 8013
+    tls:
+      exists: false
+      issuerRef:
+        name: mathmast-dot-com
+        kind: ClusterIssuer
+      name: alpha.content.freeleaps.mathmast.com-cert
  configs:
-    # TZ
-    tz: "America/Settle"
-    # APP_NAME
-    appName: "content"
-    # SERVICE_API_ACCESS_HOST
-    serviceApiAccessHost: "0.0.0.0"
-    # SERVICE_API_ACCESS_PORT
-    serviceApiAccessPort: "8013"
-    # MONGODB_NAME
-    mongodbName: "freeleaps2"
-    # MONGODB_PORT
-    mongodbPort: "27017"
-    # MONGODB_URI
-    mongodbUri: "mongodb://freeleaps-alpha-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/"
-    # FREELEAPS_WWW_AS_AZURE_CLIENT_SECRET
-    freeleapsWwwAsAzureClientSecret: "jTu8Q~WceiK-5dfZB44Ww-K4fVGi3_5tHNWYYbdX"
-    # CENTRAL_STORAGE_WEBAPI_URL_BASE
-    centralStorageWebapiUrlBase: "http://central-storage-service.freeleaps-alpha.svc.freeleaps.cluster:8005/api/central_storage"
-
+    tz: America/Settle
+    appName: content
+    serviceApiAccessHost: 0.0.0.0
+    serviceApiAccessPort: '8013'
+    mongodbName: freeleaps2
+    mongodbPort: '27017'
+    mongodbUri: mongodb://freeleaps-alpha-mongodb.freeleaps-alpha.svc.freeleaps.cluster:27017/
+    freeleapsWwwAsAzureClientSecret: jTu8Q~WceiK-5dfZB44Ww-K4fVGi3_5tHNWYYbdX
+    centralStorageWebapiUrlBase: http://central-storage-service.freeleaps-alpha.svc.freeleaps.cluster:8005/api/central_storage