From e11477f9875a393020948c38996dbb03c39765ef Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sun, 16 Apr 2023 02:28:49 +0000 Subject: [PATCH] nextcloud --- .../apps}/nextcloud/Chart.yaml | 0 .../apps}/nextcloud/templates/secret-db.yaml | 2 +- .../templates/secret-nc-default-creds.yaml | 0 k8s/apps/nextcloud/values-dev.yaml | 0 .../apps}/nextcloud/values-prod.yaml | 2 -- .../apps}/nextcloud/values.yaml | 16 +--------- k8s/argoapps/values.yaml | 31 ++++++++++++++----- .../applications/nextcloud/values-dev.yaml | 3 -- 8 files changed, 25 insertions(+), 29 deletions(-) rename {legacy/k8s/applications => k8s/apps}/nextcloud/Chart.yaml (100%) rename {legacy/k8s/applications => k8s/apps}/nextcloud/templates/secret-db.yaml (96%) rename {legacy/k8s/applications => k8s/apps}/nextcloud/templates/secret-nc-default-creds.yaml (100%) create mode 100644 k8s/apps/nextcloud/values-dev.yaml rename {legacy/k8s/applications => k8s/apps}/nextcloud/values-prod.yaml (90%) rename {legacy/k8s/applications => k8s/apps}/nextcloud/values.yaml (72%) delete mode 100644 legacy/k8s/applications/nextcloud/values-dev.yaml diff --git a/legacy/k8s/applications/nextcloud/Chart.yaml b/k8s/apps/nextcloud/Chart.yaml similarity index 100% rename from legacy/k8s/applications/nextcloud/Chart.yaml rename to k8s/apps/nextcloud/Chart.yaml diff --git a/legacy/k8s/applications/nextcloud/templates/secret-db.yaml b/k8s/apps/nextcloud/templates/secret-db.yaml similarity index 96% rename from legacy/k8s/applications/nextcloud/templates/secret-db.yaml rename to k8s/apps/nextcloud/templates/secret-db.yaml index 494cee2..f168681 100644 --- a/legacy/k8s/applications/nextcloud/templates/secret-db.yaml +++ b/k8s/apps/nextcloud/templates/secret-db.yaml @@ -7,7 +7,7 @@ spec: refreshInterval: 1h secretStoreRef: kind: ClusterSecretStore - name: database + name: chart-database target: name: "{{ .Values.nextcloud.externalDatabase.existingSecret.secretName }}" data: diff --git a/legacy/k8s/applications/nextcloud/templates/secret-nc-default-creds.yaml b/k8s/apps/nextcloud/templates/secret-nc-default-creds.yaml similarity index 100% rename from legacy/k8s/applications/nextcloud/templates/secret-nc-default-creds.yaml rename to k8s/apps/nextcloud/templates/secret-nc-default-creds.yaml diff --git a/k8s/apps/nextcloud/values-dev.yaml b/k8s/apps/nextcloud/values-dev.yaml new file mode 100644 index 0000000..e69de29 diff --git a/legacy/k8s/applications/nextcloud/values-prod.yaml b/k8s/apps/nextcloud/values-prod.yaml similarity index 90% rename from legacy/k8s/applications/nextcloud/values-prod.yaml rename to k8s/apps/nextcloud/values-prod.yaml index 5cb9dfc..21f9f16 100644 --- a/legacy/k8s/applications/nextcloud/values-prod.yaml +++ b/k8s/apps/nextcloud/values-prod.yaml @@ -1,7 +1,5 @@ nextcloud: nextcloud: - host: "nextcloud.home.sosnovsky.ca" - configs: proxy.config.php: |- array( - 0 => '127.0.0.1', - 1 => '10.0.0.0/8', - ), - 'overwritehost' => 'ssl-proxy.tld', - 'overwriteprotocol' => 'https', - 'overwritewebroot' => '/domain.tld/nextcloud', - 'forwarded_for_headers' => array('HTTP_X_FORWARDED_FOR'), - ); strategy: type: RollingUpdate rollingUpdate: @@ -48,7 +35,7 @@ nextcloud: enabled: true type: postgresql database: nextcloud - host: postgres.database.svc.cluster.local + host: changeme existingSecret: enabled: true secretName: password.pg.nextcloud @@ -66,7 +53,6 @@ nextcloud: persistence: enabled: true nextcloudData: - storageClass: "nfs-generic" enabled: true resources: requests: diff --git a/k8s/argoapps/values.yaml b/k8s/argoapps/values.yaml index 52c5a42..099052e 100644 --- a/k8s/argoapps/values.yaml +++ b/k8s/argoapps/values.yaml @@ -2,17 +2,10 @@ gitops: repo: "" commit: "" -apps: - ingresses: {} - db-users: - namespace: chart-database - values: |- - postgresSecret: "{{ .Values.secrets.database.secrets.dbmain.name }}" - global: email: "ariel@sosnovsky.ca" timezone: America/Toronto - domain: "" + domain: "changeme" tls: enabled: false issuer: "" @@ -23,6 +16,24 @@ global: server: "changme" share: "changeme" +apps: + nextcloud: + values: |- + nextcloud: + nextcloud: + host: "nextcloud.{{ .Values.global.domain }}" + externalDatabase: + host: postgres.chart-database.svc.cluster.local + persistence: + nextcloudData: + storageClass: {{ .Values.global.nfs.storageClass }} + existingClaim: {{ .Values.storage.nextcloudData.name }} + ingresses: {} + db-users: + namespace: chart-database + values: |- + postgresSecret: "{{ .Values.secrets.database.secrets.dbmain.name }}" + infrastructureCharts: cert-manager: repoURL: "https://charts.jetstack.io" @@ -80,6 +91,7 @@ secrets: secrets: dbmain: name: "pg.password" + storage: database: name: primary-database @@ -89,3 +101,6 @@ storage: resources: requests: storage: 8Gi + nextcloudData: + name: nextcloud-data + namespace: apps-nextcloud diff --git a/legacy/k8s/applications/nextcloud/values-dev.yaml b/legacy/k8s/applications/nextcloud/values-dev.yaml deleted file mode 100644 index 49820de..0000000 --- a/legacy/k8s/applications/nextcloud/values-dev.yaml +++ /dev/null @@ -1,3 +0,0 @@ -nextcloud: - nextcloud: - host: "nextcloud.me.local"