[WIP]Support for out-of-tree/external cloud-provider specific drivers

.ci/integration-tests

@@ -18,9 +18,10 @@ mkdir -p dev
 mkdir -p logs
 
 # TODO add support for azure and openstack
-declare -a cloud_providers=("aws" "gcp")
+declare -a cloud_providers=("aws")
 declare failed_logs=""
 num_of_existing_nodes=1
+namespace="grpc"
 
 if [ -n "$1" ]; then
     printf "Local test"
@@ -90,6 +91,25 @@ function setup_environment() {
         printf "Go build Failure\n"
         terminate_script
     fi
+
+    old_WD=$PWD
+    mkdir -p $GOPATH/src/github.com/gardener
+    cd $GOPATH/src/github.com/gardener
+
+    # TODO: fetch the latest release and not master of aws-provider
+    printf "\n Download machiine-controller-manager-provider-aws latest release"
+    git clone https://github.com/gardener/machine-controller-manager-provider-aws.git
+    printf "\...Done \n"
+
+    cd machine-controller-manager-provider-aws
+    printf "\nBuilding MCM-Provider-AWS binary\n"
+    if go build -o $old_WD/cmi-plugin -i app/aws/cmi-plugin.go; then
+        printf "Go build Successful for provider AWS\n"
+    else
+        printf "Go build Failure for provider AWS\n"
+        terminate_script
+    fi
+    cd $old_WD
 }
 
 # run_controller runs MCM controller in background
@@ -99,7 +119,7 @@ function run_controller() {
     ./controller_manager \
         --control-kubeconfig=dev/control_kubeconfig_${provider}.yaml \
         --target-kubeconfig=dev/target_kubeconfig_${provider}.yaml \
-        --namespace=${provider} \
+        --namespace=$namespace \
         --port=$1 \
         --safety-up=2 \
         --safety-down=1 \
@@ -114,15 +134,19 @@ function run_controller() {
         --leader-elect-renew-deadline=30s \
         --leader-elect-retry-period=15s \
         --v=2 > logs/${provider}-mcm.out 2>&1 &
+
+    printf "\nRunning MCM-Provider-AWS in background\n"
+    ./cmi-plugin \
+        --endpoint=tcp://127.0.0.1:8080 > logs/${provider}-mcm-provider.out 2>&1 &
 }
 
 ############################################## </Intialization> ##############################################
 ############################################## <HelperFunction> ##############################################
 
 function hf_object_create() {
     output=$(kubectl apply -f "$Objects_path"/"$1" --context=control 2>&1)
-    outputSucccess=$(echo "$output" | grep created -c)
-    if [[ outputSucccess -ne 1 ]]; then
+    outputSuccess=$(echo "$output" | grep created -c)
+    if [[ outputSuccess -ne 1 ]]; then
         printf "\tFailed: To create object. Exiting Test to avoid further conflicts.\n"
         printf "\tCreate error message: %s" "$output"
         terminate_script
@@ -156,7 +180,7 @@ function hf_object_delete() {
 }
 
 function hf_scale_deploy() {
-    output=$(kubectl scale deployment "$1" --replicas="$2" --context=control --namespace="$provider" 2>&1)
+    output=$(kubectl scale deployment "$1" --replicas="$2" --context=control --namespace="$namespace" 2>&1)
     outputSucccess=$(echo "$output" | grep scaled -c)
     if [[ outputSucccess -ne 1 ]]; then
         printf "\tFailed: To scale deployment object. Exiting Test to avoid further conflicts.\n"
@@ -166,7 +190,7 @@ function hf_scale_deploy() {
 }
 
 function hf_num_of_objects() {
-    output=$(kubectl -n $provider get "$1" --context=control 2>&1)
+    output=$(kubectl -n $namespace get "$1" --context=control 2>&1)
     if [[ $output == *"No resources found."* ]]; then
         return 0
     fi
@@ -304,7 +328,7 @@ function clean_up() {
         [[ $ret -ne 0 ]]
     then
         # Delete the machine-deployment
-        output=$(kubectl delete machdeploy --context=control --namespace="$provider" --all 2>&1)
+        output=$(kubectl delete machdeploy --context=control --namespace="$namespace" --all 2>&1)
         printf "\n\t%s" "$output"
         printf "\n\tWaiting 1800s for machine-deployment to be deleted"
         hf_wait_on "hf_num_of_objects" machdeploy 0 1800 $5
@@ -316,7 +340,7 @@ function clean_up() {
         [[ $ret -ne 0 ]]
     then
         # Delete the machine-set
-        output=$(kubectl delete machset --context=control --namespace="$provider" --all 2>&1)
+        output=$(kubectl delete machset --context=control --namespace="$namespace" --all 2>&1)
         printf "\n\t%s" "$output"
         printf "\n\tWaiting 1800s for machine-set to be deleted"
         hf_wait_on "hf_num_of_objects" machdeploy 0 1800 $5
@@ -328,7 +352,7 @@ function clean_up() {
         [[ $ret -ne 0 ]]
     then
         # Delete the machine
-        output=$(kubectl delete mach --context=control --namespace="$provider" --all 2>&1)
+        output=$(kubectl delete mach --context=control --namespace="$namespace" --all 2>&1)
         printf "\n\t%s" "$output"
         printf "\n\tWaiting 1800s for machine to be deleted"
         hf_wait_on "hf_num_of_objects" mach 0 1800 $5

.ci/sample-objects/aws/machine.yaml

@@ -4,10 +4,11 @@ apiVersion: machine.sapcloud.io/v1alpha1
 kind: Machine
 metadata:
   name: test-machine # Name of the machine to be created
-  namespace: aws
+  namespace: grpc
   labels:
     test-label: test-label # Label used by machine-set to match (optional)
 spec:
   class:
-    kind: AWSMachineClass # Machine class template used to create machine, could be AWS/GCP/Azure/Other-cloud-providers
+    kind: MachineClass # Machine class template used to create machine, could be AWS/GCP/Azure/Other-cloud-providers
     name: mc-v1 # Name of the machine class
+    namespace: grpc

.ci/sample-objects/aws/md-scale-down.yaml

@@ -4,7 +4,7 @@ apiVersion: machine.sapcloud.io/v1alpha1
 kind: MachineDeployment
 metadata:
   name: test-md # Name of the machine deploy
-  namespace: aws
+  namespace: grpc
 spec:
   replicas: 2 # Number of healthy replicas that should always be healthy
   minReadySeconds: 500 # Minimum time to wait for machine to be ready
@@ -23,5 +23,6 @@ spec:
         test-label: test-label # Label to match with selector (XXXXX)
     spec:
       class:
-        kind: AWSMachineClass # Machine class template used to create machine, could be AWS/GCP/Azure/Other-cloud-providers
-        name: mc-v1 # Name of the machine class
+        kind: MachineClass # Machine class template used to create machine, could be AWS/GCP/Azure/Other-cloud-providers
+        name: mc-v1 # Name of the machine class
+        namespace: grpc 

.ci/sample-objects/aws/md-scale-up.yaml

@@ -4,7 +4,7 @@ apiVersion: machine.sapcloud.io/v1alpha1
 kind: MachineDeployment
 metadata:
   name: test-md # Name of the machine deploy
-  namespace: aws
+  namespace: grpc
 spec:
   replicas: 6 # Number of healthy replicas that should always be healthy
   minReadySeconds: 500 # Minimum time to wait for machine to be ready
@@ -23,5 +23,6 @@ spec:
         test-label: test-label # Label to match with selector (XXXXX)
     spec:
       class:
-        kind: AWSMachineClass # Machine class template used to create machine, could be AWS/GCP/Azure/Other-cloud-providers
-        name: mc-v1 # Name of the machine class
+        kind: MachineClass # Machine class template used to create machine, could be AWS/GCP/Azure/Other-cloud-providers
+        name: mc-v1 # Name of the machine class
+        namespace: grpc

.ci/sample-objects/aws/md-update.yaml

@@ -4,7 +4,7 @@ apiVersion: machine.sapcloud.io/v1alpha1
 kind: MachineDeployment
 metadata:
   name: test-md # Name of the machine deploy
-  namespace: aws
+  namespace: grpc
 spec:
   replicas: 4 # Number of healthy replicas that should always be healthy
   minReadySeconds: 500 # Minimum time to wait for machine to be ready
@@ -23,5 +23,6 @@ spec:
         test-label: test-label # Label to match with selector (XXXXX)
     spec:
       class:
-        kind: AWSMachineClass # Machine class template used to create machine, could be AWS/GCP/Azure/Other-cloud-providers
-        name: mc-v2 # Name of the machine class
+        kind: MachineClass # Machine class template used to create machine, could be AWS/GCP/Azure/Other-cloud-providers
+        name: mc-v2 # Name of the machine class
+        namespace: grpc

.ci/sample-objects/aws/md.yaml

@@ -4,7 +4,7 @@ apiVersion: machine.sapcloud.io/v1alpha1
 kind: MachineDeployment
 metadata:
   name: test-md # Name of the machine deploy
-  namespace: aws
+  namespace: grpc
 spec:
   replicas: 3 # Number of healthy replicas that should always be healthy
   minReadySeconds: 500 # Minimum time to wait for machine to be ready
@@ -23,5 +23,6 @@ spec:
         test-label: test-label # Label to match with selector (XXXXX)
     spec:
       class:
-        kind: AWSMachineClass # Machine class template used to create machine, could be AWS/GCP/Azure/Other-cloud-providers
-        name: mc-v1 # Name of the machine class
+        kind: MachineClass # Machine class template used to create machine, could be AWS/GCP/Azure/Other-cloud-providers
+        name: mc-v1 # Name of the machine class
+        namespace: grpc

.gitignore

@@ -18,6 +18,7 @@ kubectl
 # Binary files of MCM
 ./machine-controller-manager
 ./managevm
+cmi-plugin
 
 # Output of the go coverage tool, specifically when used with LiteIDE
 *coverprofile.out*

cmd/machine-controller-manager-cli/main.go

@@ -8,7 +8,7 @@ import (
 	"log"
 
 	"github.com/gardener/machine-controller-manager/pkg/apis/machine/v1alpha1"
-	"github.com/gardener/machine-controller-manager/pkg/driver"
+	"github.com/gardener/machine-controller-manager/pkg/cmiclient"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/util/yaml"
 )
@@ -61,36 +61,10 @@ func main() {
 	}
 
 	switch classKind {
-	case "OpenStackMachineClass", "openstack":
-		class := v1alpha1.OpenStackMachineClass{}
+	case "MachineClass", "machineclass":
+		class := v1alpha1.MachineClass{}
 		machineclass = &class
-		classKind = "OpenStackMachineClass"
-
-	case "AWSMachineClass", "aws":
-		class := v1alpha1.AWSMachineClass{}
-		machineclass = &class
-		classKind = "AWSMachineClass"
-
-	case "AzureMachineClass", "azure":
-		class := v1alpha1.AzureMachineClass{}
-		machineclass = &class
-		classKind = "AzureMachineClass"
-
-	case "GCPMachineClass", "gcp":
-		class := v1alpha1.GCPMachineClass{}
-		machineclass = &class
-		classKind = "GCPMachineClass"
-
-	case "AlicloudMachineClass", "alicloud":
-		class := v1alpha1.AlicloudMachineClass{}
-		machineclass = &class
-		classKind = "AlicloudMachineClass"
-
-	case "PacketMachineClass", "packet":
-		class := v1alpha1.PacketMachineClass{}
-		machineclass = &class
-		classKind = "PacketMachineClass"
-
+		classKind = "MachineClass"
 	default:
 		log.Fatalf("Unknown class kind %s", classKind)
 	}
@@ -99,17 +73,20 @@ func main() {
 		log.Fatalf("Could not parse machine class yaml: %s", err)
 	}
 
-	driver := driver.NewDriver(machineID, &secret, classKind, machineclass, machineName)
+	cmiclient, err := cmiclient.NewCMIPluginClient(machineID, classKind, &secret, machineclass, machineName, "")
+	if err != nil {
+		log.Fatalf("Couldn't create CMIDirver client : %s", err)
+	}
 
 	if machineID == "" {
-		id, name, err := driver.Create()
+		id, name, _, err := cmiclient.CreateMachine()
 		if err != nil {
 			log.Fatalf("Could not create %s : %s", machineName, err)
 		}
 		fmt.Printf("Machine id: %s\n", id)
 		fmt.Printf("Name: %s\n", name)
 	} else {
-		err = driver.Delete()
+		_, err = cmiclient.DeleteMachine()
 		if err != nil {
 			log.Fatalf("Could not delete %s : %s", machineID, err)
 		}

cmd/machine-controller-manager/app/controllermanager.go

@@ -64,12 +64,7 @@ const (
 	controllerDiscoveryAgentName = "machine-controller-discovery"
 )
 
-var openStackGVR = schema.GroupVersionResource{Group: "machine.sapcloud.io", Version: "v1alpha1", Resource: "openstackmachineclasses"}
-var awsGVR = schema.GroupVersionResource{Group: "machine.sapcloud.io", Version: "v1alpha1", Resource: "awsmachineclasses"}
-var azureGVR = schema.GroupVersionResource{Group: "machine.sapcloud.io", Version: "v1alpha1", Resource: "azuremachineclasses"}
-var gcpGVR = schema.GroupVersionResource{Group: "machine.sapcloud.io", Version: "v1alpha1", Resource: "gcpmachineclasses"}
-var alicloudGVR = schema.GroupVersionResource{Group: "machine.sapcloud.io", Version: "v1alpha1", Resource: "alicloudmachineclasses"}
-var packetGVR = schema.GroupVersionResource{Group: "machine.sapcloud.io", Version: "v1alpha1", Resource: "packetmachineclasses"}
+var machineclassGVR = schema.GroupVersionResource{Group: "machine.sapcloud.io", Version: "v1alpha1", Resource: "machineclasses"}
 
 // Run runs the MCMServer.  This should never exit.
 func Run(s *options.MCMServer) error {
@@ -222,7 +217,7 @@ func StartControllers(s *options.MCMServer,
 		glog.Fatal(err)
 	}
 
-	if availableResources[awsGVR] || availableResources[azureGVR] || availableResources[gcpGVR] || availableResources[openStackGVR] || availableResources[alicloudGVR] || availableResources[packetGVR] {
+	if availableResources[machineclassGVR] {
 		glog.V(5).Infof("Creating shared informers; resync interval: %v", s.MinResyncPeriod)
 
 		controlMachineInformerFactory := machineinformers.NewFilteredSharedInformerFactory(
@@ -257,12 +252,7 @@ func StartControllers(s *options.MCMServer,
 			targetCoreInformerFactory.Core().V1().PersistentVolumes(),
 			controlCoreInformerFactory.Core().V1().Secrets(),
 			targetCoreInformerFactory.Core().V1().Nodes(),
-			machineSharedInformers.OpenStackMachineClasses(),
-			machineSharedInformers.AWSMachineClasses(),
-			machineSharedInformers.AzureMachineClasses(),
-			machineSharedInformers.GCPMachineClasses(),
-			machineSharedInformers.AlicloudMachineClasses(),
-			machineSharedInformers.PacketMachineClasses(),
+			machineSharedInformers.MachineClasses(),
 			machineSharedInformers.Machines(),
 			machineSharedInformers.MachineSets(),
 			machineSharedInformers.MachineDeployments(),
@@ -283,7 +273,7 @@ func StartControllers(s *options.MCMServer,
 		go machineController.Run(int(s.ConcurrentNodeSyncs), stop)
 
 	} else {
-		return fmt.Errorf("unable to start machine controller: API GroupVersion %q or %q or %q or %q or %q or %q is not available; found %#v", awsGVR, azureGVR, gcpGVR, openStackGVR, alicloudGVR, packetGVR, availableResources)
+		return fmt.Errorf("unable to start machine controller: API GroupVersion %q is not available; found %#v", machineclassGVR, availableResources)
 	}
 
 	select {}