From cae45d5676a4d1234fcc04d8e5989385321cc8f0 Mon Sep 17 00:00:00 2001 From: Massaki Archambault Date: Sun, 29 Aug 2021 01:15:00 -0400 Subject: [PATCH] fix drone, enable nextcloud-tweak --- .../bases/drone/drone-runner-deployment.yaml | 4 +-- kustomize/bases/nextcloud/kustomization.yaml | 1 - .../bases/nextcloud/nextcloud-cronjob.yaml | 29 ------------------- .../bases/nextcloud/nextcloud-deployment.yaml | 7 ++--- kustomize/bases/redis/redis-deployment.yaml | 2 +- .../traefik/traefik-helmchartconfig.yaml | 1 + kustomize/overlays/dev/kustomization.yaml | 16 +++++----- kustomize/overlays/prod/kustomization.yaml | 17 ++++++----- 8 files changed, 23 insertions(+), 54 deletions(-) delete mode 100644 kustomize/bases/nextcloud/nextcloud-cronjob.yaml diff --git a/kustomize/bases/drone/drone-runner-deployment.yaml b/kustomize/bases/drone/drone-runner-deployment.yaml index 4d119e9..fadd766 100644 --- a/kustomize/bases/drone/drone-runner-deployment.yaml +++ b/kustomize/bases/drone/drone-runner-deployment.yaml @@ -20,12 +20,12 @@ spec: - name: drone image: drone/drone-runner-kube env: - - name: NAMESPACE + - name: DRONE_NAMESPACE_DEFAULT valueFrom: fieldRef: fieldPath: metadata.namespace - name: DRONE_RPC_HOST - value: drone.$(NAMESPACE).svc.cluster.local + value: drone-server.$(DRONE_NAMESPACE_DEFAULT).svc.cluster.local - name: DRONE_RPC_PROTO value: http - name: DRONE_RPC_SECRET diff --git a/kustomize/bases/nextcloud/kustomization.yaml b/kustomize/bases/nextcloud/kustomization.yaml index f3c744c..b55ee5e 100644 --- a/kustomize/bases/nextcloud/kustomization.yaml +++ b/kustomize/bases/nextcloud/kustomization.yaml @@ -4,5 +4,4 @@ bases: resources: - nextcloud-deployment.yaml - # - nextcloud-cronjob.yaml - nextcloud-ingress.yaml diff --git a/kustomize/bases/nextcloud/nextcloud-cronjob.yaml b/kustomize/bases/nextcloud/nextcloud-cronjob.yaml deleted file mode 100644 index b1e4985..0000000 --- a/kustomize/bases/nextcloud/nextcloud-cronjob.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: batch/v1 -kind: CronJob -metadata: - name: nextcloud-cronjob -spec: - schedule: "*/5 * * * *" - concurrencyPolicy: Forbid - jobTemplate: - spec: - template: - spec: - restartPolicy: OnFailure - containers: - - name: nextcloud - image: nextcloud - securityContext: - runAsUser: 33 - runAsGroup: 33 - command: - - php - - -f - - /var/www/html/cron.php - volumeMounts: - - name: nextcloud-pv - mountPath: /var/www/html - volumes: - - name: nextcloud-pv - persistentVolumeClaim: - claimName: nextcloud-pvc diff --git a/kustomize/bases/nextcloud/nextcloud-deployment.yaml b/kustomize/bases/nextcloud/nextcloud-deployment.yaml index 9eb7da8..16990be 100644 --- a/kustomize/bases/nextcloud/nextcloud-deployment.yaml +++ b/kustomize/bases/nextcloud/nextcloud-deployment.yaml @@ -75,11 +75,8 @@ spec: - name: nextcloud-pv mountPath: /var/www/html # - name: nextcloud-cron - # image: nextcloud - # command: ['crond'] - # securityContext: - # runAsUser: 33 - # runAsGroup: 33 + # image: badjware/nextcloud-tweak + # command: ['cron', '-f'] # volumeMounts: # - name: nextcloud-pv # mountPath: /var/www/html diff --git a/kustomize/bases/redis/redis-deployment.yaml b/kustomize/bases/redis/redis-deployment.yaml index 2b4ef37..08aede8 100644 --- a/kustomize/bases/redis/redis-deployment.yaml +++ b/kustomize/bases/redis/redis-deployment.yaml @@ -17,7 +17,7 @@ spec: containers: - name: redis image: redis - args: ["--requirepass", "$(REDIS_PASSWORD)"] + args: ["--appendonly", "yes", "--requirepass", "$(REDIS_PASSWORD)"] env: - name: REDIS_PASSWORD valueFrom: diff --git a/kustomize/bases/traefik/traefik-helmchartconfig.yaml b/kustomize/bases/traefik/traefik-helmchartconfig.yaml index 0071e7f..c4fa3f0 100644 --- a/kustomize/bases/traefik/traefik-helmchartconfig.yaml +++ b/kustomize/bases/traefik/traefik-helmchartconfig.yaml @@ -5,6 +5,7 @@ metadata: spec: valuesContent: |- additionalArguments: + - '--entryPoints.web.forwardedHeaders.insecure' - '--serversTransport.insecureSkipVerify=true' - '--metrics.prometheus=true' ports: diff --git a/kustomize/overlays/dev/kustomization.yaml b/kustomize/overlays/dev/kustomization.yaml index 209277e..77b2471 100644 --- a/kustomize/overlays/dev/kustomization.yaml +++ b/kustomize/overlays/dev/kustomization.yaml @@ -7,21 +7,21 @@ bases: images: - name: gitea/gitea - newtag: 1.15.0 + newTag: 1.15.0 - name: grafana - newtag: 8.1.2 + newTag: 8.1.2 - name: prom/node-exporter - newtag: v0.18.1 + newTag: v0.18.1 - name: drone/drone - newtag: 2.0.6 + newTag: 2.0.6 - name: drone/drone-runner-kube - newtag: 1.0.0-beta.9 + newTag: 1.0.0-beta.9 - name: nextcloud - newtag: 22.1.0 + newTag: 22.1.0 - name: postgres - newtag: 9.6.23 + newTag: 9.6.23 - name: redis - newtag: 6.2.5 + newTag: 6.2.5 secretGenerator: - name: drone-secret diff --git a/kustomize/overlays/prod/kustomization.yaml b/kustomize/overlays/prod/kustomization.yaml index 0e9a8f1..5157c45 100644 --- a/kustomize/overlays/prod/kustomization.yaml +++ b/kustomize/overlays/prod/kustomization.yaml @@ -7,21 +7,22 @@ bases: images: - name: gitea/gitea - newtag: 1.15.0 + newTag: 1.15.0 - name: grafana - newtag: 8.1.2 + newTag: 8.1.2 - name: prom/node-exporter - newtag: v0.18.1 + newTag: v0.18.1 - name: drone/drone - newtag: 2.0.6 + newTag: 2.0.6 - name: drone/drone-runner-kube - newtag: 1.0.0-beta.9 + newTag: 1.0.0-beta.9 - name: nextcloud - newtag: 22.1.0 + newName: badjware/nextcloud-tweak + newTag: 22.1.0-2 - name: postgres - newtag: 9.6.23 + newTag: 9.6.23 - name: redis - newtag: 6.2.5 + newTag: 6.2.5 secretGenerator: - name: drone-secret