Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kustomization readiness checks #19

Merged
merged 10 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export GITHUB_TOKEN=<GITHUB pat>
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.
Expand Down
2 changes: 1 addition & 1 deletion capi-visualizer/installation/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ spec:
createNamespace: true
remediation:
retries: -1
interval: 3m0s
interval: 10s
targetNamespace: capi-visualizer
2 changes: 1 addition & 1 deletion capi-visualizer/installation/helmrepo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
2 changes: 1 addition & 1 deletion capi/installation/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ spec:
createNamespace: true
remediation:
retries: -1
interval: 3m0s
interval: 10s
targetNamespace: capi-operator-system
2 changes: 1 addition & 1 deletion capi/installation/helmrepo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ metadata:
name: capi
namespace: flux-system
spec:
interval: 1m0s
interval: 10s
url: https://kubernetes-sigs.github.io/cluster-api-operator
4 changes: 2 additions & 2 deletions cert-manager/installation/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ spec:
retries: 5
createNamespace: true
targetNamespace: cert-manager
interval: 1m
interval: 10s
values:
installCRDs: true
test:
Expand All @@ -22,4 +22,4 @@ spec:
kind: HelmRepository
name: jetstack
namespace: flux-system
interval: 1m
interval: 10s
2 changes: 1 addition & 1 deletion cert-manager/installation/helmrepo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ metadata:
name: jetstack
namespace: flux-system
spec:
interval: 5m
interval: 10s
url: https://charts.jetstack.io
3 changes: 2 additions & 1 deletion flux/config/capi-config-ks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 7 additions & 1 deletion flux/config/capi-installation-ks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion flux/config/capi-visualizer-installation-ks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: capi-visualizer-installation
namespace: flux-system
spec:
interval: 1m0s
interval: 10s
path: ./capi-visualizer/installation
prune: true
sourceRef:
Expand Down
8 changes: 7 additions & 1 deletion flux/config/cert-manager-installation-ks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions flux/config/cso-installation-ks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions flux/config/flux-config-ks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -16,7 +16,7 @@ metadata:
name: flux-config
namespace: flux-system
spec:
interval: 10m0s
interval: 10s
path: ./flux/config
prune: true
sourceRef:
Expand Down
2 changes: 1 addition & 1 deletion flux/config/flux-installation-ks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: flux-installation
namespace: flux-system
spec:
interval: 10m0s
interval: 10s
path: ./flux/installation
prune: true
sourceRef:
Expand Down
3 changes: 2 additions & 1 deletion flux/config/kyverno-config-ks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion flux/config/kyverno-installation-ks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: kyverno-installation
namespace: flux-system
spec:
interval: 1m0s
interval: 10s
path: ./kyverno/installation
prune: true
sourceRef:
Expand Down
2 changes: 1 addition & 1 deletion kyverno/installation/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ spec:
- create
- update
- delete
interval: 3m0s
interval: 10s
targetNamespace: kyverno
2 changes: 1 addition & 1 deletion kyverno/installation/helmrepo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ metadata:
name: kyverno
namespace: flux-system
spec:
interval: 1m0s
interval: 10s
url: https://kyverno.github.io/kyverno/