fix: update dapr configs with env name

manifests/archmeister/base/deployment_patch.yaml

@@ -1,21 +1,3 @@
-- op: add
-  path: /spec/template/metadata/annotations
-  value:
-    dapr.io/enabled: "true"
-    dapr.io/app-id: "archmeister"
-    dapr.io/app-port: "8000"
-    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"
 - op: replace
   path: /spec/template/spec/containers/0/livenessProbe/httpGet/path
   value: /healthz

manifests/archmeister/values-prod.yaml

@@ -1,3 +1,20 @@
+podAnnotations:
+  dapr.io/app-id: "prod-archmeister"
+  dapr.io/enabled: "true"
+  dapr.io/app-port: "8000"
+  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"
+
 ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production

manifests/archmeister/values-staging.yaml

@@ -1,3 +1,20 @@
+podAnnotations:
+  dapr.io/app-id: "staging-archmeister"
+  dapr.io/enabled: "true"
+  dapr.io/app-port: "8000"
+  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"
+
 image:
   tag: f8c27a74-debug
 ingress:

manifests/atlantis/base/deployment_patch.yaml

@@ -1,21 +1,3 @@
-- op: add
-  path: /spec/template/metadata/annotations
-  value:
-    dapr.io/enabled: "true"
-    dapr.io/app-id: "atlantis"
-    dapr.io/app-port: "8000"
-    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"
 - op: replace
   path: /spec/template/spec/containers/0/livenessProbe/httpGet/path
   value: /healthz

manifests/atlantis/prod/kustomization.yaml

@@ -18,3 +18,4 @@ patches:
     path: deployment_patch.yaml
 resources:
   - ../base
+  - subscriptions.yaml

manifests/atlantis/prod/subscriptions.yaml

@@ -6,8 +6,10 @@ spec:
   topic: hipster
   route: /hipster-events
   pubsubname: pubsub
+  metadata:
+    queueType: quorum
 scopes:
-- atlantis
+- prod-atlantis
 ---
 apiVersion: dapr.io/v1alpha1
 kind: Subscription
@@ -17,5 +19,7 @@ spec:
   topic: inbox
   route: /inbox-events
   pubsubname: pubsub
+  metadata:
+    queueType: quorum
 scopes:
-- atlantis
+- prod-atlantis

manifests/atlantis/staging/kustomization.yaml

@@ -18,3 +18,4 @@ patches:
     path: deployment_patch.yaml
 resources:
   - ../base
+  - subscriptions.yaml

manifests/atlantis/staging/subscriptions.yaml

@@ -0,0 +1,25 @@
+apiVersion: dapr.io/v1alpha1
+kind: Subscription
+metadata:
+  name: hipster-events
+spec:
+  topic: hipster
+  route: /hipster-events
+  pubsubname: pubsub
+  metadata:
+    queueType: quorum
+scopes:
+- staging-atlantis
+---
+apiVersion: dapr.io/v1alpha1
+kind: Subscription
+metadata:
+  name: inbox-events
+spec:
+  topic: inbox
+  route: /inbox-events
+  pubsubname: pubsub
+  metadata:
+    queueType: quorum
+scopes:
+- staging-atlantis

manifests/atlantis/values-prod.yaml

@@ -1,3 +1,20 @@
+podAnnotations:
+  dapr.io/app-id: "prod-atlantis"
+  dapr.io/enabled: "true"
+  dapr.io/app-port: "8000"
+  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"
+
 ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production

manifests/atlantis/values-staging.yaml

@@ -1,3 +1,20 @@
+podAnnotations:
+  dapr.io/app-id: "staging-atlantis"
+  dapr.io/enabled: "true"
+  dapr.io/app-port: "8000"
+  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"
+
 image:
   tag: c0c8de05-debug
 ingress:

manifests/hipster/prod/bindings.yaml

@@ -15,10 +15,10 @@ spec:
       name: prod-rabbitmq
       key:  connString
   - name: queueName
-    value: hipster-slurm-job-events
+    value: prod-hipster-slurm-job-events
   - name: durable
     value: true
   - name: contentType
     value: "application/json"
 scopes:
-  - hipster
+  - prod-hipster

manifests/hipster/staging/bindings.yaml

@@ -15,10 +15,10 @@ spec:
       name: staging-rabbitmq
       key:  connString
   - name: queueName
-    value: hipster-slurm-job-events
+    value: staging-hipster-slurm-job-events
   - name: durable
     value: true
   - name: contentType
     value: "application/json"
 scopes:
-  - hipster
+  - staging-hipster

manifests/petimeter/base/deployment_patch.yaml

@@ -1,21 +1,3 @@
-- op: add
-  path: /spec/template/metadata/annotations
-  value:
-    dapr.io/enabled: "true"
-    dapr.io/app-id: "petimeter"
-    dapr.io/app-port: "8000"
-    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"
 - op: replace
   path: /spec/template/spec/containers/0/livenessProbe/httpGet/path
   value: /healthz

manifests/petimeter/values-prod.yaml

@@ -1,3 +1,20 @@
+podAnnotations:
+  dapr.io/app-id: "prod-petimeter"
+  dapr.io/enabled: "true"
+  dapr.io/app-port: "8000"
+  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"
+
 ingress:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production

manifests/petimeter/values-staging.yaml

@@ -1,3 +1,20 @@
+podAnnotations:
+  dapr.io/app-id: "staging-petimeter"
+  dapr.io/enabled: "true"
+  dapr.io/app-port: "8000"
+  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"
+
 image:
   tag: 3d8fcb2a-debug
 ingress: