diff --git a/apps/prod-atlantis.yaml b/apps/prod-atlantis.yaml index c94f4dec..6544080d 100644 --- a/apps/prod-atlantis.yaml +++ b/apps/prod-atlantis.yaml @@ -31,7 +31,7 @@ spec: chart: redis helm: valueFiles: - - $values/values/redis/values-prod.yaml + - $values/values/atlantis/redis.yaml ignoreDifferences: - kind: Secret name: azure-keyvault diff --git a/apps/staging-atlantis.yaml b/apps/staging-atlantis.yaml index 949c0ac6..3754f83a 100644 --- a/apps/staging-atlantis.yaml +++ b/apps/staging-atlantis.yaml @@ -31,7 +31,7 @@ spec: chart: redis helm: valueFiles: - - $values/values/redis/values-staging.yaml + - $values/values/atlantis/staging/redis.yaml ignoreDifferences: - kind: Secret name: azure-keyvault diff --git a/apps/staging-sorcerer.yaml b/apps/staging-sorcerer.yaml index 385faca0..9f52cbcf 100644 --- a/apps/staging-sorcerer.yaml +++ b/apps/staging-sorcerer.yaml @@ -1,10 +1,10 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application +apiversion: argoproj.io/v1alpha1 +kind: application metadata: name: staging-sorcerer namespace: argocd annotations: - argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true + argocd.argoproj.io/sync-options: skipdryrunonmissingresource=true finalizers: - resources-finalizer.argocd.argoproj.io spec: @@ -13,11 +13,11 @@ spec: server: https://10.255.241.99:4443 project: atlantis sources: - - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: nixidy + - repourl: https://gitlab.com/oceanbox/manifests.git + targetrevision: nixidy ref: values - - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: nixidy + - repourl: https://gitlab.com/oceanbox/manifests.git + targetrevision: nixidy path: values/sorcerer plugin: name: kustomize-helm-with-rewrite @@ -26,23 +26,23 @@ spec: string: staging - name: hostname string: sorcerer.ekman.oceanbox.io - - repoURL: https://charts.bitnami.com/bitnami - targetRevision: 20.1.7 + - repourl: https://charts.bitnami.com/bitnami + targetrevision: 20.1.7 chart: redis helm: - valueFiles: - - $values/values/redis/values-staging.yaml - ignoreDifferences: - - kind: Secret + valuefiles: + - $values/values/sorcerer/staging/redis.yaml + ignoredifferences: + - kind: secret name: azure-keyvault - jqPathExpressions: + jqpathexpressions: - '.data' - '.metadata.labels' - '.metadata.annotations' - syncPolicy: - syncOptions: - - CreateNamespace=true - - ApplyOutOfSyncOnly=true + syncpolicy: + syncoptions: + - createnamespace=true + - applyoutofsynconly=true # automated: # prune: true - # selfHeal: false + # selfheal: false diff --git a/values/atlantis/prod/redis.yaml b/values/atlantis/prod/redis.yaml new file mode 100644 index 00000000..f9ca65a9 --- /dev/null +++ b/values/atlantis/prod/redis.yaml @@ -0,0 +1,23 @@ +architecture: replication + +replica: + replicaCount: 2 + +auth: + enabled: true + sentinel: true + password: "" + usePasswordFiles: false + existingSecretPasswordKey: "" + existingSecret: prod-atlantis-redis + +master: + resources: + limits: + ephemeral-storage: 1024Mi + memory: 192Mi + requests: + cpu: 150m + ephemeral-storage: 50Mi + memory: 128Mi + diff --git a/values/atlantis/staging/redis.yaml b/values/atlantis/staging/redis.yaml new file mode 100644 index 00000000..c81761f8 --- /dev/null +++ b/values/atlantis/staging/redis.yaml @@ -0,0 +1,23 @@ +architecture: standalone + +replica: + replicaCount: 1 + +auth: + enabled: true + sentinel: true + password: "" + usePasswordFiles: false + existingSecretPasswordKey: "" + existingSecret: staging-atlantis-redis + +master: + resources: + limits: + ephemeral-storage: 1024Mi + memory: 192Mi + requests: + cpu: 150m + ephemeral-storage: 50Mi + memory: 128Mi + diff --git a/values/atlantis/values-prod.yaml b/values/atlantis/values-prod.yaml index bc9d12cc..84a07fa1 100644 --- a/values/atlantis/values-prod.yaml +++ b/values/atlantis/values-prod.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: - tag: v2.96.0 + tag: v2.96.1 podAnnotations: dapr.io/app-id: "preprod-atlantis" diff --git a/values/sorcerer/staging/redis.yaml b/values/sorcerer/staging/redis.yaml new file mode 100644 index 00000000..498cda06 --- /dev/null +++ b/values/sorcerer/staging/redis.yaml @@ -0,0 +1,24 @@ + +architecture: standalone + +replica: + replicaCount: 1 + +auth: + enabled: true + sentinel: true + password: "" + usePasswordFiles: false + existingSecretPasswordKey: "" + existingSecret: staging-sorcerer-redis + +master: + resources: + limits: + ephemeral-storage: 1024Mi + memory: 192Mi + requests: + cpu: 150m + ephemeral-storage: 50Mi + memory: 128Mi + diff --git a/values/sorcerer/values-staging.yaml b/values/sorcerer/values-staging.yaml index 95390ede..5fe44da4 100644 --- a/values/sorcerer/values-staging.yaml +++ b/values/sorcerer/values-staging.yaml @@ -1,7 +1,7 @@ replicaCount: 1 image: - tag: v4.16.0 + tag: v4.16.1 podAnnotations: dapr.io/enabled: "true"