From f6f806cec1f52c72014a0c3db9e9f8b37103758f Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Wed, 7 Jul 2021 13:59:49 +0200
Subject: [PATCH] move nginx to core because it depends on metallb
---
flux2/cluster/base/core.yaml | 14 ++++++++++++++
flux2/cluster/base/infrastructure.yaml | 4 ----
.../base}/nginx/kustomization.yaml | 0
.../base}/nginx/release.yaml | 2 ++
flux2/core/base/single-sign-on/release.yaml | 1 -
5 files changed, 16 insertions(+), 5 deletions(-)
rename flux2/{infrastructure => core/base}/nginx/kustomization.yaml (100%)
rename flux2/{infrastructure => core/base}/nginx/release.yaml (97%)
diff --git a/flux2/cluster/base/core.yaml b/flux2/cluster/base/core.yaml
index 169fadf0e..1ab369502 100644
--- a/flux2/cluster/base/core.yaml
+++ b/flux2/cluster/base/core.yaml
@@ -1,3 +1,4 @@
+---
apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
kind: Kustomization
metadata:
@@ -21,3 +22,16 @@ spec:
name: oas-oauth-variables
- kind: Secret
name: oas-cluster-variables
+ healthChecks:
+ - apiVersion: helm.toolkit.fluxcd.io/v1beta1
+ kind: HelmRelease
+ name: metallb
+ namespace: kube-system
+ - apiVersion: helm.toolkit.fluxcd.io/v1beta1
+ kind: HelmRelease
+ name: nginx
+ namespace: oas
+ - apiVersion: helm.toolkit.fluxcd.io/v1beta1
+ kind: HelmRelease
+ name: single-sign-on
+ namespace: oas
diff --git a/flux2/cluster/base/infrastructure.yaml b/flux2/cluster/base/infrastructure.yaml
index e61922d92..5de7ecd6e 100644
--- a/flux2/cluster/base/infrastructure.yaml
+++ b/flux2/cluster/base/infrastructure.yaml
@@ -21,10 +21,6 @@ spec:
kind: HelmRelease
name: local-path-provisioner
namespace: kube-system
- - apiVersion: helm.toolkit.fluxcd.io/v1beta1
- kind: HelmRelease
- name: nginx
- namespace: oas
- apiVersion: helm.toolkit.fluxcd.io/v1beta1
kind: HelmRelease
name: oas-secrets
diff --git a/flux2/infrastructure/nginx/kustomization.yaml b/flux2/core/base/nginx/kustomization.yaml
similarity index 100%
rename from flux2/infrastructure/nginx/kustomization.yaml
rename to flux2/core/base/nginx/kustomization.yaml
diff --git a/flux2/infrastructure/nginx/release.yaml b/flux2/core/base/nginx/release.yaml
similarity index 97%
rename from flux2/infrastructure/nginx/release.yaml
rename to flux2/core/base/nginx/release.yaml
index b96f36584..d2bf5270e 100644
--- a/flux2/infrastructure/nginx/release.yaml
+++ b/flux2/core/base/nginx/release.yaml
@@ -18,6 +18,8 @@ spec:
remediation:
retries: 3
timeout: 9m
+ dependsOn:
+ - name: metallb
values:
controller:
image:
diff --git a/flux2/core/base/single-sign-on/release.yaml b/flux2/core/base/single-sign-on/release.yaml
index 1fe758902..fda4dbbb5 100644
--- a/flux2/core/base/single-sign-on/release.yaml
+++ b/flux2/core/base/single-sign-on/release.yaml
@@ -19,7 +19,6 @@ spec:
install:
remediation:
retries: 3
-
values:
singleSignOnHost: &SSO_HOST "sso.${domain}"
--
GitLab