chore: avoid double slashes in URL (#80)

paulovmr · andyatmiami · commit 292394eccc3a · 2025-11-20T12:57:35.000-05:00
Signed-off-by: Paulo Rego &lt;832830+paulovmr@users.noreply.github.com&gt;
diff --git a/developing/DEVELOPMENT.md b/developing/DEVELOPMENT.md
@@ -43,9 +43,9 @@ node --version
 npm --version
 ```
 
-### Install Kind (Optional)
+### Install Kind
 
-**Note**: Tilt will automatically create a Kind cluster named `tilt` if it doesn't exist. However, you still need to have `kind` installed.
+**Note**: The Makefile will automatically create a Kind cluster named `tilt` if it doesn't exist. However, you still need to have `kind` installed.
 
 ```bash
 # macOS
@@ -54,21 +54,38 @@ brew install kind
 # Or follow instructions at: https://kind.sigs.k8s.io/docs/user/quick-start/#installation
 ```
 
-**Alternative**: If you prefer to use a different Kubernetes cluster (Docker Desktop, Minikube, etc.), you can skip Kind installation. Just ensure your cluster is running and `kubectl` is configured to use it. Tilt will detect and use your current `kubectl` context.
+
+### Using Kind Provider (Optional)
+
+You can choose to set the `KIND_EXPERIMENTAL_PROVIDER` environment variable in your shell session:
+
+```bash
+export KIND_EXPERIMENTAL_PROVIDER=podman
+```
+
+The Makefile will honor this environment variable when creating the Kind cluster.
 
 ## Quick Start
 
 1. **Navigate to the developing directory**:
    ```bash
-   cd workspaces/developing
+   cd developing
    ```
 
-2. **Start Tilt**:
+2. **Start Tilt using the Makefile**:
    ```bash
-   tilt up
+   make tilt
    ```
 
+   **Important**: Always use `make tilt` instead of running `tilt up` directly. The Makefile ensures:
+   - The Kind cluster exists and is properly configured
+   - The Kubernetes context is switched to `kind-tilt`
+   - Cert-manager is installed (required for webhooks)
+   - All prerequisites are met before Tilt starts
+
    This will:
+   - Set up the Kind cluster (if it doesn't exist)
+   - Install cert-manager
    - Open the Tilt UI in your browser (usually http://localhost:10350)
    - Build the controller and backend Docker images
    - Deploy them to your Kubernetes cluster
@@ -80,22 +97,20 @@ brew install kind
 
    Watch the Tilt UI in your browser. You should see:
 
-   1. **Setup Resources** (one-time setup):
-      - `setup-kind` - Creating/verifying Kind cluster (if using Kind)
-      - `setup-cert-manager` - Installing cert-manager (required for webhooks)
-      - `install-crds` - Installing CRDs
-
-   2. **Local Resources**:
+   1. **Local Resources**:
       - `controller-generate` - Generating manifests and code
+      - `install-crds` - Installing CRDs
       - `workspaces-frontend` - Running webpack dev server (if enabled)
 
-   3. **Docker Resources** (building images):
+   2. **Docker Resources** (building images):
       - `workspaces-controller`
       - `workspaces-backend`
 
-   4. **Kubernetes Resources** (deploying):
+   3. **Kubernetes Resources** (deploying):
       - Deployments, Services, etc.
 
+   **Note**: The Kind cluster and cert-manager setup are handled by the Makefile before Tilt starts, so you won't see those as Tilt resources.
+
    Wait until all resources show green/healthy status.
 
 5. **Access the componenets**:
@@ -107,6 +122,8 @@ brew install kind
    ```bash
    # In the terminal where Tilt is running, press Ctrl+C
    # Or in another terminal:
+   make tilt-down
+   # Or:
    tilt down
    ```
 
@@ -128,12 +145,22 @@ kind delete cluster --name tilt
 
 ## Configuration
 
+### Makefile Targets
+
+The Makefile provides several targets for managing your development environment:
+
+- `make tilt` or `make` - Set up Kind cluster, install cert-manager, and start Tilt
+- `make tilt-up` - Alias for `make tilt`
+- `make tilt-down` - Stop Tilt
+- `make setup-kind` - Set up the Kind cluster only (without starting Tilt)
+- `make setup-cert-manager` - Install cert-manager only (requires Kind cluster)
+
 ### Skipping Frontend
 
 To run Tilt without the frontend (useful for backend/controller-only development):
 
 ```bash
-ENABLE_FRONTEND=false tilt up
+ENABLE_FRONTEND=false make tilt
 ```
 
 ### Custom Ports
@@ -206,21 +233,32 @@ export DOCKER_BUILDKIT=0
 
 ### Kubernetes Connection Issues
 
-Ensure:
-- `kubectl` is configured correctly (`kubectl cluster-info`)
-- Your cluster is running and accessible
-- You have permissions to create resources in the `kubeflow-workspaces` namespace
+The Makefile automatically handles context switching to `kind-tilt`. If you encounter issues:
 
-```bash
-# Verify cluster is accessible
-kubectl cluster-info
+1. **Verify the Kind cluster exists**:
+   ```bash
+   kind get clusters
+   ```
 
-# Check current context
-kubectl config current-context
+2. **Check the current context**:
+   ```bash
+   kubectl config current-context
+   # Should be: kind-tilt
+   ```
 
-# List available contexts
-kubectl config get-contexts
-```
+3. **If context is wrong, manually switch**:
+   ```bash
+   kubectl config use-context kind-tilt
+   ```
+
+4. **Verify cluster is accessible**:
+   ```bash
+   kubectl cluster-info
+   ```
+
+5. **Ensure you have permissions** to create resources in the `kubeflow-workspaces` namespace
+
+**Note**: If you're running `tilt up` directly (not via `make tilt`), you may be on the wrong Kubernetes context. Always use `make tilt` to ensure the correct context is set.
 
 ### Port Already in Use
 
@@ -262,5 +300,6 @@ Also check that you have cluster-admin permissions or appropriate RBAC.
    - Node modules: `npm ci` in frontend
 
 3. **Clean up resources**:
-   - Always run `tilt down` when done
+   - Always run `make tilt-down` (or `tilt down`) when done
    - Optionally: `kubectl delete namespace kubeflow-workspaces`
+   - Optionally: `kind delete cluster --name tilt` to remove the Kind cluster
diff --git a/developing/Makefile b/developing/Makefile
@@ -0,0 +1,39 @@
+.PHONY: tilt tilt-up tilt-down setup-kind setup-cert-manager
+
+# Default target
+.DEFAULT_GOAL := tilt
+
+# Variables
+CLUSTER_NAME := tilt
+KIND_CONTEXT := kind-$(CLUSTER_NAME)
+
+# Export KIND_EXPERIMENTAL_PROVIDER to honor it if set in user's environment
+# (e.g., KIND_EXPERIMENTAL_PROVIDER=podman for podman support)
+export KIND_EXPERIMENTAL_PROVIDER
+
+# Ensure kind cluster exists and context is set before running tilt
+setup-kind:
+	@echo "Setting up Kind cluster..."
+	@if [ -n "$$KIND_EXPERIMENTAL_PROVIDER" ]; then \
+		echo "Using KIND_EXPERIMENTAL_PROVIDER=$$KIND_EXPERIMENTAL_PROVIDER"; \
+	fi
+	@./scripts/setup-kind.sh
+
+# Install cert-manager (depends on kind cluster being set up)
+setup-cert-manager: setup-kind
+	@echo "Setting up cert-manager..."
+	@./scripts/setup-cert-manager.sh
+
+# Run tilt up with kind cluster and cert-manager setup
+tilt: setup-cert-manager
+	@echo "Starting Tilt..."
+	@tilt up
+
+# Alias for tilt
+tilt-up: tilt
+
+# Stop Tilt
+tilt-down:
+	@echo "Stopping Tilt..."
+	@tilt down
+
diff --git a/developing/OWNERS b/developing/OWNERS
diff --git a/developing/Tiltfile b/developing/Tiltfile
@@ -10,15 +10,17 @@ version_settings(check_updates=True, constraint=">=0.33.0")
 # Increase timeout for k8s operations
 update_settings(k8s_upsert_timeout_secs=120)
 
+# Allow kind-tilt context (set up by Makefile before tilt runs)
+allow_k8s_contexts('kind-tilt')
 
 # Allow skipping frontend via environment variable
 enable_frontend = os.getenv("ENABLE_FRONTEND", "true").lower() == "true"
 
 # Get paths relative to Tiltfile location
 # Tilt evaluates paths relative to the Tiltfile directory
 tilt_root = os.path.dirname(os.path.abspath(__file__))
-# Go up 2 levels from Tiltfile location: developing -> workspaces -> repo root
-workspace_root = os.path.dirname(os.path.dirname(tilt_root))
+# Go up 1 level from Tiltfile location: developing -> repo root
+workspace_root = os.path.dirname(tilt_root)
 
 # Define paths relative to workspace root
 controller_dir = os.path.join(workspace_root, "workspaces/controller")
@@ -32,43 +34,25 @@ frontend_dir = os.path.join(workspace_root, "workspaces/frontend")
 watch_settings(
     ignore=[
         # Controller generated files
+        os.path.join(controller_dir, "bin/**"),
         os.path.join(controller_dir, "**/zz_generated.*"),
         os.path.join(controller_dir, "config/crd/**"),
         os.path.join(controller_dir, "config/webhook/manifests.yaml"),
         # Backend generated files
+        os.path.join(backend_dir, "bin/**"),
         os.path.join(backend_dir, "openapi/**"),
         # Frontend generated files
+        os.path.join(frontend_dir, "bin/**"),
         os.path.join(frontend_dir, "src/generated/**"),
     ],
 )
 
 
 
-# ============================================================================
-# Setup Resources (must run first)
-# ============================================================================
-
-# Kind Cluster Setup - must be first, no dependencies
-local_resource(
-    "setup-kind",
-    cmd=os.path.join(tilt_root, "scripts/setup-kind.sh"),
-    labels=["setup"],
-    resource_deps=[],
-    allow_parallel=False,
-)
-
-# Cert-Manager Installation - depends on Kind cluster
-local_resource(
-    "setup-cert-manager",
-    cmd=os.path.join(tilt_root, "scripts/setup-cert-manager.sh"),
-    labels=["setup"],
-    resource_deps=["setup-kind"],
-    allow_parallel=False,
-)
-
 # ============================================================================
 # Controller
 # ============================================================================
+# Note: Kind cluster and cert-manager are set up by the Makefile before Tilt starts
 
 # Generate manifests and code (needed before Docker build)
 # Note: Skip 'fmt' step to prevent infinite rebuild loops (fmt modifies files in place)
@@ -82,20 +66,7 @@ local_resource(
         os.path.join(controller_dir, "go.mod"),
         os.path.join(controller_dir, "go.sum"),
     ],
-    ignore=["bin/", "**/zz_generated.*", "**/config/crd/**"],
-    labels=["controller"],
-)
-
-# CRDs Installation - depends on cert-manager and controller generate
-# Runs after controller-generate to ensure we install the latest generated CRDs
-# Note: No deps parameter - we don't want to watch for file changes since both
-# controller-generate and install-crds run manifests which would create a loop
-local_resource(
-    "install-crds",
-    cmd="cd {} && make install".format(controller_dir),
     labels=["controller"],
-    resource_deps=["setup-cert-manager", "controller-generate"],
-    allow_parallel=False,
 )
 
 # Docker build for controller using production Dockerfile
@@ -110,7 +81,7 @@ docker_build(
 
 # K8s deployment for controller - use kustomize to build and preprocess YAMLs
 # Note: kustomize needs to be available (installed via controller Makefile)
-# Note: cert-manager must be installed before deploying (handled by setup-cert-manager)
+# Note: cert-manager is already installed by Makefile before Tilt starts
 controller_kustomize_path = "config/default"
 
 # Build manifests with kustomize
@@ -152,7 +123,7 @@ k8s_yaml(overridden_manifests)
 k8s_resource(
     "workspaces-controller",
     port_forwards=["8080:8080", "8081:8081"],  # metrics and health probe
-    resource_deps=["controller-generate", "setup-cert-manager", "install-crds"],
+    resource_deps=["controller-generate"],
     labels=["controller"],
 )
 
@@ -194,10 +165,10 @@ k8s_resource(
 if enable_frontend:
     # Run frontend as local resource using webpack dev server
     # This enables hot-reloading and faster development iteration
-    # Uses the start:tilt script which sets TILT_ENV=true to load .env.tilt
+    # Uses the start:tilt script which sets DEV_ENV=tilt to load .env.tilt
     # Frontend will be available at http://localhost:9000
     # Note: This is a long-running process, so it will show as "Updating" in Tilt UI
-    # Other resources don't need to wait for it (frontend proxies to backend)
+    # Frontend waits for backend to be ready to avoid 504 errors on initial page load
     local_resource(
         "workspaces-frontend",
         serve_cmd="cd {} && npm run start:tilt".format(frontend_dir),
@@ -209,8 +180,7 @@ if enable_frontend:
             os.path.join(frontend_dir, "dist"),
             os.path.join(frontend_dir, "coverage"),
         ],
-        # No resource_deps - frontend doesn't block other resources
-        # Frontend will proxy to backend when ready, but doesn't need to wait
+        resource_deps=["workspaces-backend"],
         labels=["frontend"],
     )
 
diff --git a/developing/scripts/setup-cert-manager.sh b/developing/scripts/setup-cert-manager.sh
@@ -1,17 +1,22 @@
 #!/usr/bin/env bash
 # Setup script for cert-manager
 # This script checks if cert-manager is installed and installs it if needed
+# Uses the same version as the e2e tests: v1.12.13 (LTS version)
 
 set -euo pipefail
 
+# Use LTS version of cert-manager (matches e2e tests)
+CERT_MANAGER_VERSION="v1.12.13"
+CERT_MANAGER_URL="https://github.com/jetstack/cert-manager/releases/download/${CERT_MANAGER_VERSION}/cert-manager.yaml"
+
 # Check if cert-manager is already installed
 if kubectl get crd certificates.cert-manager.io >/dev/null 2>&1; then
   echo "Cert-manager is already installed"
   exit 0
 fi
 
-echo "Installing cert-manager..."
-kubectl apply -f https://github.com/cert-manager/cert-manager/releases/latest/download/cert-manager.yaml
+echo "Installing cert-manager ${CERT_MANAGER_VERSION}..."
+kubectl apply -f "${CERT_MANAGER_URL}"
 
 echo "Waiting for cert-manager to be ready..."
 # Wait for cert-manager webhook to be ready (this is the critical component)
diff --git a/developing/scripts/setup-kind.sh b/developing/scripts/setup-kind.sh
diff --git a/workspaces/frontend/config/webpack.dev.js b/workspaces/frontend/config/webpack.dev.js
@@ -8,9 +8,7 @@ const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
 
 const smp = new SpeedMeasurePlugin({ disable: !process.env.MEASURE });
 
-// Use 'tilt' env if TILT_ENV is set, otherwise default to 'development'
-// This allows dotenv.js to naturally load .env.tilt without code changes
-const env = process.env.TILT_ENV === 'true' ? 'tilt' : 'development';
+const env = process.env.DEV_ENV ?? 'development';
 setupDotenvFilesForEnv({ env });
 const webpackCommon = require('./webpack.common.js');
 
@@ -85,7 +83,7 @@ module.exports = smp.wrap(
         port: PORT,
         compress: true,
         historyApiFallback: {
-          index: `${BASE_PATH}/index.html`,
+          index: `${BASE_PATH}/index.html`.replace('//', '/'),
         },
         hot: true,
         open: [BASE_PATH],
diff --git a/workspaces/frontend/package.json b/workspaces/frontend/package.json
@@ -21,7 +21,7 @@
     "build:prod": "webpack --config ./config/webpack.prod.js",
     "generate:api": "./scripts/generate-api.sh && npm run prettier",
     "start:dev": "webpack serve --hot --color --config ./config/webpack.dev.js",
-    "start:tilt": "TILT_ENV=true webpack serve --hot --color --config ./config/webpack.dev.js",
+    "start:tilt": "DEV_ENV=tilt npm run start:dev",
     "test": "run-s prettier:check test:lint test:type-check test:unit test:cypress-ci",
     "test:cypress-ci": "npx concurrently -P -k -s first \"CY_MOCK=1 npm run cypress:server:build && npm run cypress:server\" \"npx wait-on tcp:127.0.0.1:9001 && npm run cypress:run:mock -- {@}\" -- ",
     "test:jest": "jest --passWithNoTests",
