diff --git a/README.md b/README.md index b58e1fc..a1b9724 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ export GITHUB_TOKEN= The following script will use the GitHub token to create a secret. Further, flux is deployed and configured with a pointer to this repo. This will deploy and configure all relevant components. ``` cd hack/deploy_flux -sh deploy_flux.sh +sh deploy_flux_dev.sh ``` Now it will take some time to reconcile all resources, you can either watch flux and kubernetes doing its work or continue with the next step. diff --git a/capi-visualizer/installation/helmrelease.yaml b/capi-visualizer/installation/helmrelease.yaml index fbbb07c..ce0eb6a 100644 --- a/capi-visualizer/installation/helmrelease.yaml +++ b/capi-visualizer/installation/helmrelease.yaml @@ -18,5 +18,5 @@ spec: createNamespace: true remediation: retries: -1 - interval: 3m0s + interval: 10s targetNamespace: capi-visualizer diff --git a/capi-visualizer/installation/helmrepo.yaml b/capi-visualizer/installation/helmrepo.yaml index 1894be4..00034ed 100644 --- a/capi-visualizer/installation/helmrepo.yaml +++ b/capi-visualizer/installation/helmrepo.yaml @@ -5,5 +5,5 @@ metadata: name: capi-visualizer namespace: flux-system spec: - interval: 1m0s + interval: 10s url: "https://jont828.github.io/cluster-api-visualizer/charts" diff --git a/capi/installation/helmrelease.yaml b/capi/installation/helmrelease.yaml index 1281139..3fe75d7 100644 --- a/capi/installation/helmrelease.yaml +++ b/capi/installation/helmrelease.yaml @@ -21,5 +21,5 @@ spec: createNamespace: true remediation: retries: -1 - interval: 3m0s + interval: 10s targetNamespace: capi-operator-system diff --git a/capi/installation/helmrepo.yaml b/capi/installation/helmrepo.yaml index 5ab87bd..63423b3 100644 --- a/capi/installation/helmrepo.yaml +++ b/capi/installation/helmrepo.yaml @@ -5,5 +5,5 @@ metadata: name: capi namespace: flux-system spec: - interval: 1m0s + interval: 10s url: https://kubernetes-sigs.github.io/cluster-api-operator diff --git a/cert-manager/installation/helmrelease.yaml b/cert-manager/installation/helmrelease.yaml index 75a71b9..d6ec7b6 100644 --- a/cert-manager/installation/helmrelease.yaml +++ b/cert-manager/installation/helmrelease.yaml @@ -9,7 +9,7 @@ spec: retries: 5 createNamespace: true targetNamespace: cert-manager - interval: 1m + interval: 10s values: installCRDs: true test: @@ -22,4 +22,4 @@ spec: kind: HelmRepository name: jetstack namespace: flux-system - interval: 1m + interval: 10s diff --git a/cert-manager/installation/helmrepo.yaml b/cert-manager/installation/helmrepo.yaml index 8f2c54d..6b11761 100644 --- a/cert-manager/installation/helmrepo.yaml +++ b/cert-manager/installation/helmrepo.yaml @@ -5,5 +5,5 @@ metadata: name: jetstack namespace: flux-system spec: - interval: 5m + interval: 10s url: https://charts.jetstack.io diff --git a/flux/config/capi-config-ks.yaml b/flux/config/capi-config-ks.yaml index cc51736..b2998c0 100644 --- a/flux/config/capi-config-ks.yaml +++ b/flux/config/capi-config-ks.yaml @@ -5,9 +5,10 @@ metadata: name: capi-config namespace: flux-system spec: + wait: true dependsOn: - name: capi-installation - interval: 1m0s + interval: 10s path: ./capi/config prune: true sourceRef: diff --git a/flux/config/capi-installation-ks.yaml b/flux/config/capi-installation-ks.yaml index af9b606..51edbb7 100644 --- a/flux/config/capi-installation-ks.yaml +++ b/flux/config/capi-installation-ks.yaml @@ -5,9 +5,15 @@ metadata: name: capi-installation namespace: flux-system spec: - interval: 1m0s + interval: 10s path: ./capi/installation prune: true sourceRef: kind: GitRepository name: flux-system + healthChecks: + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 + kind: HelmRelease + name: capi-operator + namespace: flux-system + timeout: 5m \ No newline at end of file diff --git a/flux/config/capi-visualizer-installation-ks.yaml b/flux/config/capi-visualizer-installation-ks.yaml index 08e08bf..b502863 100644 --- a/flux/config/capi-visualizer-installation-ks.yaml +++ b/flux/config/capi-visualizer-installation-ks.yaml @@ -5,7 +5,7 @@ metadata: name: capi-visualizer-installation namespace: flux-system spec: - interval: 1m0s + interval: 10s path: ./capi-visualizer/installation prune: true sourceRef: diff --git a/flux/config/cert-manager-installation-ks.yaml b/flux/config/cert-manager-installation-ks.yaml index 6cffef2..48efbbb 100644 --- a/flux/config/cert-manager-installation-ks.yaml +++ b/flux/config/cert-manager-installation-ks.yaml @@ -5,9 +5,15 @@ metadata: name: cert-manager-installation namespace: flux-system spec: - interval: 1m0s + interval: 10s path: ./cert-manager/installation prune: true sourceRef: kind: GitRepository name: flux-system + healthChecks: + - apiVersion: helm.toolkit.fluxcd.io/v2beta2 + kind: HelmRelease + name: cert-manager + namespace: flux-system + timeout: 5m \ No newline at end of file diff --git a/flux/config/cso-installation-ks.yaml b/flux/config/cso-installation-ks.yaml index 4f68ecb..6ce9f44 100644 --- a/flux/config/cso-installation-ks.yaml +++ b/flux/config/cso-installation-ks.yaml @@ -5,9 +5,11 @@ metadata: name: cso-installation namespace: flux-system spec: - interval: 1m0s + dependsOn: + - name: cert-manager-installation + interval: 10s path: ./cso/installation prune: true sourceRef: kind: GitRepository - name: flux-system + name: flux-system \ No newline at end of file diff --git a/flux/config/flux-config-ks.yaml b/flux/config/flux-config-ks.yaml index 73f1f43..6e69e80 100644 --- a/flux/config/flux-config-ks.yaml +++ b/flux/config/flux-config-ks.yaml @@ -5,7 +5,7 @@ metadata: name: flux-system namespace: flux-system spec: - interval: 1m0s + interval: 10s ref: branch: main url: https://github.com/SovereignCloudStack/moin-cluster-config.git @@ -16,7 +16,7 @@ metadata: name: flux-config namespace: flux-system spec: - interval: 10m0s + interval: 10s path: ./flux/config prune: true sourceRef: diff --git a/flux/config/flux-installation-ks.yaml b/flux/config/flux-installation-ks.yaml index 908d11d..a63e3e2 100644 --- a/flux/config/flux-installation-ks.yaml +++ b/flux/config/flux-installation-ks.yaml @@ -5,7 +5,7 @@ metadata: name: flux-installation namespace: flux-system spec: - interval: 10m0s + interval: 10s path: ./flux/installation prune: true sourceRef: diff --git a/flux/config/kyverno-config-ks.yaml b/flux/config/kyverno-config-ks.yaml index 0af8a9b..d42c1b8 100644 --- a/flux/config/kyverno-config-ks.yaml +++ b/flux/config/kyverno-config-ks.yaml @@ -5,11 +5,12 @@ metadata: name: kyverno-config namespace: flux-system spec: + wait: true dependsOn: - name: cso-installation - name: capi-installation - name: kyverno-installation - interval: 1m0s + interval: 10s path: ./kyverno/config prune: true sourceRef: diff --git a/flux/config/kyverno-installation-ks.yaml b/flux/config/kyverno-installation-ks.yaml index 3071361..7141530 100644 --- a/flux/config/kyverno-installation-ks.yaml +++ b/flux/config/kyverno-installation-ks.yaml @@ -5,7 +5,7 @@ metadata: name: kyverno-installation namespace: flux-system spec: - interval: 1m0s + interval: 10s path: ./kyverno/installation prune: true sourceRef: diff --git a/kyverno/installation/helmrelease.yaml b/kyverno/installation/helmrelease.yaml index ad5b90d..c43dba5 100644 --- a/kyverno/installation/helmrelease.yaml +++ b/kyverno/installation/helmrelease.yaml @@ -32,5 +32,5 @@ spec: - create - update - delete - interval: 3m0s + interval: 10s targetNamespace: kyverno diff --git a/kyverno/installation/helmrepo.yaml b/kyverno/installation/helmrepo.yaml index c80a8c4..8d2f1e0 100644 --- a/kyverno/installation/helmrepo.yaml +++ b/kyverno/installation/helmrepo.yaml @@ -5,5 +5,5 @@ metadata: name: kyverno namespace: flux-system spec: - interval: 1m0s + interval: 10s url: https://kyverno.github.io/kyverno/