remove hcp e2e stuff

Signed-off-by: Bharath Nallapeta <[email protected]>

Author: bnallapeta

Makefile

@@ -236,15 +236,7 @@ test-conformance: $(GINKGO) e2e-prerequisites ## Run clusterctl based conformanc
 test-conformance-fast: ## Run clusterctl based conformance test on workload cluster (requires Docker) using a subset of the conformance suite in parallel.
 	$(MAKE) test-conformance CONFORMANCE_E2E_ARGS="-kubetest.config-file=$(KUBETEST_FAST_CONF_PATH) -kubetest.ginkgo-nodes=5 $(E2E_ARGS)"
 
-# Run HCP tests - Kamaji v1.0.0 is installed via Helm during test setup
-HCP_E2E_ARGS ?= $(E2E_ARGS)
-.PHONY: test-hcp
-test-hcp: $(GINKGO) e2e-prerequisites ## Run hosted control plane (HCP) tests using Kamaji
-	time $(GINKGO) -fail-fast -trace -timeout=4h -show-node-events -v -tags=e2e \
-		--output-dir="$(ARTIFACTS)" --junit-report="junit.hcp_suite.1.xml" \
-		-focus="Hosted Control Plane tests" $(E2E_GINKGO_ARGS) ./test/e2e/suites/hcp/... -- \
-			-config-path="$(E2E_CONF_PATH)" -artifacts-folder="$(ARTIFACTS)" \
-			-data-folder="$(E2E_DATA_DIR)" $(HCP_E2E_ARGS)
+
 
 APIDIFF_OLD_COMMIT ?= $(shell git rev-parse origin/main)
 

docs/book/src/development/development.md

@@ -563,83 +563,4 @@ kubectl get openstackservers
 
 This object is immutable and is created by the controller when a machine or a bastion is created. The `OpenStackServer` object is deleted when the machine or the bastion is deleted.
 
-## Hosted Control Plane (HCP) Testing
 
-CAPO supports testing Hosted Control Planes using Kamaji as the control plane provider. This allows testing scenarios where the Kubernetes control plane runs as pods in a management cluster while worker nodes run on OpenStack infrastructure.
-
-### Prerequisites
-
-* A working OpenStack environment (same requirements as regular e2e tests)
-* Helm 3.x installed locally
-* Management cluster with sufficient resources for hosting control planes
-
-### Running HCP Tests
-
-To run the hosted control plane e2e tests:
-
-```bash
-make test-hcp OPENSTACK_CLOUD_YAML_FILE=/path/to/clouds.yaml OPENSTACK_CLOUD=my_cloud
-```
-
-This will:
-1. Create a management cluster using kind
-2. Install CAPO in the management cluster
-3. Install Kamaji v1.0.0 using Helm
-4. Install the Kamaji Control Plane Provider v0.15.3
-5. Run HCP-specific test suites that validate:
-   - Network configuration fixes for HCP scenarios
-   - Security group precedence between machine and cluster levels
-   - Worker node connectivity to hosted control planes via Konnectivity
-   - Machine spec validation without explicit networks
-
-### Architecture
-
-The HCP testing follows this architecture:
-
-```
-Management Cluster (kind)
-├── CAPO Controller
-├── Kamaji v1.0.0 
-├── Kamaji Control Plane Provider v0.15.3
-└── TenantControlPlanes (running as pods)
-    └── Connected to OpenStack worker nodes via Konnectivity
-```
-
-### Test Flavors
-
-HCP tests use the `hcp` flavor, which:
-- Uses `KamajiControlPlane` instead of `KubeadmControlPlane`
-- Configures Konnectivity for worker node communication
-- Sets up proper security groups for HCP networking
-- Validates the network configuration fixes from the `hcp-2380` branch
-
-### Manual Installation
-
-If you need to install Kamaji manually for development:
-
-```bash
-# Install Kamaji using Helm
-helm repo add clastix https://clastix.github.io/charts
-helm repo update
-helm install kamaji clastix/kamaji --version v1.0.0 --namespace kamaji-system --create-namespace --wait
-
-# Or use the convenience script
-./hack/install-kamaji.sh
-```
-
-### Troubleshooting
-
-**Worker nodes can't connect to control plane:**
-- Check Konnectivity service is running
-- Verify security groups allow traffic on port 8132
-- Ensure LoadBalancer service is properly configured
-
-**TenantControlPlane fails to start:**
-- Check Kamaji controller logs: `kubectl logs -n kamaji-system -l app.kubernetes.io/name=kamaji`
-- Verify DataStore is ready: `kubectl get datastore -n kamaji-system`
-- Check etcd connectivity in the management cluster
-
-**Network validation tests fail:**
-- Ensure OpenStack cloud has proper networking configuration
-- Verify security groups are properly configured
-- Check that external network is accessible for LoadBalancer services

go.mod

@@ -55,7 +55,6 @@ require (
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/clastix/kamaji v1.0.0 // indirect
 	github.com/cloudflare/circl v1.6.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
 	github.com/docker/docker v28.0.2+incompatible // indirect

go.sum

@@ -16,8 +16,6 @@ github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+
 github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/Masterminds/sprig/v3 v3.3.0 h1:mQh0Yrg1XPo6vjYXgtf5OtijNAKJRNcTdOOGZe3tPhs=
 github.com/Masterminds/sprig/v3 v3.3.0/go.mod h1:Zy1iXRYNqNLUolqCpL4uhk6SHUMAOSCzdgBfDb35Lz0=
-github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU=
-github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84=
 github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg=
 github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE=
 github.com/NYTimes/gziphandler v1.1.1 h1:ZUDjpQae29j0ryrS0u/B8HZfJBtBQHjqw2rQ2cqUQ3I=
@@ -39,8 +37,6 @@ github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK3
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
 github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/clastix/kamaji v1.0.0 h1:QY99C2qA3LpvVCKRxZcE96/uKf5Fd7hNpjJ676jrIBY=
-github.com/clastix/kamaji v1.0.0/go.mod h1:pZo07bC4oNawuu3Oi56mAvEBQU1/jjNcUUxLlSSq4to=
 github.com/cloudflare/circl v1.1.0/go.mod h1:prBCrKB9DV4poKZY1l9zBXg2QJY7mvgRvtMxxK7fi4I=
 github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
 github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
@@ -67,8 +63,6 @@ github.com/docker/docker v28.0.2+incompatible h1:9BILleFwug5FSSqWBgVevgL3ewDJfWW
 github.com/docker/docker v28.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
 github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
-github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw=
-github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 h1:7QPwrLT79GlD5sizHf27aoY2RTvw62mO6x7mxkScNk0=
@@ -253,7 +247,6 @@ github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsF
 github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k=
 github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
 github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
@@ -275,7 +268,6 @@ github.com/stoewer/go-strcase v1.3.0/go.mod h1:fAH5hQ5pehh+j3nZfvwdk2RgEgQjAoM8w
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
@@ -368,10 +360,8 @@ golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
 golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

test/e2e/data/e2e_conf.yaml

@@ -92,20 +92,7 @@ providers:
       new: "imagePullPolicy: IfNotPresent"
     - old: "--leader-elect"
       new: "--leader-elect=false\n        - --sync-period=1m"
-- name: kamaji
-  type: ControlPlaneProvider
-  versions:
-  - name: v0.15.3
-    value: "https://github.com/clastix/cluster-api-control-plane-provider-kamaji/releases/download/v0.15.3/control-plane-components.yaml"
-    type: url
-    contract: v1beta1
-    files:
-    - sourcePath: "../data/shared/v1beta1/metadata.yaml"
-    replacements:
-    - old: "imagePullPolicy: Always"
-      new: "imagePullPolicy: IfNotPresent"
-    - old: --metrics-addr=127.0.0.1:8080
-      new: --metrics-addr=:8080
+
 - name: openstack
   type: InfrastructureProvider
   versions:
@@ -148,7 +135,6 @@ providers:
     - sourcePath: "../data/shared/v1beta1_provider/metadata.yaml"
     - sourcePath: "./infrastructure-openstack-no-artifact/cluster-template.yaml"
     - sourcePath: "./infrastructure-openstack-no-artifact/cluster-template-without-lb.yaml"
-    - sourcePath: "../../../../templates/cluster-template-hcp.yaml"
     replacements:
     - old: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:dev
       new: gcr.io/k8s-staging-capi-openstack/capi-openstack-controller:e2e
@@ -248,6 +234,3 @@ intervals:
   default/wait-machine-remediation: ["10m", "10s"]
   default/wait-image-create: ["15m", "10s"]
   default/wait-image-delete: ["2m", "10s"]
-  hcp/wait-cluster: ["30m", "10s"]
-  hcp/wait-control-plane: ["45m", "10s"]
-  hcp/wait-worker-nodes: ["45m", "10s"]

test/e2e/data/kustomize/hcp/kamaji-controlplane.yaml

@@ -60,7 +60,6 @@ const (
 	FlavorFlatcar              = "flatcar"
 	FlavorKubernetesUpgrade    = "k8s-upgrade"
 	FlavorFlatcarSysext        = "flatcar-sysext"
-	FlavorHCP                  = "hcp"
 )
 
 // DefaultScheme returns the default scheme to use for testing.