diff --git a/applications/redis.yaml b/applications/redis.yaml index 4d727566..bfaa742a 100644 --- a/applications/redis.yaml +++ b/applications/redis.yaml @@ -22,13 +22,25 @@ spec: server: https://kubernetes.default.svc namespace: redis sources: - - repoURL: https://charts.bitnami.com/bitnami - targetRevision: 18.9.1 - chart: redis - helm: - valueFiles: - - $values/redis/values.yaml + # - repoURL: https://charts.bitnami.com/bitnami + # targetRevision: 18.9.1 + # chart: redis + # helm: + # valueFiles: + # - $values/redis/values.yaml + # - repoURL: https://gitlab.com/oceanbox/manifests.git + # targetRevision: HEAD + # path: charts/redis/{{ env }} + # ref: values - repoURL: https://gitlab.com/oceanbox/manifests.git - targetRevision: HEAD - path: charts/redis/{{ env }} - ref: values + targetRevision: dev + path: charts/redis + plugin: + name: kustomize-helm-with-rewrite + parameters: + - name: env + string: '{{ env }}' + - name: hostname + string: {{ hostname }} + - name: chart + string: bitnami/redis diff --git a/charts/redis/base/kustomization.yaml b/charts/redis/base/kustomization.yaml new file mode 100644 index 00000000..0637caf9 --- /dev/null +++ b/charts/redis/base/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- _manifest.yaml diff --git a/charts/redis/chart b/charts/redis/chart new file mode 100644 index 00000000..5ff67ce7 --- /dev/null +++ b/charts/redis/chart @@ -0,0 +1 @@ +bitnami/redis diff --git a/charts/redis/prod/kustomization.yaml b/charts/redis/prod/kustomization.yaml new file mode 100644 index 00000000..5462b99f --- /dev/null +++ b/charts/redis/prod/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- nodeport.yaml +- ../base diff --git a/charts/redis/staging/appsettings.json b/charts/redis/staging/appsettings.json new file mode 100644 index 00000000..4cabd08f --- /dev/null +++ b/charts/redis/staging/appsettings.json @@ -0,0 +1,43 @@ +{ + "connString": "Username=app;Password=secret;Host=staging-archmeister-rw;Port=5432;Database=app;Pooling=true;", + "oidc": { + "issuer": "https://idp.oceanbox.io/dex", + "authorization_endpoint": "https://idp.oceanbox.io/dex/auth", + "token_endpoint": "https://idp.oceanbox.io/dex/token", + "jwks_uri": "https://idp.oceanbox.io/dex/keys", + "userinfo_endpoint": "https://idp.oceanbox.io/dex/userinfo", + "device_authorization_endpoint": "https://idp.oceanbox.io/dex/device/code", + "clientId": "archmeister_dev", + "clientSecret": "", + "scopes": [ + "openid", + "email", + "offline_access", + "profile" + ] + }, + "sso": { + "cookieDomain": ".oceanbox.io", + "signedOutRedirectUri": "https://idp.oceanbox.io/dex/static/logout.html", + "redis": "redis-master,user=default,password=secret", + "appDomain": "atlantis", + "dataProtectionKeys": "DataProtection-Keys" + }, + "allowedOrigins": [ + "https://beta.sorcerer.ekman.oceanbox.io", + "https://sorcerer.ekman.oceanbox.io", + "https://sorcerer.hpc.oceanbox.io", + "https://s.local.oceanbox.io:8080", + "https://maps.oceanbox.io", + "https://atlantis.beta.oceanbox.io", + "https://jonas-atlantis.beta.oceanbox.io", + "https://simkir-atlantis.beta.oceanbox.io", + "https://stig-atlantis.beta.oceanbox.io", + "https://atlantis.local.oceanbox.io:8080" + ], + "logService" : "https://seq.oceanbox.io", + "logApiKey": "", + "cliUsers": [ + "admin:en-to-tre-fire" + ] +} diff --git a/charts/redis/staging/kustomization.yaml b/charts/redis/staging/kustomization.yaml new file mode 100644 index 00000000..93c79f6f --- /dev/null +++ b/charts/redis/staging/kustomization.yaml @@ -0,0 +1,9 @@ +patches: + - target: + version: v1 + kind: Secret + name: staging-redis + path: secret_patch.yaml +resources: +- nodeport.yaml +- ../base diff --git a/charts/redis/staging/secret_patch.yaml b/charts/redis/staging/secret_patch.yaml new file mode 100644 index 00000000..075fad87 --- /dev/null +++ b/charts/redis/staging/secret_patch.yaml @@ -0,0 +1,5 @@ +- op: add + path: /metadata/annotations + value: + secret-syncer.cloudarmin.me/enabled: "true" + secret-syncer.cloudarmin.me/destination-namespace: "atlantis"