diff --git a/k8s/applications/nextcloud/templates/secret-nc-default-creds.yaml b/k8s/applications/nextcloud/templates/secret-nc-default-creds.yaml new file mode 100644 index 0000000..7e1fa01 --- /dev/null +++ b/k8s/applications/nextcloud/templates/secret-nc-default-creds.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: v1 +kind: Secret +type: Opaque +metadata: + name: "{{ .Values.nextcloud.nextcloud.existingSecret.secretName }}" + annotations: + secret-generator.v1.mittwald.de/autogenerate: "{{ .Values.nextcloud.nextcloud.existingSecret.usernameKey }}" + secret-generator.v1.mittwald.de/autogenerate: "{{ .Values.nextcloud.nextcloud.existingSecret.passwordKey }}" +data: + empty: "" diff --git a/k8s/applications/nextcloud/templates/secret-redis .yaml b/k8s/applications/nextcloud/templates/secret-redis .yaml deleted file mode 100644 index 7973478..0000000 --- a/k8s/applications/nextcloud/templates/secret-redis .yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: "{{ .Values.nextcloud.externalRedis.existingSecret }}" -spec: - refreshInterval: 1h - secretStoreRef: - kind: ClusterSecretStore - name: redis - target: - name: "{{ .Values.nextcloud.externalRedis.existingSecret }}" # name of the k8s Secret to be created - data: - - secretKey: "{{ .Values.nextcloud.externalRedis.auth.existingSecretPasswordKey }}" - remoteRef: - key: "redis.password" - property: password diff --git a/k8s/applications/nextcloud/values-dev.yaml b/k8s/applications/nextcloud/values-dev.yaml index e69de29..49820de 100644 --- a/k8s/applications/nextcloud/values-dev.yaml +++ b/k8s/applications/nextcloud/values-dev.yaml @@ -0,0 +1,3 @@ +nextcloud: + nextcloud: + host: "nextcloud.me.local" diff --git a/k8s/applications/nextcloud/values-prod.yaml b/k8s/applications/nextcloud/values-prod.yaml index e69de29..d970488 100644 --- a/k8s/applications/nextcloud/values-prod.yaml +++ b/k8s/applications/nextcloud/values-prod.yaml @@ -0,0 +1,3 @@ +nextcloud: + nextcloud: + host: "nextcloud.home.sosnovsky.ca" diff --git a/k8s/applications/nextcloud/values.yaml b/k8s/applications/nextcloud/values.yaml index 14eeb1b..6986a80 100644 --- a/k8s/applications/nextcloud/values.yaml +++ b/k8s/applications/nextcloud/values.yaml @@ -11,6 +11,7 @@ nextcloud: nextcloud: existingSecret: enabled: true + secretName: "password.nextcloud.admin-initial" usernameKey: username passwordKey: password update: 0 @@ -36,6 +37,23 @@ nextcloud: rollingUpdate: maxSurge: 1 maxUnavailable: 0 + + # extraEnv: + # # - name: VIRTUAL_HOST + # # value: var.host + # # - name: NEXTCLOUD_HOSTNAME + # # value: var.host + # - name: REDIS_HOST + # value: redis-master.redis.svc.cluster.local + # - name: REDIS_HOST_PORT + # value: "6379" + # - name: REDIS_HOST_PASSWORD + # valueFrom: + # secretKeyRef: + # name: "password.redis.nextcloud" + # key: password + # # - name: TRUSTED_PROXIES + # # value: traefik.traefik internalDatabase: enabled: false @@ -51,12 +69,17 @@ nextcloud: usernameKey: username passwordKey: password - externalRedis: + redis: enabled: true - existingSecret: "password.redis.nextcloud" - auth: + auth: enabled: true - existingSecretPasswordKey: password + # externalRedis: + # enabled: true + # existingSecret: "password.redis.nextcloud" + # auth: + # enabled: true + # existingSecretPasswordKey: password + cronjob: enabled: true