From 503128903b3744f45f7e47d620b0df717ba1e19f Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Fri, 25 Oct 2024 19:14:10 +0200 Subject: [PATCH] feat: update atlantis chart and values for monolith --- charts/atlantis/templates/ingress.yaml | 4 +- charts/atlantis/templates/servicemonitor.yaml | 20 +++++++ charts/atlantis/values.yaml | 14 ++--- values/atlantis/base/defaultbackend.yaml | 9 ++++ values/atlantis/base/ingress_patch.yaml | 10 ++++ values/atlantis/base/kustomization.yaml | 7 ++- values/atlantis/base/service_patch.yaml | 7 --- values/atlantis/prod/appsettings.json | 19 ++++++- values/atlantis/prod/bindings.yaml | 22 ++++++++ values/atlantis/prod/default.env | 1 - values/atlantis/prod/deployment_patch.yaml | 31 ----------- values/atlantis/prod/kustomization.yaml | 5 ++ .../atlantis/prod}/pubsub.yaml | 8 ++- values/atlantis/prod/secrets.yaml | 8 +++ .../atlantis/prod}/statestore.yaml | 10 ++-- values/atlantis/prod/subscriptions.yaml | 8 +-- .../atlantis/prod}/tracing.yaml | 4 +- values/atlantis/staging/appsettings.json | 19 ++++++- values/atlantis/staging/bindings.yaml | 22 ++++++++ values/atlantis/staging/default.env | 1 - values/atlantis/staging/deployment_patch.yaml | 31 ----------- values/atlantis/staging/kustomization.yaml | 6 +++ values/atlantis/staging/pubsub.yaml | 52 +++++++++++++++++++ values/atlantis/staging/secrets.yaml | 8 +++ values/atlantis/staging/statestore.yaml | 22 ++++++++ .../atlantis/staging}/subscriptions.yaml | 10 ++-- values/atlantis/staging/tracing.yaml | 9 ++++ values/atlantis/values-prod.yaml | 21 ++++++++ values/atlantis/values-staging.yaml | 24 +++++++++ values/atlantis/values.yaml | 15 ++---- 30 files changed, 304 insertions(+), 123 deletions(-) create mode 100644 charts/atlantis/templates/servicemonitor.yaml create mode 100644 values/atlantis/base/defaultbackend.yaml create mode 100644 values/atlantis/base/ingress_patch.yaml delete mode 100644 values/atlantis/base/service_patch.yaml create mode 100644 values/atlantis/prod/bindings.yaml rename {charts/atlantis/templates => values/atlantis/prod}/pubsub.yaml (80%) create mode 100644 values/atlantis/prod/secrets.yaml rename {charts/atlantis/templates => values/atlantis/prod}/statestore.yaml (64%) rename {charts/atlantis/templates => values/atlantis/prod}/tracing.yaml (57%) create mode 100644 values/atlantis/staging/bindings.yaml create mode 100644 values/atlantis/staging/pubsub.yaml create mode 100644 values/atlantis/staging/secrets.yaml create mode 100644 values/atlantis/staging/statestore.yaml rename {charts/atlantis/templates => values/atlantis/staging}/subscriptions.yaml (64%) create mode 100644 values/atlantis/staging/tracing.yaml diff --git a/charts/atlantis/templates/ingress.yaml b/charts/atlantis/templates/ingress.yaml index 3a22ec67..a93a3582 100644 --- a/charts/atlantis/templates/ingress.yaml +++ b/charts/atlantis/templates/ingress.yaml @@ -54,8 +54,8 @@ spec: port: number: {{ $svcPort }} {{- else }} - serviceName: {{ $fullName }} - servicePort: {{ $svcPort }} + serviceName: {{ .serviceName | default $fullName }} + servicePort: {{ .servicePort | default $svcPort }} {{- end }} {{- end }} {{- end }} diff --git a/charts/atlantis/templates/servicemonitor.yaml b/charts/atlantis/templates/servicemonitor.yaml new file mode 100644 index 00000000..b67be4fc --- /dev/null +++ b/charts/atlantis/templates/servicemonitor.yaml @@ -0,0 +1,20 @@ +{{- if .Values.serviceMonitor.enabled }} +apiVersion: monitoring.coreos.com/v1 +kind: ServiceMonitor +metadata: + name: {{ include "Atlantis.fullname" . }} + namespace: {{ .Release.Namespace }} +spec: + endpoints: + - honorLabels: false + path: /metrics + port: http + jobLabel: {{ .Values.serviceMonitor.label | default (include "Atlantis.fullname" .) }} + namespaceSelector: + matchNames: + - {{ .Release.Namespace }} + selector: + matchLabels: + app.kubernetes.io/instance: {{ include "Atlantis.fullname" . }} + app.kubernetes.io/name: atlantis +{{- end }} diff --git a/charts/atlantis/values.yaml b/charts/atlantis/values.yaml index 24f0811d..eaff8068 100644 --- a/charts/atlantis/values.yaml +++ b/charts/atlantis/values.yaml @@ -61,6 +61,10 @@ ingress: paths: - path: / pathType: ImplementationSpecific + - path: /events + pathType: ImplementationSpecific + serviceName: main-ingress-nginx-defaultbackend.ingress-nginx + servicePort: 80 tls: - hosts: - atlantis.srv.oceanbox.io @@ -119,16 +123,6 @@ redis: ephemeral-storage: 50Mi memory: 128Mi -tracing: - namespace: otel - endpoint: "http://opentelemetry-collector.otel:9411/api/v2/spans" - -rabbitmq: - namespace: rabbitmq - service: staging-rabbitmq - username: user - # secretName: staging-rabbitmq - resources: {} # We usually recommend not to specify default resources and to leave this as a conscious # choice for the user. This also increases chances charts run on environments with little diff --git a/values/atlantis/base/defaultbackend.yaml b/values/atlantis/base/defaultbackend.yaml new file mode 100644 index 00000000..4e5b177c --- /dev/null +++ b/values/atlantis/base/defaultbackend.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: Service +metadata: + name: defaultbackend +spec: + type: ExternalName + externalName: main-ingress-nginx-defaultbackend.ingress-nginx.svc.cluster.local + ports: + - port: 80 \ No newline at end of file diff --git a/values/atlantis/base/ingress_patch.yaml b/values/atlantis/base/ingress_patch.yaml new file mode 100644 index 00000000..c4ce416c --- /dev/null +++ b/values/atlantis/base/ingress_patch.yaml @@ -0,0 +1,10 @@ +- op: add + path: /spec/rules/0/http/paths/- + value: + path: /events + pathType: ImplementationSpecific + backend: + service: + name: defaultbackend + port: + number: 80 \ No newline at end of file diff --git a/values/atlantis/base/kustomization.yaml b/values/atlantis/base/kustomization.yaml index 43173a86..24579eee 100644 --- a/values/atlantis/base/kustomization.yaml +++ b/values/atlantis/base/kustomization.yaml @@ -1,5 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +namespace: atlantis patches: - target: version: v1 @@ -7,8 +8,10 @@ patches: kind: Deployment path: deployment_patch.yaml - target: + group: networking.k8s.io version: v1 - kind: Service - path: service_patch.yaml + kind: Ingress + path: ingress_patch.yaml resources: - _manifest.yaml + - defaultbackend.yaml \ No newline at end of file diff --git a/values/atlantis/base/service_patch.yaml b/values/atlantis/base/service_patch.yaml deleted file mode 100644 index ccfa03cc..00000000 --- a/values/atlantis/base/service_patch.yaml +++ /dev/null @@ -1,7 +0,0 @@ -- op: add - path: /spec/ports/- - value: - name: intra - port: 8000 - protocol: TCP - targetPort: 8000 diff --git a/values/atlantis/prod/appsettings.json b/values/atlantis/prod/appsettings.json index a932d9f1..b6673d5a 100644 --- a/values/atlantis/prod/appsettings.json +++ b/values/atlantis/prod/appsettings.json @@ -30,8 +30,23 @@ "http://atlantis.srv.oceanbox.io", "https://atlantis.srv.oceanbox.io" ], - "logService" : "https://seq.adm.oceanbox.io", - "logApiKey": "", + "otelCollector": "http://opentelemetry-collector.opentelemetry.svc:4317", "deployEnv": "prod", + "deployName": "atlantis", + "slurm": { + "baseUrl": "https://hipster-slurmrestd.ekman.oceanbox.io/", + "slurmApi": "slurm/v0.0.38/", + "dbdApi": "slurmdbd/v0.0.38/", + "user": "serf", + "password": "wooqueiLee3ao0ha" + }, + "amqp": { + "auth": "user:bunny", + "host": "10.1.8.60:30673" + }, + "pubsubName": "pubsub", + "pubsubTopic": "hipster-atlantis", + "fenceRadius": 1250.0, + "cerbosUrl": "http://prod-cerbos.idp.svc:3593", "plainAuthUsers": [] } diff --git a/values/atlantis/prod/bindings.yaml b/values/atlantis/prod/bindings.yaml new file mode 100644 index 00000000..0c14ca71 --- /dev/null +++ b/values/atlantis/prod/bindings.yaml @@ -0,0 +1,22 @@ +apiVersion: dapr.io/v1alpha1 +kind: Component +metadata: + name: slurm-events +spec: + type: bindings.rabbitmq + version: v1 + metadata: + - name: host + secretKeyRef: + name: prod-rabbitmq + key: connString + - name: queueName + value: prod-hipster-slurm-job-events + - name: durable + value: true + - name: contentType + value: "application/json" + - name: route + value: /events/slurm +scopes: + - atlantis diff --git a/values/atlantis/prod/default.env b/values/atlantis/prod/default.env index cb9c9ebc..e1f2ae29 100644 --- a/values/atlantis/prod/default.env +++ b/values/atlantis/prod/default.env @@ -1,3 +1,2 @@ OIDC_CLIENT_SECRET=KOJ6bDHzE5vdyfSrzgwLjtM5PzA809Zm -SEQ_APIKEY=v9RfeLBD9Si7OkFlkjPm DEPLOY_NAME=prod-atlantis diff --git a/values/atlantis/prod/deployment_patch.yaml b/values/atlantis/prod/deployment_patch.yaml index 20410b3d..956f6cab 100644 --- a/values/atlantis/prod/deployment_patch.yaml +++ b/values/atlantis/prod/deployment_patch.yaml @@ -3,37 +3,6 @@ value: name: LOG_LEVEL value: "4" -- op: add - path: /spec/template/spec/containers/0/env/- - value: - name: BARENTSWATCH_SECRET - valueFrom: - secretKeyRef: - name: prod-atlantis-barentswatch - key: secret - optional: true -- op: add - path: /spec/template/spec/containers/0/env/- - value: - name: BARENTSWATCH_CLIENT_ID - valueFrom: - secretKeyRef: - name: prod-atlantis-barentswatch - key: client-id - optional: true -- op: add - path: /spec/template/spec/containers/0/env/- - value: - name: REDIS_USER - value: default -- op: add - path: /spec/template/spec/containers/0/env/- - value: - name: REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: prod-redis - key: redis-password - op: add path: /spec/template/spec/containers/0/envFrom/- value: diff --git a/values/atlantis/prod/kustomization.yaml b/values/atlantis/prod/kustomization.yaml index c225d8cd..4263d2b6 100644 --- a/values/atlantis/prod/kustomization.yaml +++ b/values/atlantis/prod/kustomization.yaml @@ -19,4 +19,9 @@ patches: path: deployment_patch.yaml resources: - ../base + - secrets.yaml + - tracing.yaml + - bindings.yaml + - pubsub.yaml + - statestore.yaml - subscriptions.yaml diff --git a/charts/atlantis/templates/pubsub.yaml b/values/atlantis/prod/pubsub.yaml similarity index 80% rename from charts/atlantis/templates/pubsub.yaml rename to values/atlantis/prod/pubsub.yaml index 9e1d1086..97473e01 100644 --- a/charts/atlantis/templates/pubsub.yaml +++ b/values/atlantis/prod/pubsub.yaml @@ -2,18 +2,17 @@ apiVersion: dapr.io/v1alpha1 kind: Component metadata: name: pubsub - namespace: {{ .Release.Namespace }} spec: version: v1 type: pubsub.rabbitmq metadata: - name: hostname - value: {{ .Values.rabbitmq.service }}.{{ .Values.rabbitmq.namespace | default "rabbitmq" }} + value: prod - name: username - value: {{ .Values.rabbitmq.username }} + value: user - name: password secretKeyRef: - name: {{ .Values.rabbitmq.secretName | default (printf "%s-rabbitmq" .Release.Name) }} + name: prod-rabbitmq key: rabbitmq-password - name: protocol value: amqp @@ -51,4 +50,3 @@ spec: value: fanout - name: clientName value: "{appID}" - diff --git a/values/atlantis/prod/secrets.yaml b/values/atlantis/prod/secrets.yaml new file mode 100644 index 00000000..478632bb --- /dev/null +++ b/values/atlantis/prod/secrets.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Secret +metadata: + annotations: + kyverno/clone: "true" + name: prod-rabbitmq +type: Opaque +data: \ No newline at end of file diff --git a/charts/atlantis/templates/statestore.yaml b/values/atlantis/prod/statestore.yaml similarity index 64% rename from charts/atlantis/templates/statestore.yaml rename to values/atlantis/prod/statestore.yaml index edd38238..5c6bd979 100644 --- a/charts/atlantis/templates/statestore.yaml +++ b/values/atlantis/prod/statestore.yaml @@ -2,21 +2,21 @@ apiVersion: dapr.io/v1alpha1 kind: Component metadata: name: statestore - namespace: {{ .Release.Namespace }} spec: type: state.redis version: v1 metadata: - name: redisHost - value: {{ .Release.Name }}-redis-master:6379 + value: -redis-master:6379 - name: redisUsername value: default - name: redisPassword secretKeyRef: - name: {{ .Release.Name }}-redis + name: -redis key: redis-password - name: actorStateStore value: "true" + - name: redisDB + value: "1" scopes: - - atlantis - - {{ .Release.Name }}-atlantis + - atlantis \ No newline at end of file diff --git a/values/atlantis/prod/subscriptions.yaml b/values/atlantis/prod/subscriptions.yaml index 86065180..78b656e7 100644 --- a/values/atlantis/prod/subscriptions.yaml +++ b/values/atlantis/prod/subscriptions.yaml @@ -5,12 +5,12 @@ metadata: spec: topic: hipster routes: - default: /hipster-events + default: /events/hipster pubsubname: pubsub metadata: queueType: quorum scopes: -- prod-atlantis +- atlantis --- apiVersion: dapr.io/v2alpha1 kind: Subscription @@ -19,9 +19,9 @@ metadata: spec: topic: inbox routes: - default: /inbox-events + default: /events/inbox pubsubname: pubsub metadata: queueType: quorum scopes: -- prod-atlantis +- atlantis \ No newline at end of file diff --git a/charts/atlantis/templates/tracing.yaml b/values/atlantis/prod/tracing.yaml similarity index 57% rename from charts/atlantis/templates/tracing.yaml rename to values/atlantis/prod/tracing.yaml index 5542b302..f3b3fdf2 100644 --- a/charts/atlantis/templates/tracing.yaml +++ b/values/atlantis/prod/tracing.yaml @@ -2,10 +2,8 @@ apiVersion: dapr.io/v1alpha1 kind: Configuration metadata: name: tracing - namespace: {{ .Release.Namespace }} spec: tracing: samplingRate: "1" zipkin: - endpointAddress: {{ .Values.tracing.endpoint }} - + endpointAddress: "http://opentelemetry-collector.otel:9411/api/v2/spans" diff --git a/values/atlantis/staging/appsettings.json b/values/atlantis/staging/appsettings.json index 78627437..4b2bc13b 100644 --- a/values/atlantis/staging/appsettings.json +++ b/values/atlantis/staging/appsettings.json @@ -28,8 +28,23 @@ "http://atlantis.beta.oceanbox.io", "https://atlantis.beta.oceanbox.io" ], - "logService" : "https://seq.adm.oceanbox.io", - "logApiKey": "", + "otelCollector": "http://opentelemetry-collector.opentelemetry.svc:4317", "deployEnv": "staging", + "deployName": "atlantis", + "slurm": { + "baseUrl": "https://hipster-slurmrestd.ekman.oceanbox.io/", + "slurmApi": "slurm/v0.0.38/", + "dbdApi": "slurmdbd/v0.0.38/", + "user": "serf", + "password": "wooqueiLee3ao0ha" + }, + "amqp": { + "auth": "user:bunny", + "host": "10.1.8.60:30673" + }, + "pubsubName": "pubsub", + "pubsubTopic": "hipster-atlantis", + "fenceRadius": 1250.0, + "cerbosUrl": "http://staging-cerbos.idp.svc:3593", "plainAuthUsers": [] } diff --git a/values/atlantis/staging/bindings.yaml b/values/atlantis/staging/bindings.yaml new file mode 100644 index 00000000..ee251a32 --- /dev/null +++ b/values/atlantis/staging/bindings.yaml @@ -0,0 +1,22 @@ +apiVersion: dapr.io/v1alpha1 +kind: Component +metadata: + name: slurm-events +spec: + type: bindings.rabbitmq + version: v1 + metadata: + - name: host + secretKeyRef: + name: staging-rabbitmq + key: connString + - name: queueName + value: staging-hipster-slurm-job-events + - name: durable + value: true + - name: contentType + value: "application/json" + - name: route + value: /events/slurm +scopes: + - atlantis \ No newline at end of file diff --git a/values/atlantis/staging/default.env b/values/atlantis/staging/default.env index b3f423f2..a8c3ba0b 100644 --- a/values/atlantis/staging/default.env +++ b/values/atlantis/staging/default.env @@ -1,3 +1,2 @@ OIDC_CLIENT_SECRET=3QjfSPmAemjn34XVA2o1fvoS7I4gKvOR -SEQ_APIKEY=v9RfeLBD9Si7OkFlkjPm DEPLOY_NAME=staging-atlantis diff --git a/values/atlantis/staging/deployment_patch.yaml b/values/atlantis/staging/deployment_patch.yaml index 278de3ae..9b61eee2 100644 --- a/values/atlantis/staging/deployment_patch.yaml +++ b/values/atlantis/staging/deployment_patch.yaml @@ -3,37 +3,6 @@ value: name: LOG_LEVEL value: "4" -- op: add - path: /spec/template/spec/containers/0/env/- - value: - name: BARENTSWATCH_SECRET - valueFrom: - secretKeyRef: - name: staging-atlantis-barentswatch - key: secret - optional: true -- op: add - path: /spec/template/spec/containers/0/env/- - value: - name: BARENTSWATCH_CLIENT_ID - valueFrom: - secretKeyRef: - name: staging-atlantis-barentswatch - key: client-id - optional: true -- op: add - path: /spec/template/spec/containers/0/env/- - value: - name: REDIS_USER - value: default -- op: add - path: /spec/template/spec/containers/0/env/- - value: - name: REDIS_PASSWORD - valueFrom: - secretKeyRef: - name: staging-redis - key: redis-password - op: add path: /spec/template/spec/containers/0/envFrom/- value: diff --git a/values/atlantis/staging/kustomization.yaml b/values/atlantis/staging/kustomization.yaml index 67328264..3eccfa58 100644 --- a/values/atlantis/staging/kustomization.yaml +++ b/values/atlantis/staging/kustomization.yaml @@ -19,3 +19,9 @@ patches: path: deployment_patch.yaml resources: - ../base + - secrets.yaml + - tracing.yaml + - bindings.yaml + - pubsub.yaml + - statestore.yaml + - subscriptions.yaml diff --git a/values/atlantis/staging/pubsub.yaml b/values/atlantis/staging/pubsub.yaml new file mode 100644 index 00000000..91cc6edb --- /dev/null +++ b/values/atlantis/staging/pubsub.yaml @@ -0,0 +1,52 @@ +apiVersion: dapr.io/v1alpha1 +kind: Component +metadata: + name: pubsub +spec: + version: v1 + type: pubsub.rabbitmq + metadata: + - name: hostname + value: staging + - name: username + value: user + - name: password + secretKeyRef: + name: staging-rabbitmq + key: rabbitmq-password + - name: protocol + value: amqp + - name: durable + value: true + - name: deletedWhenUnused + value: false + - name: autoAck + value: false + - name: deliveryMode + value: 1 + - name: requeueInFailure + value: false + - name: prefetchCount + value: 0 + - name: reconnectWait + value: 0 + - name: concurrencyMode + value: parallel + - name: publisherConfirm + value: false + - name: backOffPolicy + value: exponential + - name: backOffInitialInterval + value: 100 + - name: backOffMaxRetries + value: 16 + - name: enableDeadLetter # Optional enable dead Letter or not + value: true + - name: maxLen # Optional max message count in a queue + value: 3000 + - name: maxLenBytes # Optional maximum length in bytes of a queue. + value: 10485760 + - name: exchangeKind + value: fanout + - name: clientName + value: "{appID}" diff --git a/values/atlantis/staging/secrets.yaml b/values/atlantis/staging/secrets.yaml new file mode 100644 index 00000000..8066d7f5 --- /dev/null +++ b/values/atlantis/staging/secrets.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Secret +metadata: + annotations: + kyverno/clone: "true" + name: staging-rabbitmq +type: Opaque +data: \ No newline at end of file diff --git a/values/atlantis/staging/statestore.yaml b/values/atlantis/staging/statestore.yaml new file mode 100644 index 00000000..5c6bd979 --- /dev/null +++ b/values/atlantis/staging/statestore.yaml @@ -0,0 +1,22 @@ +apiVersion: dapr.io/v1alpha1 +kind: Component +metadata: + name: statestore +spec: + type: state.redis + version: v1 + metadata: + - name: redisHost + value: -redis-master:6379 + - name: redisUsername + value: default + - name: redisPassword + secretKeyRef: + name: -redis + key: redis-password + - name: actorStateStore + value: "true" + - name: redisDB + value: "1" +scopes: + - atlantis \ No newline at end of file diff --git a/charts/atlantis/templates/subscriptions.yaml b/values/atlantis/staging/subscriptions.yaml similarity index 64% rename from charts/atlantis/templates/subscriptions.yaml rename to values/atlantis/staging/subscriptions.yaml index 077a6b7f..78b656e7 100644 --- a/charts/atlantis/templates/subscriptions.yaml +++ b/values/atlantis/staging/subscriptions.yaml @@ -2,30 +2,26 @@ apiVersion: dapr.io/v2alpha1 kind: Subscription metadata: name: hipster-events - namespace: {{ .Release.Namespace }} spec: topic: hipster routes: - default: /hipster-events + default: /events/hipster pubsubname: pubsub metadata: queueType: quorum scopes: - atlantis -- {{ .Release.Name}}-atlantis --- apiVersion: dapr.io/v2alpha1 kind: Subscription metadata: name: inbox-events - namespace: {{ .Release.Namespace }} spec: topic: inbox routes: - default: /inbox-events + default: /events/inbox pubsubname: pubsub metadata: queueType: quorum scopes: -- atlantis -- {{ .Release.Name}}-atlantis +- atlantis \ No newline at end of file diff --git a/values/atlantis/staging/tracing.yaml b/values/atlantis/staging/tracing.yaml new file mode 100644 index 00000000..f3b3fdf2 --- /dev/null +++ b/values/atlantis/staging/tracing.yaml @@ -0,0 +1,9 @@ +apiVersion: dapr.io/v1alpha1 +kind: Configuration +metadata: + name: tracing +spec: + tracing: + samplingRate: "1" + zipkin: + endpointAddress: "http://opentelemetry-collector.otel:9411/api/v2/spans" diff --git a/values/atlantis/values-prod.yaml b/values/atlantis/values-prod.yaml index b1f37d92..c4a1e9ad 100644 --- a/values/atlantis/values-prod.yaml +++ b/values/atlantis/values-prod.yaml @@ -22,6 +22,27 @@ ingress: - maps.oceanbox.io secretName: atlantis-tls +env: + - name: REDIS_USER + value: default + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: prod-redis + key: redis-password + - name: BARENTSWATCH_CLIENT_ID + valueFrom: + secretKeyRef: + name: prod-atlantis-barentswatch + key: secret + optional: true + - name: BARENTSWATCH_SECRET + valueFrom: + secretKeyRef: + name: prod-atlantis-barentswatch + key: client-id + optional: true + resources: limits: cpu: 250m diff --git a/values/atlantis/values-staging.yaml b/values/atlantis/values-staging.yaml index 26901728..48065046 100644 --- a/values/atlantis/values-staging.yaml +++ b/values/atlantis/values-staging.yaml @@ -2,8 +2,10 @@ replicaCount: 2 podAnnotations: dapr.io/app-id: "staging-atlantis" + image: tag: 7f3512e0-debug + ingress: annotations: cert-manager.io/cluster-issuer: letsencrypt-production @@ -32,6 +34,28 @@ ingress: - atlas.oceanbox.io - beta.oceanbox.io secretName: staging-atlantis-tls + +env: + - name: REDIS_USER + value: default + - name: REDIS_PASSWORD + valueFrom: + secretKeyRef: + name: staging-redis + key: redis-password + - name: BARENTSWATCH_CLIENT_ID + valueFrom: + secretKeyRef: + name: staging-atlantis-barentswatch + key: secret + optional: true + - name: BARENTSWATCH_SECRET + valueFrom: + secretKeyRef: + name: staging-atlantis-barentswatch + key: client-id + optional: true + resources: limits: cpu: 250m diff --git a/values/atlantis/values.yaml b/values/atlantis/values.yaml index b8178c12..d6321004 100644 --- a/values/atlantis/values.yaml +++ b/values/atlantis/values.yaml @@ -1,16 +1,11 @@ podAnnotations: dapr.io/enabled: "true" - dapr.io/app-port: "8000" + dapr.io/app-port: "8085" dapr.io/config: "tracing" dapr.io/app-protocol: "http" - dapr.io/enable-app-health-check: "true" - dapr.io/app-health-check-path: "/healthz" - dapr.io/app-health-probe-interval: "3" - dapr.io/app-health-probe-timeout: "200" - dapr.io/app-health-threshold: "2" - dapr.io/sidecar-cpu-request: "100m" - dapr.io/sidecar-memory-request: "250Mi" - dapr.io/sidecar-cpu-limit: "300m" - dapr.io/sidecar-memory-limit: "1000Mi" dapr.io/log-as-json: "true" + dapr.io/sidecar-cpu-request: "10m" + dapr.io/sidecar-memory-request: "50Mi" + # dapr.io/sidecar-cpu-limit: "100m" + # dapr.io/sidecar-memory-limit: "1000Mi"