misc fast run

Signed-off-by: John Howard <[email protected]>

Author: howardjohn

.github/actions/prep-go-runner/action.yaml

@@ -24,11 +24,11 @@ runs:
 
         # https://github.com/actions/runner-images/discussions/3242 github runners are bad at cleanup
         echo "Removing large packages"
-        time sudo apt-get remove -y '^dotnet-.*' '^llvm-.*' 'php.*' '^mongodb-.*' '^mysql-.*' azure-cli google-chrome-stable \
-          firefox powershell mono-devel libgl1-mesa-dri || true
-        time sudo apt-get autoremove -y || true
-        time sudo apt-get clean -y || true
-        echo "Done removing large packages"
+        #time sudo apt-get remove -y '^dotnet-.*' '^llvm-.*' 'php.*' '^mongodb-.*' '^mysql-.*' azure-cli google-chrome-stable \
+        #  firefox powershell mono-devel libgl1-mesa-dri || true
+        #time sudo apt-get autoremove -y || true
+        #time sudo apt-get clean -y || true
+        #echo "Done removing large packages"
         df -h
 
         # Clean up pre-installed tools
@@ -85,4 +85,4 @@ runs:
     - name: Install Dependencies
       if: steps.cache.outputs.cache-hit != 'true'
       shell: bash
-      run: make mod-download
+      run: time make mod-download

Makefile

@@ -704,8 +704,8 @@ kind-reload-%: kind-build-and-load-% kind-set-image-% ; ## Use to build specifie
 
 .PHONY: kind-build-and-load ## Use to build all images and load them into kind
 kind-build-and-load: kind-build-and-load-kgateway
-kind-build-and-load: kind-build-and-load-envoy-wrapper
-kind-build-and-load: kind-build-and-load-sds
+#kind-build-and-load: kind-build-and-load-envoy-wrapper
+#kind-build-and-load: kind-build-and-load-sds
 
 .PHONY: kind-load ## Use to load all images into kind
 kind-load: kind-load-kgateway

cmd/kgateway/Dockerfile

@@ -1,19 +1,6 @@
-ARG ENVOY_IMAGE
-
-FROM $ENVOY_IMAGE
+FROM cgr.dev/chainguard/static@sha256:b2e1c3d3627093e54f6805823e73edd17ab93d6c7202e672988080c863e0412b AS distroless_source
 
 ARG GOARCH=amd64
-# eventually may matter for now https://unix.stackexchange.com/a/701288
-# means its not too useful
-ENV DEBIAN_FRONTEND=noninteractive
-
-# Update our deps to make cve toil lower
-#install wget for our default probes
-RUN apt-get update \
-    && apt-get upgrade -y \
-    && apt-get install --no-install-recommends -y  ca-certificates \
-    && apt-get install wget -y \
-    && rm -rf  /var/log/*log /var/lib/apt/lists/* /var/log/apt/* /var/lib/dpkg/*-old /var/cache/debconf/*-old
 
 COPY kgateway-linux-$GOARCH /usr/local/bin/kgateway
 

hack/kind/setup-kind.sh

@@ -56,9 +56,22 @@ function create_kind_cluster_or_skip() {
   fi
 }
 
+function create_and_setup() {
+  create_kind_cluster_or_skip
+
+  # 5. Apply the Kubernetes Gateway API CRDs
+  kubectl apply --server-side -f "https://github.com/kubernetes-sigs/gateway-api/releases/download/$CONFORMANCE_VERSION/$CONFORMANCE_CHANNEL-install.yaml"
+
+  # 6. Apply the Kubernetes Gateway API Inference Extension CRDs
+  kubectl apply --kustomize "https://github.com/kubernetes-sigs/gateway-api-inference-extension/config/crd?ref=$GIE_CRD_VERSION"
+
+  . $SCRIPT_DIR/setup-metalllb-on-kind.sh
+}
+
 # 1. Create a kind cluster (or skip creation if a cluster with name=CLUSTER_NAME already exists)
 # This config is roughly based on: https://kind.sigs.k8s.io/docs/user/ingress/
-create_kind_cluster_or_skip
+create_and_setup &
+KIND_PID=$!
 
 if [[ $SKIP_DOCKER == 'true' ]]; then
   # TODO(tim): refactor the Makefile & CI scripts so we're loading local
@@ -73,19 +86,9 @@ else
 
 fi
 
-# 5. Apply the Kubernetes Gateway API CRDs
-kubectl apply --server-side -f "https://github.com/kubernetes-sigs/gateway-api/releases/download/$CONFORMANCE_VERSION/$CONFORMANCE_CHANNEL-install.yaml"
-
-# 6. Apply the Kubernetes Gateway API Inference Extension CRDs
-kubectl apply --kustomize "https://github.com/kubernetes-sigs/gateway-api-inference-extension/config/crd?ref=$GIE_CRD_VERSION"
-
-# 7. Conformance test setup
-if [[ $CONFORMANCE == "true" ]]; then
-  echo "Running conformance test setup"
-  . $SCRIPT_DIR/setup-metalllb-on-kind.sh
-fi
+wait "$KIND_PID"
 
-# 9. Setup localstack
+# 7. Setup localstack
 if [[ $LOCALSTACK == "true" ]]; then
   echo "Setting up localstack"
   . $SCRIPT_DIR/setup-localstack.sh

test/e2e/testutils/helper/install.go

@@ -9,7 +9,6 @@ import (
 	"helm.sh/helm/v3/pkg/repo"
 
 	"github.com/kgateway-dev/kgateway/v2/pkg/logging"
-	"github.com/kgateway-dev/kgateway/v2/pkg/utils/fsutils"
 	"github.com/kgateway-dev/kgateway/v2/test/testutils"
 )
 
@@ -30,16 +29,7 @@ func GetLocalChartPath(chartName string, assetDir string) (string, error) {
 		dir = defaultTestAssetDir
 	}
 	rootDir := testutils.GitRootDirectory()
-	testAssetDir := filepath.Join(rootDir, dir)
-	if !fsutils.IsDirectory(testAssetDir) {
-		return "", fmt.Errorf("%s does not exist or is not a directory", testAssetDir)
-	}
-
-	version, err := getChartVersion(testAssetDir, chartName)
-	if err != nil {
-		return "", fmt.Errorf("getting Helm chart version: %w", err)
-	}
-	return filepath.Join(testAssetDir, fmt.Sprintf("%s-%s.tgz", chartName, version)), nil
+	return filepath.Join(rootDir, "install/helm", chartName), nil
 }
 
 // Parses the Helm index file and returns the version of the chart.