From c31bf79671fbb7a3f75dccc95ff5080de3801b95 Mon Sep 17 00:00:00 2001 From: Jonas Juselius Date: Thu, 19 Dec 2024 18:52:23 +0100 Subject: [PATCH] fix: update openfga --- apps/openfga.yaml | 43 +++++++++++++++++++++++++++-- values/openfga/postgres-secret.yaml | 17 ++++++------ values/openfga/values-staging.yaml | 2 +- values/openfga/values.yaml | 8 ------ 4 files changed, 50 insertions(+), 20 deletions(-) delete mode 100644 values/openfga/values.yaml diff --git a/apps/openfga.yaml b/apps/openfga.yaml index 179c9674..bb2272b4 100644 --- a/apps/openfga.yaml +++ b/apps/openfga.yaml @@ -1,5 +1,45 @@ apiVersion: argoproj.io/v1alpha1 kind: Application +metadata: + name: prod-openfga + namespace: argocd + annotations: + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true + finalizers: + - resources-finalizer.argocd.argoproj.io +spec: + destination: + namespace: openfga + server: https://kubernetes.default.svc + project: aux + # ignoreDifferences: + # - group: apps + # kind: StatefulSet + # jsonPointers: + # - /spec/persistentVolumeClaimRetentionPolicy + syncPolicy: + managedNamespaceMetadata: + labels: + component: aux + syncOptions: + - CreateNamespace=true + - ApplyOutOfSyncOnly=true + automated: + prune: true + selfHeal: true + sources: + - repoURL: https://openfga.github.io/helm-charts + targetRevision: 0.2.19 + chart: openfga + helm: + valueFiles: + - $values/values/openfga/values-prod.yaml + - repoURL: https://gitlab.com/oceanbox/manifests.git + targetRevision: nixidy + ref: values +--- +apiVersion: argoproj.io/v1alpha1 +kind: Application metadata: name: staging-openfga namespace: argocd @@ -33,8 +73,7 @@ spec: chart: openfga helm: valueFiles: - - $values/values/openfga/values.yaml - $values/values/openfga/values-staging.yaml - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: main + targetRevision: nixidy ref: values diff --git a/values/openfga/postgres-secret.yaml b/values/openfga/postgres-secret.yaml index 6596684d..8a6d2734 100644 --- a/values/openfga/postgres-secret.yaml +++ b/values/openfga/postgres-secret.yaml @@ -1,20 +1,19 @@ apiVersion: v1 stringData: - postgres-password: tidings-guise-sternness-yummy - uri: postgres://postgres:tidings-guise-sternness-yummy@staging-openfga-postgresql.idp.svc.cluster.local:5432/postgres?sslmode=disable + postgres-password: blT6zzv37KyFvzb1Ct3bhfAwPxhTG2fBO1EiIASQWI4wnEOB8AOWvmVa2sogGexr + uri: postgres://postgres:blT6zzv37KyFvzb1Ct3bhfAwPxhTG2fBO1EiIASQWI4wnEOB8AOWvmVa2sogGexr@prod-openfga-rw.openfga.svc.cluster.local:5432/postgres?sslmode=disable kind: Secret metadata: - name: staging-openfga-postgresql - namespace: idp + name: prod-openfga-postgresql + namespace: openfga type: Opaque --- apiVersion: v1 stringData: - postgres-password: unaltered-astute-raven-sitter - uri: postgres://postgres:unaltered-astute-raven-sitter@prod-openfga-postgresql.idp.svc.cluster.local:5432/postgres?sslmode=disable + postgres-password: tidings-guise-sternness-yummy + uri: postgres://postgres:tidings-guise-sternness-yummy@staging-openfga-rw.openfga.svc.cluster.local:5432/postgres?sslmode=disable kind: Secret metadata: - name: prod-openfga-postgresql - namespace: idp + name: staging-openfga-postgresql + namespace: openfga type: Opaque - diff --git a/values/openfga/values-staging.yaml b/values/openfga/values-staging.yaml index feed5475..09c94b3e 100644 --- a/values/openfga/values-staging.yaml +++ b/values/openfga/values-staging.yaml @@ -72,7 +72,7 @@ extraObjects: name: prod-openfga-replication sslKey: key: tls.key - name: prodopenfga-replication + name: prod-openfga-replication sslRootCert: key: ca.crt name: prod-openfga-ca diff --git a/values/openfga/values.yaml b/values/openfga/values.yaml deleted file mode 100644 index 8255d381..00000000 --- a/values/openfga/values.yaml +++ /dev/null @@ -1,8 +0,0 @@ -# fullnameOverride: openfga - -playground: - enabled: false - port: 3000 - - -