From 5d86e81fb0fa77891f7b921c64597b097e2ff83e Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Thu, 30 Jan 2025 20:45:33 +0100 Subject: [PATCH] feat: change preprod to prod! --- apps/prod-atlantis.yaml | 6 +++--- values/atlantis/prod/appsettings.json | 2 +- values/atlantis/prod/bindings.yaml | 6 +++--- values/atlantis/prod/configurations.yaml | 6 +++--- values/atlantis/prod/kustomization.yaml | 2 +- values/atlantis/prod/pubsub.yaml | 2 +- values/atlantis/prod/rbac.yaml | 12 ++++++------ values/atlantis/prod/redis.yaml | 2 +- values/atlantis/prod/secrets.yaml | 2 +- values/atlantis/prod/statestore.yaml | 6 +++--- values/atlantis/prod/subscriptions.yaml | 4 ++-- values/atlantis/values-prod.yaml | 22 +++++++++++----------- 12 files changed, 36 insertions(+), 36 deletions(-) diff --git a/apps/prod-atlantis.yaml b/apps/prod-atlantis.yaml index 66c3fab4..41cabaa2 100644 --- a/apps/prod-atlantis.yaml +++ b/apps/prod-atlantis.yaml @@ -1,7 +1,7 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: preprod-atlantis + name: prod-atlantis namespace: argocd annotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true @@ -25,7 +25,7 @@ spec: - name: env string: prod - name: hostname - string: maps.beta.oceanbox.io + string: maps.oceanbox.io - repoURL: https://charts.bitnami.com/bitnami targetRevision: 20.1.7 chart: redis @@ -40,7 +40,7 @@ spec: - '.metadata.labels' - '.metadata.annotations' - kind: Secret - name: preprod-atlantis-rabbitmq + name: prod-atlantis-rabbitmq jqPathExpressions: - '.data' - '.metadata.labels' diff --git a/values/atlantis/prod/appsettings.json b/values/atlantis/prod/appsettings.json index 64381872..874c502f 100644 --- a/values/atlantis/prod/appsettings.json +++ b/values/atlantis/prod/appsettings.json @@ -53,7 +53,7 @@ "roles": [ "admin" ] } ], - "redis": "preprod-atlantis-redis-master:6379", + "redis": "prod-atlantis-redis-master:6379", "objectStore": "https://atlantis.blob.core.windows.net", "connString": "Username=postgres;Password=secret;Host=localhost;Port=5432;Database=app;Pooling=true;", "sorcerer" : "https://sorcerer.ekman.oceanbox.io", diff --git a/values/atlantis/prod/bindings.yaml b/values/atlantis/prod/bindings.yaml index be8d0355..8a95c563 100644 --- a/values/atlantis/prod/bindings.yaml +++ b/values/atlantis/prod/bindings.yaml @@ -8,10 +8,10 @@ spec: metadata: - name: host secretKeyRef: - name: preprod-atlantis-rabbitmq + name: prod-atlantis-rabbitmq key: connString - name: queueName - value: preprod-slurm-job-events + value: prod-slurm-job-events - name: durable value: true - name: contentType @@ -19,4 +19,4 @@ spec: - name: route value: /events/slurm scopes: - - preprod-atlantis + - prod-atlantis diff --git a/values/atlantis/prod/configurations.yaml b/values/atlantis/prod/configurations.yaml index b5ffeb47..705e1b48 100644 --- a/values/atlantis/prod/configurations.yaml +++ b/values/atlantis/prod/configurations.yaml @@ -7,14 +7,14 @@ spec: version: v1 metadata: - name: redisHost - value: preprod-atlantis-redis-master:6379 + value: prod-atlantis-redis-master:6379 - name: redisUsername value: default - name: redisPassword secretKeyRef: - name: preprod-atlantis-redis + name: prod-atlantis-redis key: redis-password - name: redisDB value: "1" scopes: - - preprod-atlantis + - prod-atlantis diff --git a/values/atlantis/prod/kustomization.yaml b/values/atlantis/prod/kustomization.yaml index 95fe2fdd..f0e148c2 100644 --- a/values/atlantis/prod/kustomization.yaml +++ b/values/atlantis/prod/kustomization.yaml @@ -1,7 +1,7 @@ generatorOptions: disableNameSuffixHash: true configMapGenerator: -- name: preprod-atlantis-appsettings +- name: prod-atlantis-appsettings files: - appsettings.json patches: diff --git a/values/atlantis/prod/pubsub.yaml b/values/atlantis/prod/pubsub.yaml index 201a17f5..b7aeda01 100644 --- a/values/atlantis/prod/pubsub.yaml +++ b/values/atlantis/prod/pubsub.yaml @@ -12,7 +12,7 @@ spec: value: user - name: password secretKeyRef: - name: preprod-atlantis-rabbitmq + name: prod-atlantis-rabbitmq key: rabbitmq-password - name: protocol value: amqp diff --git a/values/atlantis/prod/rbac.yaml b/values/atlantis/prod/rbac.yaml index 47492b73..772c7a95 100644 --- a/values/atlantis/prod/rbac.yaml +++ b/values/atlantis/prod/rbac.yaml @@ -1,13 +1,13 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: preprod-atlantis + name: prod-atlantis namespace: prod-atlantis rules: - apiGroups: - "" resourceNames: - - preprod-atlantis-appsettings + - prod-atlantis-appsettings resources: - configmaps verbs: @@ -17,7 +17,7 @@ rules: - "" resourceNames: - azure-keyvault - - preprod-atlantis-redis + - prod-atlantis-redis resources: - secrets verbs: @@ -27,13 +27,13 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: preprod-atlantis + name: prod-atlantis namespace: prod-atlantis roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: preprod-atlantis + name: prod-atlantis subjects: - kind: ServiceAccount - name: preprod-atlantis + name: prod-atlantis namespace: prod-atlantis diff --git a/values/atlantis/prod/redis.yaml b/values/atlantis/prod/redis.yaml index 74968ac1..f9ca65a9 100644 --- a/values/atlantis/prod/redis.yaml +++ b/values/atlantis/prod/redis.yaml @@ -9,7 +9,7 @@ auth: password: "" usePasswordFiles: false existingSecretPasswordKey: "" - existingSecret: preprod-atlantis-redis + existingSecret: prod-atlantis-redis master: resources: diff --git a/values/atlantis/prod/secrets.yaml b/values/atlantis/prod/secrets.yaml index fbf3b560..a956c207 100644 --- a/values/atlantis/prod/secrets.yaml +++ b/values/atlantis/prod/secrets.yaml @@ -4,6 +4,6 @@ metadata: annotations: kyverno/clone: "true" kyverno/env: "prod" - name: preprod-atlantis-rabbitmq + name: prod-atlantis-rabbitmq type: Opaque data: diff --git a/values/atlantis/prod/statestore.yaml b/values/atlantis/prod/statestore.yaml index 34145fe5..beb6ee64 100644 --- a/values/atlantis/prod/statestore.yaml +++ b/values/atlantis/prod/statestore.yaml @@ -7,16 +7,16 @@ spec: version: v1 metadata: - name: redisHost - value: preprod-atlantis-redis-master:6379 + value: prod-atlantis-redis-master:6379 - name: redisUsername value: default - name: redisPassword secretKeyRef: - name: preprod-atlantis-redis + name: prod-atlantis-redis key: redis-password - name: actorStateStore value: "true" - name: redisDB value: "0" scopes: - - preprod-atlantis + - prod-atlantis diff --git a/values/atlantis/prod/subscriptions.yaml b/values/atlantis/prod/subscriptions.yaml index 102e4809..d0d0dcce 100644 --- a/values/atlantis/prod/subscriptions.yaml +++ b/values/atlantis/prod/subscriptions.yaml @@ -10,7 +10,7 @@ spec: metadata: queueType: quorum scopes: -- preprod-atlantis +- prod-atlantis --- apiVersion: dapr.io/v2alpha1 kind: Subscription @@ -24,4 +24,4 @@ spec: metadata: queueType: quorum scopes: -- preprod-atlantis +- prod-atlantis diff --git a/values/atlantis/values-prod.yaml b/values/atlantis/values-prod.yaml index af3de200..99951925 100644 --- a/values/atlantis/values-prod.yaml +++ b/values/atlantis/values-prod.yaml @@ -1,16 +1,16 @@ replicaCount: 1 image: - tag: v2.97.3 + tag: v2.97.4 podAnnotations: - dapr.io/app-id: "preprod-atlantis" + dapr.io/app-id: "prod-atlantis" env: - name: APP_NAMESPACE value: prod-atlantis - name: APP_VERSION - value: "2.94.0" + value: "2.97.4" - name: LOG_LEVEL value: "2" - name: REDIS_USER @@ -18,22 +18,22 @@ env: - name: REDIS_PASSWORD valueFrom: secretKeyRef: - name: preprod-atlantis-redis + name: prod-atlantis-redis key: redis-password - name: DB_HOST value: prod-archmeister-rw.atlantis - #value: preprod-atlantis-db-rw + #value: prod-atlantis-db-rw - name: DB_PORT value: "5432" - name: DB_USER valueFrom: secretKeyRef: - name: preprod-atlantis-db-superuser + name: prod-atlantis-db-superuser key: username - name: DB_PASSWORD valueFrom: secretKeyRef: - name: preprod-atlantis-db-superuser + name: prod-atlantis-db-superuser key: password - name: DAPR_API_TOKEN valueFrom: @@ -47,7 +47,7 @@ ingress: cert-manager.io/cluster-issuer: letsencrypt-production nginx.ingress.kubernetes.io/proxy-buffer-size: 128k hosts: - - host: maps.beta.oceanbox.io + - host: maps.oceanbox.io paths: - path: / pathType: ImplementationSpecific @@ -66,7 +66,7 @@ ingress: pathType: ImplementationSpecific tls: - hosts: - - maps.beta.oceanbox.io + - maps.oceanbox.io secretName: prod-atlantis-tls cluster: @@ -74,8 +74,8 @@ cluster: bootstrap: enabled: true source: - db: prod-archmeister - namespace: atlantis + db: staging-atlantis-db + namespace: staging-atlantis resources: limits: