Use helm_resource for orderly chart deployments

Author: skkra0

tilt/Tiltfile

@@ -2,7 +2,7 @@ load('ext://restart_process', 'docker_build_with_restart')
 load('ext://secret', 'secret_create_generic', 'secret_from_dict', 'secret_yaml_registry')
 load('ext://dotenv', 'dotenv')
 load('ext://deployment', 'deployment_create')
-load('ext://helm_remote', 'helm_remote')
+load('ext://helm_resource', 'helm_resource', 'helm_repo')
 dotenv(fn='../backend/.env')
 
 # Should the frontend and backend be deployed separately?
@@ -18,6 +18,9 @@ with_rancher = False
 # Requires kubeVersion <1.35.0-0 
 RANCHER_VERSION="v2.13.2"
 
+# Increase timeout because ingress-nginx can take longer than 30s to install
+update_settings(k8s_upsert_timeout_secs=60)
+
 if separate_frontend_and_backend:
   docker_build(
     "anvilops-frontend", "../",
@@ -155,44 +158,43 @@ k8s_yaml(encode_yaml_stream(parsed))
 
 k8s_resource(workload='anvilops-postgres', port_forwards=[5432])
 
-# Install the Nginx ingress controller and forward localhost:3000, localhost:443
-helm_remote(
-  'ingress-nginx',
-  namespace='ingress-nginx',
-  repo_url='https://kubernetes.github.io/ingress-nginx',
-  create_namespace=True,
-  set=[
-  "controller.extraArgs.default-ssl-certificate=default/ingress-cert",
-  "controller.admissionWebhooks.enabled=false",
-  "controller.service.clusterIP=%s" % ingress_clusterip
-  ]
-  )
-
-# forwarding to 0.0.0.0:443 instead of just 443 bypasses privileged port restriction
-# https://github.com/tilt-dev/tilt/issues/1909
-k8s_resource('ingress-nginx-controller', port_forwards=('3000:80','0.0.0.0:443:443')) 
-
 if with_rancher:
-  # Rancher requires TLS, and depends on cert-manager CRDs
-  k8s_yaml('./cert-manager.crds.yaml')
-
   # Requires kubeVersion <1.35.0-0
   # # view the rancher frontend at https://rancher.127.0.0.1.nip.io
-  helm_remote(
+  helm_repo('rancher_repo', 'https://releases.rancher.com/server-charts/latest')
+  helm_resource(
     'rancher',
+    'rancher_repo/rancher',
     namespace='cattle-system',
-    repo_url='https://releases.rancher.com/server-charts/latest',
-    create_namespace=True,
-    version=RANCHER_VERSION,
-    set=[
-      'hostname=rancher.127.0.0.1.nip.io',
-      'replicas=1',
-      'ingress.ingressClassName=nginx',
-      'tls=external',
-      'bootstrapPassword=insecurepassword123'
-    ]
+    flags=[
+      '--version=%s' % RANCHER_VERSION,
+      '--set=hostname=rancher.127.0.0.1.nip.io',
+      '--set=replicas=1',
+      '--set=ingress.ingressClassName=nginx',
+      '--set=tls=external',
+      '--set=bootstrapPassword=insecurepassword123',
+      '--create-namespace'
+    ],
+    resource_deps=['rancher_repo']
   )
 
+# Install the Nginx ingress controller and forward localhost:3000, localhost:443
+# forwarding to 0.0.0.0:443 instead of just 443 bypasses privileged port restriction on MacOS
+# https://github.com/tilt-dev/tilt/issues/1909
+helm_repo('ingress-nginx_repo', 'https://kubernetes.github.io/ingress-nginx')
+helm_resource(
+  'ingress-nginx',
+  'ingress-nginx_repo/ingress-nginx',
+  namespace='ingress-nginx',
+  flags=[
+    '--create-namespace',
+    '--set=controller.extraArgs.default-ssl-certificate=default/ingress-cert',
+    '--set=controller.service.clusterIP=%s' % ingress_clusterip
+  ],
+  resource_deps=['ingress-nginx_repo'],
+  port_forwards=('3000:80','0.0.0.0:443:443')
+)
+
 if enable_monitoring:
   deployment_create(
     name = "lgtm",