Simple test for machinepool (#96)

Author: shyamradhakrishnan

Makefile

@@ -263,6 +263,7 @@ generate-e2e-templates: kustomize
 	$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta1/cluster-template-local-vcn-peering --load_restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta1/cluster-template-local-vcn-peering.yaml
 	$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta1/cluster-template-remote-vcn-peering --load_restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta1/cluster-template-remote-vcn-peering.yaml
 	$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta1/cluster-template-externally-managed-vcn --load_restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta1/cluster-template-externally-managed-vcn.yaml
+	$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta1/cluster-template-machine-pool --load_restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta1/cluster-template-machine-pool.yaml
 
 .PHONY: test-e2e-run
 test-e2e-run: generate-e2e-templates ginkgo $(ENVSUBST) ## Run e2e tests

cloud/scope/machine_pool.go

@@ -182,7 +182,9 @@ func (m *MachinePoolScope) SetListandSetMachinePoolInstances(ctx context.Context
 	providerIDList := make([]string, len(poolInstanceSummaries))
 
 	for i, instance := range poolInstanceSummaries {
-		providerIDList[i] = fmt.Sprintf("oci://%s", *instance.Id)
+		if *instance.State == "Running" {
+			providerIDList[i] = fmt.Sprintf("oci://%s", *instance.Id)
+		}
 	}
 
 	m.OCIMachinePool.Spec.ProviderIDList = providerIDList

test/e2e/cluster_test.go

@@ -41,6 +41,7 @@ import (
 	"k8s.io/utils/pointer"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	capi_e2e "sigs.k8s.io/cluster-api/test/e2e"
+	"sigs.k8s.io/cluster-api/test/framework"
 	"sigs.k8s.io/cluster-api/test/framework/clusterctl"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -512,6 +513,48 @@ var _ = Describe("Workload cluster creation", func() {
 			WaitForMachineDeployments:    e2eConfig.GetIntervals(specName, "wait-worker-nodes"),
 		}, result)
 	})
+
+	It("Machine Pool - Simple", func() {
+		clusterName = getClusterName(clusterNamePrefix, "machine-pool")
+		clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
+			ClusterProxy: bootstrapClusterProxy,
+			ConfigCluster: clusterctl.ConfigClusterInput{
+				LogFolder:                filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
+				ClusterctlConfigPath:     clusterctlConfigPath,
+				KubeconfigPath:           bootstrapClusterProxy.GetKubeconfigPath(),
+				InfrastructureProvider:   clusterctl.DefaultInfrastructureProvider,
+				Flavor:                   "machine-pool",
+				Namespace:                namespace.Name,
+				ClusterName:              clusterName,
+				KubernetesVersion:        e2eConfig.GetVariable(capi_e2e.KubernetesVersion),
+				ControlPlaneMachineCount: pointer.Int64Ptr(1),
+				WorkerMachineCount:       pointer.Int64Ptr(1),
+			},
+			CNIManifestPath:              e2eConfig.GetVariable(capi_e2e.CNIPath),
+			WaitForClusterIntervals:      e2eConfig.GetIntervals(specName, "wait-cluster"),
+			WaitForControlPlaneIntervals: e2eConfig.GetIntervals(specName, "wait-control-plane"),
+			WaitForMachinePools:          e2eConfig.GetIntervals(specName, "wait-machine-pool-nodes"),
+			WaitForMachineDeployments:    e2eConfig.GetIntervals(specName, "wait-worker-nodes"),
+		}, result)
+
+		By("Scaling the machine pool up")
+		framework.ScaleMachinePoolAndWait(ctx, framework.ScaleMachinePoolAndWaitInput{
+			ClusterProxy:              bootstrapClusterProxy,
+			Cluster:                   result.Cluster,
+			Replicas:                  2,
+			MachinePools:              result.MachinePools,
+			WaitForMachinePoolToScale: e2eConfig.GetIntervals(specName, "wait-machine-pool-nodes"),
+		})
+
+		By("Scaling the machine pool down")
+		framework.ScaleMachinePoolAndWait(ctx, framework.ScaleMachinePoolAndWaitInput{
+			ClusterProxy:              bootstrapClusterProxy,
+			Cluster:                   result.Cluster,
+			Replicas:                  1,
+			MachinePools:              result.MachinePools,
+			WaitForMachinePoolToScale: e2eConfig.GetIntervals(specName, "wait-machine-pool-nodes"),
+		})
+	})
 })
 
 func verifyMultipleNsgSubnet(ctx context.Context, namespace string, clusterName string, mcDeployments []*clusterv1.MachineDeployment) {

test/e2e/config/e2e_conf.yaml

@@ -69,6 +69,7 @@ providers:
           - sourcePath: "../data/infrastructure-oci/v1beta1/cluster-template-local-vcn-peering.yaml"
           - sourcePath: "../data/infrastructure-oci/v1beta1/cluster-template-remote-vcn-peering.yaml"
           - sourcePath: "../data/infrastructure-oci/v1beta1/cluster-template-externally-managed-vcn.yaml"
+          - sourcePath: "../data/infrastructure-oci/v1beta1/cluster-template-machine-pool.yaml"
           - sourcePath: "../data/shared/v1beta1/metadata.yaml"
 
 

test/e2e/data/infrastructure-oci/v1beta1/cluster-template-machine-pool/kustomization.yaml

@@ -0,0 +1,6 @@
+bases:
+  - ../bases/cluster.yaml
+  - ./machine-pool.yaml
+  - ../bases/ccm.yaml
+
+

test/e2e/data/infrastructure-oci/v1beta1/cluster-template-machine-pool/machine-pool.yaml

@@ -0,0 +1,48 @@
+---
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: MachinePool
+metadata:
+  name: "${CLUSTER_NAME}-mp-0"
+  namespace: default
+spec:
+  clusterName: "${CLUSTER_NAME}"
+  replicas: "${WORKER_MACHINE_COUNT}"
+  template:
+    spec:
+      bootstrap:
+        configRef:
+          apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
+          kind: KubeadmConfig
+          name: "${CLUSTER_NAME}-mp-0"
+      clusterName: "${CLUSTER_NAME}"
+      infrastructureRef:
+        apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+        kind: OCIMachinePool
+        name: "${CLUSTER_NAME}-mp-0"
+      version: "${KUBERNETES_VERSION}"
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
+kind: OCIMachinePool
+metadata:
+  name: "${CLUSTER_NAME}-mp-0"
+  namespace: default
+spec:
+  imageId: "${OCI_IMAGE_ID}"
+  metadata:
+    ssh_authorized_keys: "${OCI_SSH_KEY}"
+  shapeConfig:
+    ocpus: "1"
+  instanceConfiguration:
+    instanceDetails:
+      shape: "${OCI_NODE_MACHINE_TYPE=VM.Standard.E4.Flex}"
+---
+apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4
+kind: KubeadmConfig
+metadata:
+  name: "${CLUSTER_NAME}-mp-0"
+spec:
+  joinConfiguration:
+    nodeRegistration:
+      kubeletExtraArgs:
+        cloud-provider: external
+        provider-id: oci://{{ ds["id"] }}