Skip to content

Commit

Permalink
remove unsure statements from installer.sh
Browse files Browse the repository at this point in the history
it's tested now, it works, we know where the failures are (and they
aren't a problem for now)

Signed-off-by: Kingdon Barrett <kingdon+github@tuesdaystudios.com>
  • Loading branch information
kingdonb committed Jun 16, 2024
1 parent d5af8d6 commit 4e6e1d7
Showing 1 changed file with 2 additions and 6 deletions.
8 changes: 2 additions & 6 deletions scripts/installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ run_migrations
# Install namespaces
make -C packages/core/platform namespaces-apply

# Install fluxcd
make -C packages/core/fluxcd apply
# Install fluxcd twice (once it will fail, since CRDs can't be ordered)
make -C packages/core/fluxcd apply || make -C packages/core/fluxcd apply

if flux_operator_is_ok; then
echo "Flux operator is installed and Flux CRD is ready"
Expand All @@ -58,8 +58,6 @@ fi
# Install platform chart
make -C packages/core/platform apply

# We should check flux_instance_is_ok, somewhere, but not yet... it won't be ready now

# Install basic system charts (should be after platform chart applied)
if ! flux_controllers_ok; then
install_basic_charts
Expand All @@ -68,8 +66,6 @@ fi
# Reconcile Helm repositories
kubectl annotate helmrepositories.source.toolkit.fluxcd.io -A -l cozystack.io/repository reconcile.fluxcd.io/requestedAt=$(date +"%Y-%m-%dT%H:%M:%SZ") --overwrite

# At this point I sure hope flux_instance_is_ok ( 😅 )

# Reconcile platform chart
trap 'exit' INT TERM
while true; do
Expand Down

0 comments on commit 4e6e1d7

Please sign in to comment.