Merge pull request #158 from Jeremy4040/main

Updated new values

apps/conf/values/external-secrets.yaml → apps/conf/values/external-secrets_template.yaml

@@ -21,3 +21,15 @@ certController:
     requests:
       cpu: 100m
       memory: 100Mi
+
+
+ClusterSecretStore:
+  create: false
+  vault:
+    server: http://vault.capten.svc.cluster.local:8200
+    path: secret
+    version: v2
+    auth:
+      secretname: vault-cluster-token
+      key: token
+      namespace: external-secrets

apps/conf/values/kubviz-agent_template.yaml

@@ -1,6 +1,8 @@
 nats: 
   auth:
-    token: "{{ .NATSToken }}"
+    secret:
+      name: "{{ .natsTokenSecretName }}"
+      key: "token"
 git_bridge:
   resources: 
     limits:

apps/conf/values/kubviz-client_template.yaml

@@ -1,4 +1,6 @@
 nats:
+  service:
+    type: NodePort
   resources: 
     requests:
       cpu: 100m
@@ -7,7 +9,9 @@ nats:
       cpu: 200m
       memory: 350Mi
   auth:
-    token: "{{ .NATSToken }}"
+    secret:
+      name: "{{ .natsTokenSecretName }}"
+      key: "token"
 resources: 
   requests:
     cpu: 100m

apps/conf/values/loki_template.yaml

@@ -31,6 +31,6 @@ promtail:
       memory: 1000Mi
   config:
     clients:
-    - url: http://{{ .Release.Name }}:3100/loki/api/v1/push
+    - url: http://loki:3100/loki/api/v1/push
       external_labels:
         cluster_name: capten-controlplane

apps/conf/values/postgresql_template.yaml

@@ -0,0 +1,5 @@
+global:
+  postgresql:
+    auth:
+      username: "temporal"
+      database: "temporal"

apps/conf/values/prometheus_template.yaml

@@ -30,8 +30,23 @@ grafana:
       folderAnnotation: grafana_folder
       provider:
         foldersFromFilesStructure: true
+        allowUiUpdates: true
     datasources:
       enabled: true
+  postgresql:
+    enabled: true
+  database: 
+    type: postgres
+    host: prometheus-postgresql:5432
+    name: postgres
+    ssl_mode: disable
+    user: postgres
+    password: $__file{/etc/secrets/postgresql/postgres-password}
+    secretMount:
+      name: postgresql-mount
+      mountPath: /etc/secrets/postgresql
+      secretName: prometheus-postgresql
+      readOnly: true
 prometheus:
   ingress:
     annotations:

apps/conf/values/quality-trace_template.yaml

@@ -0,0 +1,34 @@
+ingress:
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod-cluster
+    kubernetes.io/force-ssl-redirect: "true"
+    kubernetes.io/ssl-redirect: "true"
+    kubernetes.io/tls-acme: "true"
+  enabled: true
+  hosts:
+  - host: "quality-trace.{{.DomainName}}"
+    paths:
+      - path: /
+        pathType: ImplementationSpecific
+  tls:
+    - secretName: cert-quality-trace
+      hosts:
+      - "quality-trace.{{.DomainName}}"
+telemetry:
+  exporters:
+    collector:
+      exporter:
+        collector:
+          endpoint: quality-trace-otel-collector.quality-trace.svc.cluster.local:4317
+otelCollector:
+  ingressRoute:
+    enabled: true
+    host: "quality-trace-otelcollector.{{.DomainName}}"
+    service:
+      port: 4317
+  config:
+    exporters:
+      otlp/quality-trace:
+        endpoint: quality-trace.quality-trace.svc.cluster.local:4317
+      otlp/signoz:
+        endpoint: signoz-otel-collector.observability.svc.cluster.local:4317

apps/conf/values/signoz_template.yaml

@@ -34,10 +34,6 @@ otelCollector:
   ingressRoute:
     enabled: true
     host: "otelcollector.{{.DomainName}}"
-  config:
-    exporters:
-      otlp/tracetest:
-        endpoint: http://tracetest-otel-collector.tracetest.svc.cluster.local:4317
 otelCollectorMetrics:
   resources:
     requests:

apps/conf/values/temporal_template.yaml

@@ -8,27 +8,24 @@ server:
   config:
     persistence:
       default:
-        driver: "cassandra"
-        cassandra:
-          hosts: ["capten-cass-capten-cass-service"]
-          user: "capten-cass-superuser"
-          existingSecret: "capten-cass-superuser"
-
+        driver: "sql"
         sql:
-          user: "capten-cass-superuser"
-          password: "capten-cass-superuser"
+          driver: "postgres"
+          host: postgresql
+          port: 5432
+          database: temporal
+          user: temporal
+          existingSecret: postgresql
 
       visibility:
-        driver: "cassandra"
-        cassandra:
-          hosts: ["capten-cass-capten-cass-service"]
-          user: "capten-cass-superuser"
-          existingSecret: "capten-cass-superuser"
-
+        driver: "sql"
         sql:
-          user: "capten-cass-superuser"
-          password: "capten-cass-superuser"
-
+          driver: "postgres"
+          host: postgresql
+          port: 5432
+          database: temporal_visibility
+          user: temporal
+          existingSecret: postgresql
   autoscaling:
     enabled: false
   frontend:

apps/conf/values/velero_template.yaml

@@ -22,17 +22,20 @@ configuration:
   defaultVolumesToFsBackup: true
   backupStorageLocation:
   - name:
-    provider: 
-    bucket: 
+    provider: aws
+    bucket: velero-backup
     config:
-      region: 
+      region: west
   volumeSnapshotLocation:
   - name:
-    provider: 
+    provider: aws
     config:
-      region: 
+      region: west
 credentials:
   secretContents: 
     cloud: |
+      [default]
+      aws_access_key_id=xxxyyy
+      aws_secret_access_key=yyyzzz
 deployNodeAgent: true