From e0496141ee16c81b6448720fa0bcd20683f8bf5f Mon Sep 17 00:00:00 2001 From: xeruf <27jf@pm.me> Date: Thu, 30 Jun 2022 14:13:50 +0100 Subject: [PATCH] production: adjust kustomization healthChecks --- .../production/gitea-kustomization.yaml | 12 +++++++++--- .../production/suitecrm-kustomization.yaml | 18 +++++++++--------- .../production/vikunja-kustomization.yaml | 8 +++++--- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/basic/clusters/production/gitea-kustomization.yaml b/basic/clusters/production/gitea-kustomization.yaml index 73fc9d9..64701a6 100644 --- a/basic/clusters/production/gitea-kustomization.yaml +++ b/basic/clusters/production/gitea-kustomization.yaml @@ -6,7 +6,7 @@ metadata: namespace: flux-system spec: interval: 5m - timeout: 30m + timeout: 12h dependsOn: - name: single-sign-on sourceRef: @@ -14,8 +14,6 @@ spec: name: stackspout path: ./basic/apps/dev prune: true - # TODO what does this mean? - #validation: client healthChecks: - apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease @@ -23,6 +21,14 @@ spec: namespace: stackspout - apiVersion: apps/v1 kind: Deployment + name: gitea-memcached + namespace: stackspout + - apiVersion: apps/v1 + kind: StatefulSet + name: gitea-postgresql + namespace: stackspout + - apiVersion: apps/v1 + kind: StatefulSet name: gitea namespace: stackspout postBuild: diff --git a/basic/clusters/production/suitecrm-kustomization.yaml b/basic/clusters/production/suitecrm-kustomization.yaml index 6509b98..0fb71a0 100644 --- a/basic/clusters/production/suitecrm-kustomization.yaml +++ b/basic/clusters/production/suitecrm-kustomization.yaml @@ -6,7 +6,7 @@ metadata: namespace: flux-system spec: interval: 5m - timeout: 30m + timeout: 12h dependsOn: - name: single-sign-on sourceRef: @@ -14,8 +14,6 @@ spec: name: stackspout path: ./basic/apps/people prune: true - # TODO what does this mean? - #validation: client healthChecks: - apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease @@ -25,13 +23,15 @@ spec: kind: Deployment name: suitecrm namespace: stackspout + - apiVersion: apps/v1 + kind: StatefulSet + name: suitecrm-mariadb + namespace: stackspout postBuild: substituteFrom: - - kind: Secret - name: stackspin-suitecrm-variables - optional: true - - kind: Secret - name: stackspin-suitecrm-oauth-variables - optional: true + #- kind: Secret + # name: stackspin-suitecrm-variables + #- kind: Secret + # name: stackspin-suitecrm-oauth-variables - kind: Secret name: stackspin-cluster-variables diff --git a/basic/clusters/production/vikunja-kustomization.yaml b/basic/clusters/production/vikunja-kustomization.yaml index a1db967..6357127 100644 --- a/basic/clusters/production/vikunja-kustomization.yaml +++ b/basic/clusters/production/vikunja-kustomization.yaml @@ -6,7 +6,7 @@ metadata: namespace: flux-system spec: interval: 5m - timeout: 30m + timeout: 12h dependsOn: - name: single-sign-on sourceRef: @@ -14,8 +14,6 @@ spec: name: stackspout path: ./basic/apps/do prune: true - # TODO what does this mean? - #validation: client healthChecks: - apiVersion: helm.toolkit.fluxcd.io/v2beta1 kind: HelmRelease @@ -25,6 +23,10 @@ spec: kind: Deployment name: vikunja namespace: stackspout + - apiVersion: apps/v1 + kind: StatefulSet + name: gitea + namespace: stackspout postBuild: substituteFrom: #- kind: Secret