Merge pull request #1465 from vincepri/fix-e2e-cabpk-kcp

🏃 Install cabpk and kcp components in e2e tests

Author: k8s-ci-robot

examples/generate.sh

@@ -112,9 +112,13 @@ if [[ ${CAPI_BRANCH} == "stable" ]]; then
   echo "Downloaded ${COMPONENTS_CLUSTER_API_GENERATED_FILE} from cluster-api stable branch - v0.2.5"
 elif [[ ${CAPI_BRANCH} == "dev" ]]; then
   kustomize build ../cluster-api/config/default > "${COMPONENTS_CLUSTER_API_GENERATED_FILE}"
+  kustomize build ../cluster-api/bootstrap/kubeadm/config/default > "${COMPONENTS_CLUSTER_API_GENERATED_FILE}"
+  kustomize build ../cluster-api/controlplane/kubeadm/config/default > "${COMPONENTS_CLUSTER_API_GENERATED_FILE}"
   echo "Generated ${COMPONENTS_CLUSTER_API_GENERATED_FILE} from cluster-api - ${CAPI_BRANCH}"
 else
   kustomize build "github.com/kubernetes-sigs/cluster-api/config/default/?ref=${CAPI_BRANCH}" > "${COMPONENTS_CLUSTER_API_GENERATED_FILE}"
+  kustomize build "github.com/kubernetes-sigs/cluster-api/bootstrap/kubeadm/config/default/?ref=${CAPI_BRANCH}" > "${COMPONENTS_CLUSTER_API_GENERATED_FILE}"
+  kustomize build "github.com/kubernetes-sigs/cluster-api/controlplane/kubeadm/config/default/?ref=${CAPI_BRANCH}" > "${COMPONENTS_CLUSTER_API_GENERATED_FILE}"
   echo "Generated ${COMPONENTS_CLUSTER_API_GENERATED_FILE} from cluster-api - ${CAPI_BRANCH}"
 fi
 

test/e2e/e2e_suite_test.go

@@ -158,9 +158,11 @@ var _ = BeforeSuite(func() {
 	// Wait for CertManager to be available before continuing
 	common.WaitDeployment(kindClient, "cert-manager", "cert-manager-webhook")
 
-	// Deploy the CAPI components
+	// Deploy the CAPI, CABPK, and KCP components from Cluster API repository,
 	// workaround since there isn't a v1alpha3 capi release yet
 	deployCAPIComponents(kindCluster)
+	deployCABPKComponents(kindCluster)
+	deployKCPComponents(kindCluster)
 
 	// Deploy the CAPA components
 	deployCAPAComponents(kindCluster)
@@ -310,6 +312,46 @@ func deployCAPIComponents(kindCluster kind.Cluster) {
 	applyManifests(kindCluster, &manifestFile)
 }
 
+func deployCABPKComponents(kindCluster kind.Cluster) {
+	fmt.Fprintf(GinkgoWriter, "Generating CABPK manifests\n")
+
+	// Build the manifests using kustomize
+	cabpkManifests, err := exec.Command(*kustomizeBinary, "build", "https://github.com/kubernetes-sigs/cluster-api//bootstrap/kubeadm/config/default").Output()
+	if err != nil {
+		if exitError, ok := err.(*exec.ExitError); ok {
+			fmt.Fprintf(GinkgoWriter, "Error: %s\n", string(exitError.Stderr))
+		}
+	}
+	Expect(err).NotTo(HaveOccurred())
+
+	// write out the manifests
+	manifestFile := path.Join(suiteTmpDir, "bootstrap-components.yaml")
+	Expect(ioutil.WriteFile(manifestFile, cabpkManifests, 0644)).To(Succeed())
+
+	// apply generated manifests
+	applyManifests(kindCluster, &manifestFile)
+}
+
+func deployKCPComponents(kindCluster kind.Cluster) {
+	fmt.Fprintf(GinkgoWriter, "Generating KCP manifests\n")
+
+	// Build the manifests using kustomize
+	kcpManifests, err := exec.Command(*kustomizeBinary, "build", "https://github.com/kubernetes-sigs/cluster-api//controlplane/kubeadm/config/default").Output()
+	if err != nil {
+		if exitError, ok := err.(*exec.ExitError); ok {
+			fmt.Fprintf(GinkgoWriter, "Error: %s\n", string(exitError.Stderr))
+		}
+	}
+	Expect(err).NotTo(HaveOccurred())
+
+	// write out the manifests
+	manifestFile := path.Join(suiteTmpDir, "control-plane-components.yaml")
+	Expect(ioutil.WriteFile(manifestFile, kcpManifests, 0644)).To(Succeed())
+
+	// apply generated manifests
+	applyManifests(kindCluster, &manifestFile)
+}
+
 func deployCAPAComponents(kindCluster kind.Cluster) {
 	if capaComponents != nil && *capaComponents != "" {
 		applyManifests(kindCluster, capaComponents)