Merge pull request #3800 from Ankitasw/conformace-test-fix

[E2E] Fix test flavor generation make targets

Makefile

@@ -369,9 +369,6 @@ $(ARTIFACTS):
 .PHONY: generate-test-flavors
 generate-test-flavors: $(KUSTOMIZE)  ## Generate test template flavors
 	./hack/gen-test-flavors.sh withoutclusterclass
-
-.PHONY: generate-clusterclass-test-flavors
-generate-clusterclass-test-flavors: $(KUSTOMIZE)  ## Generate ClusterClass test template flavors
 	./hack/gen-test-flavors.sh withclusterclass
 
 .PHONY: e2e-image
@@ -401,7 +398,7 @@ test-verbose: setup-envtest ## Run tests with verbose settings.
 	KUBEBUILDER_ASSETS="$(KUBEBUILDER_ASSETS)" go test -v ./...
 
 .PHONY: test-e2e ## Run e2e tests using clusterctl
-test-e2e: $(GINKGO) $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) generate-test-flavors generate-clusterclass-test-flavors e2e-image ## Run e2e tests
+test-e2e: $(GINKGO) $(KIND) $(SSM_PLUGIN) $(KUSTOMIZE) generate-test-flavors e2e-image ## Run e2e tests
 	time $(GINKGO) -tags=e2e $(GINKGO_ARGS) -p ./test/e2e/suites/unmanaged/... -- -config-path="$(E2E_CONF_PATH)" $(E2E_ARGS)
 
 .PHONY: test-e2e-eks ## Run EKS e2e tests using clusterctl