HYPERFLEET-1057 - feat: Add infra repo installation support for E2E

Adds infrastructure and tooling to enable E2E tests to install HyperFleet
components using the hyperfleet-infra repository instead of custom scripts.

- Add git, helmfile, and helm plugins (helm-diff, helm-git) to Dockerfile
- Create env.ci configuration file with CI-specific environment variables
- Add cleanup-k8s-resources.sh script to uninstall Helm releases and delete namespaces
- Add cleanup-pubsub-resources.sh script to remove GCP Pub/Sub topics and subscriptions
- Update adapter release naming to use adapter name directly (temporary workaround for HYPERFLEET-1097)
- Change API release name from "api" to "hyperfleet-api" for consistency
- Update test helper to use "hyperfleet-api" release name in upgrade/restore operations
- Fix cluster force delete test to use adapter name as release name
- Copy env and scripts directories to container image alongside existing deploy-scripts

Author: ma-hill

Dockerfile

@@ -30,7 +30,7 @@ FROM ${BASE_IMAGE}
 
 # Install runtime dependencies and tools
 USER root
-RUN dnf -y install --allowerasing jq gettext curl && dnf clean all
+RUN dnf -y install --allowerasing jq gettext curl git && dnf clean all
 
 # Install kubectl (latest stable)
 RUN curl -fsSL "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" \
@@ -39,6 +39,18 @@ RUN curl -fsSL "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release
 # Install Helm
 RUN curl -fsSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash
 
+# Install Helm plugins - helm-git and helm-diff
+ARG HELM_GIT_VERSION=v1.5.2
+ARG HELM_DIFF_VERSION=3.15.7
+RUN helm plugin install https://github.com/aslafy-z/helm-git --version ${HELM_GIT_VERSION} && \
+    helm plugin install https://github.com/databus23/helm-diff --version ${HELM_DIFF_VERSION}
+
+ARG HELMFILE_VERSION=1.5.2
+# Install helmfile
+RUN curl -fsSL "https://github.com/helmfile/helmfile/releases/download/v${HELMFILE_VERSION}/helmfile_${HELMFILE_VERSION}_linux_amd64.tar.gz" | \
+    tar -xz -C /usr/local/bin helmfile && \
+    chmod +x /usr/local/bin/helmfile
+
 WORKDIR /e2e
 
 # Copy the hyperfleet-credential-provider binary
@@ -53,6 +65,13 @@ COPY --from=builder /build/testdata /e2e/testdata
 # Copy deploy scripts
 COPY --from=builder /build/deploy-scripts /e2e/deploy-scripts
 
+# Copy env files
+COPY --from=builder /build/env /e2e/env
+
+# Copy cleanup scripts
+COPY --from=builder /build/scripts /e2e/scripts
+
+
 # Copy default config (fallback if ConfigMap is not mounted)
 COPY --from=builder /build/configs /e2e/configs
 

deploy-scripts/lib/adapter.sh

@@ -107,19 +107,8 @@ install_adapter_instance() {
   log_info "Resource type: ${resource_type}"
   log_info "Adapter name: ${adapter_name}"
 
-  # Construct deterministic release name (matches API/Sentinel pattern)
-  # Kubernetes resource names have a 63-character limit
-  # Reserve ~15 characters for Helm's deployment/pod suffixes
-  local max_release_name_length=48
-  local release_name="adapter-${resource_type}-${adapter_name}"
-
-  if [[ ${#release_name} -gt ${max_release_name_length} ]]; then
-    local release_hash
-    release_hash=$(printf '%s' "${release_name}" | sha256sum | cut -c1-8)
-    local max_base_length=$((max_release_name_length - ${#release_hash} - 1))
-    release_name="${release_name:0:${max_base_length}}-${release_hash}"
-    log_warning "Release name truncated to ${max_release_name_length} chars to stay within Kubernetes limits"
-  fi
+  # Temporary workaround for installation - HYPERFLEET-1097
+  local release_name="${adapter_name}"
 
   log_info "Release name: ${release_name} (length: ${#release_name})"
 

deploy-scripts/lib/api.sh

@@ -11,7 +11,7 @@
 install_api() {
     log_section "Installing API"
 
-    local release_name="api"
+    local release_name="hyperfleet-api"
     local full_chart_path="${WORK_DIR}/api/${API_CHART_PATH}"
 
     # Use API_ADAPTERS_* environment variables for API configuration
@@ -121,7 +121,7 @@ install_api() {
 uninstall_api() {
     log_section "Uninstalling API"
 
-    local release_name="api"
+    local release_name="hyperfleet-api"
 
     # Check if release exists
     if [[ -z "$(helm list -n "${NAMESPACE}" -q -f "^${release_name}$")" ]]; then

e2e/cluster/force_delete.go

@@ -51,7 +51,8 @@ var _ = ginkgo.Describe("[Suite: cluster][delete] Force-Delete Cluster Stuck in
 
 				Expect(h.Cfg.Adapters.Cluster).NotTo(BeEmpty(), "cluster adapter config is required for this test")
 				clAdapterName := h.Cfg.Adapters.Cluster[0]
-				clReleaseName := helper.GenerateAdapterReleaseName(helper.ResourceTypeClusters, clAdapterName)
+				// Standard adapters are deployed with release name = adapter name (e.g., "cl-namespace", not "adapter-clusters-cl-namespace")
+				clReleaseName := clAdapterName
 
 				deploymentName, err := h.GetDeploymentName(ctx, h.Cfg.Namespace, clReleaseName)
 				Expect(err).NotTo(HaveOccurred(), "failed to find cluster adapter deployment")

env/env.ci

@@ -0,0 +1,58 @@
+
+# ============================================================================
+# WARNING: These variables are sourced by E2E test automation steps.
+# Do NOT modify this file without testing the changes in the E2E pipeline.
+# ============================================================================
+
+# Image Registry Configuration
+export IMAGE_REGISTRY="${IMAGE_REGISTRY:-registry.ci.openshift.org}"
+
+# API Component Configuration
+export API_IMAGE_REPO="${API_IMAGE_REPO:-ci/hyperfleet-api}"
+export API_IMAGE_TAG="${API_IMAGE_TAG:-latest}"
+export API_SERVICE_TYPE="${API_SERVICE_TYPE:-LoadBalancer}"
+
+
+# =====================================================================
+# API Adapter Configuration
+# ============================================================================
+# NOTE: These are SEPARATE from tier0 deployment configuration above
+# These should be set based on specific test case requirements
+# Set per test case as needed
+
+# Adapters for API cluster configuration
+export API_ADAPTERS_CLUSTER="${API_ADAPTERS_CLUSTER:-cl-namespace,cl-job,cl-deployment,cl-maestro}"
+
+# Adapters for API nodepool configuration
+export API_ADAPTERS_NODEPOOL="${API_ADAPTERS_NODEPOOL:-np-configmap}"
+
+# Sentinel Component Configuration
+export SENTINEL_IMAGE_REPO="${SENTINEL_IMAGE_REPO:-ci/hyperfleet-sentinel}"
+export SENTINEL_IMAGE_TAG="${SENTINEL_IMAGE_TAG:-latest}"
+export SENTINEL_BROKER_TYPE="${SENTINEL_BROKER_TYPE:-googlepubsub}"
+export SENTINEL_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING="${SENTINEL_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING:-true}"
+
+# Adapter Component Configuration
+export ADAPTER_IMAGE_REPO="${ADAPTER_IMAGE_REPO:-ci/hyperfleet-adapter}"
+export ADAPTER_IMAGE_TAG="${ADAPTER_IMAGE_TAG:-latest}"
+export ADAPTER_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING="${ADAPTER_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING:-true}"
+export ADAPTER_GOOGLEPUBSUB_CREATE_SUBSCRIPTION_IF_MISSING="${ADAPTER_GOOGLEPUBSUB_CREATE_SUBSCRIPTION_IF_MISSING:-true}"
+
+
+# Helm Chart Sources
+# Note: ADAPTER_CHART_* and API_CHART_* vars are also required by tier2 E2E tests
+# (e.g., crash recovery) which deploy dedicated adapters and upgrade API config at runtime.
+# When running tier2 tests in CI, ensure these are exported alongside GINKGO_LABEL_FILTER=tier2.
+export API_CHART_REPO="${API_CHART_REPO:-https://github.com/openshift-hyperfleet/hyperfleet-api.git}"
+export API_CHART_REF="${API_CHART_REF:-main}"
+export API_CHART_PATH="${API_CHART_PATH:-charts}"
+
+export SENTINEL_CHART_REPO="${SENTINEL_CHART_REPO:-https://github.com/openshift-hyperfleet/hyperfleet-sentinel.git}"
+export SENTINEL_CHART_REF="${SENTINEL_CHART_REF:-main}"
+export SENTINEL_CHART_PATH="${SENTINEL_CHART_PATH:-charts}"
+
+export ADAPTER_CHART_REPO="${ADAPTER_CHART_REPO:-https://github.com/openshift-hyperfleet/hyperfleet-adapter.git}"
+export ADAPTER_CHART_REF="${ADAPTER_CHART_REF:-main}"
+export ADAPTER_CHART_PATH="${ADAPTER_CHART_PATH:-charts}"
+
+

pkg/helper/api_config.go

@@ -23,7 +23,7 @@ func (h *Helper) UpgradeAPIRequiredAdapters(ctx context.Context, apiChartPath, n
 	cmdCtx, cancel := context.WithTimeout(ctx, 3*time.Minute)
 	defer cancel()
 
-	cmd := exec.CommandContext(cmdCtx, "helm", "upgrade", "api", apiChartPath, // #nosec G204 -- args from trusted test config
+	cmd := exec.CommandContext(cmdCtx, "helm", "upgrade", "hyperfleet-api", apiChartPath, // #nosec G204 -- args from trusted test config
 		"--namespace", namespace,
 		"--reuse-values",
 		"--wait",
@@ -83,7 +83,7 @@ func (h *Helper) RestoreAPIRequiredAdaptersWithRetry(ctx context.Context, apiCha
 		"max_retries", maxRetries,
 		"error", lastErr,
 		"manual_fix", fmt.Sprintf(
-			"helm upgrade api %s -n %s --reuse-values --set config.adapters.required.cluster={%s}",
+			"helm upgrade hyperfleet-api %s -n %s --reuse-values --set config.adapters.required.cluster={%s}",
 			apiChartPath, namespace, adapterList))
 
 	return fmt.Errorf("failed to restore API config after %d retries: %w", maxRetries, lastErr)