From 22fd52e751d075caaf0237c4f0aeb39b6420978f Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Tue, 13 Feb 2024 19:08:16 +0100 Subject: [PATCH] fix: fix atlantis common resources for staging and prod --- applications/atlantis-resources.yaml | 2 +- .../manifests/{ => prod}/dapr-tracing.yaml | 0 .../manifests/prod/kustomization.yaml | 6 +++ .../manifests/prod}/pubsub-rabbitmq.yaml | 2 +- .../atlantis/manifests/prod}/state-redis.yaml | 2 +- .../manifests/staging/dapr-tracing.yaml | 10 ++++ .../manifests/staging/kustomization.yaml | 6 +++ .../manifests/staging/pubsub-rabbitmq.yaml | 51 +++++++++++++++++++ .../manifests/staging/state-redis.yaml | 13 +++-- 9 files changed, 82 insertions(+), 10 deletions(-) rename resources/atlantis/manifests/{ => prod}/dapr-tracing.yaml (100%) create mode 100644 resources/atlantis/manifests/prod/kustomization.yaml rename {charts/hipster/manifests => resources/atlantis/manifests/prod}/pubsub-rabbitmq.yaml (97%) rename {charts/hipster/manifests => resources/atlantis/manifests/prod}/state-redis.yaml (93%) create mode 100644 resources/atlantis/manifests/staging/dapr-tracing.yaml create mode 100644 resources/atlantis/manifests/staging/kustomization.yaml create mode 100644 resources/atlantis/manifests/staging/pubsub-rabbitmq.yaml rename charts/hipster/manifests/pubsub-redis.yaml => resources/atlantis/manifests/staging/state-redis.yaml (59%) diff --git a/applications/atlantis-resources.yaml b/applications/atlantis-resources.yaml index 487a8129..8ec212bf 100644 --- a/applications/atlantis-resources.yaml +++ b/applications/atlantis-resources.yaml @@ -24,4 +24,4 @@ spec: sources: - repoURL: https://gitlab.com/oceanbox/manifests.git targetRevision: dev - path: resources/atlantis/manifests + path: 'resources/atlantis/manifests/{{ env }}' diff --git a/resources/atlantis/manifests/dapr-tracing.yaml b/resources/atlantis/manifests/prod/dapr-tracing.yaml similarity index 100% rename from resources/atlantis/manifests/dapr-tracing.yaml rename to resources/atlantis/manifests/prod/dapr-tracing.yaml diff --git a/resources/atlantis/manifests/prod/kustomization.yaml b/resources/atlantis/manifests/prod/kustomization.yaml new file mode 100644 index 00000000..10f80a16 --- /dev/null +++ b/resources/atlantis/manifests/prod/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - pubsub-rabbitmq.yaml + - state-redis.yaml + - dapr-tracing.yaml diff --git a/charts/hipster/manifests/pubsub-rabbitmq.yaml b/resources/atlantis/manifests/prod/pubsub-rabbitmq.yaml similarity index 97% rename from charts/hipster/manifests/pubsub-rabbitmq.yaml rename to resources/atlantis/manifests/prod/pubsub-rabbitmq.yaml index 242bb592..3db411fa 100644 --- a/charts/hipster/manifests/pubsub-rabbitmq.yaml +++ b/resources/atlantis/manifests/prod/pubsub-rabbitmq.yaml @@ -15,7 +15,7 @@ spec: - name: password value: secretKeyRef: - name: rabbitmq-secret + name: prod-rabbitmq key: rabbitmq-password - name: durable value: true diff --git a/charts/hipster/manifests/state-redis.yaml b/resources/atlantis/manifests/prod/state-redis.yaml similarity index 93% rename from charts/hipster/manifests/state-redis.yaml rename to resources/atlantis/manifests/prod/state-redis.yaml index 5262a327..f4f070d3 100644 --- a/charts/hipster/manifests/state-redis.yaml +++ b/resources/atlantis/manifests/prod/state-redis.yaml @@ -13,7 +13,7 @@ spec: - name: redisPassword value: secretKeyRef: - name: redis-secret + name: prod-redis key: redis-password - name: actorStateStore value: "true" diff --git a/resources/atlantis/manifests/staging/dapr-tracing.yaml b/resources/atlantis/manifests/staging/dapr-tracing.yaml new file mode 100644 index 00000000..004b98a2 --- /dev/null +++ b/resources/atlantis/manifests/staging/dapr-tracing.yaml @@ -0,0 +1,10 @@ +apiVersion: dapr.io/v1alpha1 +kind: Configuration +metadata: + name: tracing +spec: + tracing: + samplingRate: "1" + zipkin: + endpointAddress: "http://jaeger-collector:9411/api/v2/spans" + diff --git a/resources/atlantis/manifests/staging/kustomization.yaml b/resources/atlantis/manifests/staging/kustomization.yaml new file mode 100644 index 00000000..10f80a16 --- /dev/null +++ b/resources/atlantis/manifests/staging/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - pubsub-rabbitmq.yaml + - state-redis.yaml + - dapr-tracing.yaml diff --git a/resources/atlantis/manifests/staging/pubsub-rabbitmq.yaml b/resources/atlantis/manifests/staging/pubsub-rabbitmq.yaml new file mode 100644 index 00000000..eeba4feb --- /dev/null +++ b/resources/atlantis/manifests/staging/pubsub-rabbitmq.yaml @@ -0,0 +1,51 @@ +apiVersion: dapr.io/v1alpha1 +kind: Component +metadata: + name: pubsub +spec: + type: pubsub.rabbitmq + version: v1 + metadata: + - name: hostname + value: staging-rabbitmq.rabbitmq.svc + - name: protocol + value: amqp + - name: username + value: user + - name: password + value: + secretKeyRef: + name: staging-rabbitmq + key: rabbitmq-password + - 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: false + - 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 diff --git a/charts/hipster/manifests/pubsub-redis.yaml b/resources/atlantis/manifests/staging/state-redis.yaml similarity index 59% rename from charts/hipster/manifests/pubsub-redis.yaml rename to resources/atlantis/manifests/staging/state-redis.yaml index 631bec1e..0ac6e794 100644 --- a/charts/hipster/manifests/pubsub-redis.yaml +++ b/resources/atlantis/manifests/staging/state-redis.yaml @@ -1,20 +1,19 @@ apiVersion: dapr.io/v1alpha1 kind: Component metadata: - name: pubsub-redis + name: statestore spec: - type: pubsub.redis + type: state.redis version: v1 metadata: - name: redisHost - value: redis-master:6379 + value: staging-redis-master.redis.svc:6379 - name: redisUsername value: default - name: redisPassword value: secretKeyRef: - name: redis-secret + name: staging-redis key: redis-password - - name: consumerID - value: oceanbox - + - name: actorStateStore + value: "true"