remove unused ROSA/EKS CRDs from hypershift install

- turn off CAPA ROSA feature gate
openshift · Aug 19, 2024 · ef4e1cf · ef4e1cf
1 parent 795d1ab
commit ef4e1cf
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 1,936 deletions.
diff --git a/Makefile b/Makefile
@@ -121,6 +121,11 @@ cluster-api-provider-aws: $(CONTROLLER_GEN)
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/sigs.k8s.io/cluster-api-provider-aws/v2/api/..." output:crd:artifacts:config=cmd/install/assets/cluster-api-provider-aws
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/sigs.k8s.io/cluster-api-provider-aws/v2/exp/api/..." output:crd:artifacts:config=cmd/install/assets/cluster-api-provider-aws
 	$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/sigs.k8s.io/cluster-api/exp/addons/api/..." output:crd:artifacts:config=cmd/install/assets/cluster-api
+# remove ROSA CRDs 
+	rm -rf cmd/install/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_rosa*.yaml
+# remove EKS CRDs
+	rm -rf cmd/install/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsmanaged*.yaml
+	rm -rf cmd/install/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsfargateprofiles.yaml
 
 .PHONY: cluster-api-provider-ibmcloud
 cluster-api-provider-ibmcloud: $(CONTROLLER_GEN)
@@ -162,7 +167,8 @@ release:
 .PHONY: delegating_client
 delegating_client:
 	go run ./cmd/infra/aws/delegatingclientgenerator/main.go > ./cmd/infra/aws/delegating_client.txt
-	mv ./cmd/infra/aws/delegating_client.{txt,go}
+	mv ./cmd/infra/aws/delegating_client.txt ./cmd/infra/aws/delegating_client.go
+	$(GO) fmt ./cmd/infra/aws/delegating_client.go
 
 # Run tests
 .PHONY: test

diff --git a/...l/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsfargateprofiles.yaml b/...l/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsfargateprofiles.yaml
diff --git a/...l/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsmanagedclusters.yaml b/...l/assets/cluster-api-provider-aws/infrastructure.cluster.x-k8s.io_awsmanagedclusters.yaml