fix
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
locals {
|
||||
dns-name = "${var.sub-domain}.${var.domain-name}"
|
||||
common-labels = {
|
||||
"vynil.solidite.fr/owner-name" = var.instance
|
||||
"vynil.solidite.fr/owner-namespace" = var.namespace
|
||||
@@ -49,18 +50,8 @@ data "kustomization_overlay" "data" {
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: "${var.component}.${var.instance}-${var.component}.credentials.postgresql.acid.zalan.do"
|
||||
- name: NEXTCLOUD_ADMIN_USER
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: nextcloud
|
||||
key: nextcloud-username
|
||||
- name: NEXTCLOUD_ADMIN_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: nextcloud
|
||||
key: nextcloud-password
|
||||
- name: NEXTCLOUD_TRUSTED_DOMAINS
|
||||
value: nextcloud.kube.home
|
||||
value: "${local.dns-name}"
|
||||
- name: REDIS_HOST
|
||||
value: "${var.instance}-${var.component}-redis.${var.namespace}.svc"
|
||||
- name: REDIS_HOST_PASSWORD
|
||||
@@ -72,6 +63,16 @@ data "kustomization_overlay" "data" {
|
||||
imagePullPolicy: "${var.images.nginx.pullPolicy}"
|
||||
resources:
|
||||
{}
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
httpHeaders:
|
||||
- name: Host
|
||||
value: "${local.dns-name}"
|
||||
livenessProbe:
|
||||
httpGet:
|
||||
httpHeaders:
|
||||
- name: Host
|
||||
value: "${local.dns-name}"
|
||||
EOF
|
||||
}
|
||||
patches {
|
||||
@@ -92,28 +93,10 @@ data "kustomization_overlay" "data" {
|
||||
image: "${var.images.exporter.registry}/${var.images.exporter.repository}:${var.images.exporter.tag}"
|
||||
imagePullPolicy: "${var.images.exporter.pullPolicy}"
|
||||
env:
|
||||
- name: NEXTCLOUD_USERNAME
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: nextcloud
|
||||
key: nextcloud-username
|
||||
- name: NEXTCLOUD_PASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: nextcloud
|
||||
key: nextcloud-password
|
||||
- name: NEXTCLOUD_SERVER
|
||||
value: "https://${local.dns-name}"
|
||||
- name: NEXTCLOUD_TIMEOUT
|
||||
value: 5s
|
||||
- name: NEXTCLOUD_TLS_SKIP_VERIFY
|
||||
value: "false"
|
||||
ports:
|
||||
- name: metrics
|
||||
containerPort: 9205
|
||||
securityContext:
|
||||
runAsUser: 1000
|
||||
runAsNonRoot: true
|
||||
value: "${var.issuer=="letsencrypt-prod"?"false":"true"}"
|
||||
EOF
|
||||
}
|
||||
patches {
|
||||
@@ -126,6 +109,8 @@ data "kustomization_overlay" "data" {
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
name: nextcloud-nextcloud
|
||||
annotations:
|
||||
k8up.io/backup: "true"
|
||||
spec:
|
||||
accessModes:
|
||||
- "${var.storage.accessMode}"
|
||||
|
||||
Reference in New Issue
Block a user