Use providerSpec instead of providerConfig (#443)

* Update cluster-api dependency to 45f1c93260140936c610e56575d7505ba3d52444

* Add basic conversion for providerconfig -> providerspec

* Add migration

* Plumb migration into cmd

* Update remaining providerSpec references

* Fixup resources name for machineS

* Update tests and samples

* Fix linting

* Update fixture

* Use yaml for fixtures

* Make linter happy

* Fix fixture

* Update remaining references to providerConfig

* Work around the no machine.spec modification admission rule

* Improve metric error message

* Use upstream defaulting for machineDeployments

* Pr feedback

Author: alvaroaleman

.golangci.yml

@@ -30,5 +30,6 @@ issues:
   - should have comment or be unexported
   - should have comment \\(or a comment on this block\\) or be unexported
   - func Convert_MachinesV1alpha1Machine_To_ClusterV1alpha1Machine should be ConvertMachinesV1alpha1MachineToClusterV1alpha1Machine
+  - func Convert_ProviderConfig_To_ProviderSpec should be ConvertProviderConfigToProviderSpec
   - 'counter\.Set is deprecated: Use NewConstMetric'
   - 'eviction\.go:221:4: the surrounding loop is unconditionally terminated'

Gopkg.lock

@@ -110,7 +110,7 @@ required = [
 
 [[constraint]]
   name = "sigs.k8s.io/cluster-api"
-  revision = "05cb1e663eb4085fbb92321dd1235377c84567f8"
+  revision = "45f1c93260140936c610e56575d7505ba3d52444"
 
 [[constraint]]
   name = "gopkg.in/gcfg.v1"

Gopkg.toml

@@ -369,7 +369,14 @@ func startControllerViaLeaderElection(runOptions controllerRunOptions) error {
 			clusterv1Alpha1Client,
 			runOptions.cfg,
 		); err != nil {
-			glog.Errorf("Migration failed: %v", err)
+			glog.Errorf("Migration to clusterv1alpha1 failed: %v", err)
+			runOptions.parentCtxDone()
+			return
+		}
+
+		//Migrate providerConfig field to providerSpec field
+		if err := migrations.MigrateProviderConfigToProviderSpecIfNecesary(runOptions.cfg); err != nil {
+			glog.Errorf("Migration of providerConfig field to providerSpec field failed: %v", err)
 			runOptions.parentCtxDone()
 			return
 		}

cmd/controller/main.go

@@ -32,7 +32,7 @@ spec:
       labels:
         foo: bar
     spec:
-      providerConfig:
+      providerSpec:
         value:
           sshPublicKeys:
             - "<< YOUR_PUBLIC_KEY >>"

examples/aws-machinedeployment.yaml

@@ -32,7 +32,7 @@ spec:
       labels:
         foo: bar
     spec:
-      providerConfig:
+      providerSpec:
         value:
           sshPublicKeys:
             - "<< YOUR_PUBLIC_KEY >>"

examples/azure-machinedeployment.yaml

@@ -31,7 +31,7 @@ spec:
       labels:
         foo: bar
     spec:
-      providerConfig:
+      providerSpec:
         value:
           sshPublicKeys:
             - "<< YOUR_PUBLIC_KEY >>"

examples/digitalocean-machinedeployment.yaml

@@ -31,7 +31,7 @@ spec:
       labels:
         foo: bar
     spec:
-      providerConfig:
+      providerSpec:
         value:
           sshPublicKeys:
             - "<< YOUR_PUBLIC_KEY >>"
@@ -50,4 +50,4 @@ spec:
           operatingSystemSpec:
             distUpgradeOnBoot: false
       versions:
-        kubelet: 1.9.6
+        kubelet: 1.13.1

examples/hetzner-machinedeployment.yaml

@@ -20,7 +20,7 @@ spec:
       labels:
         name: foo
     spec:
-      providerConfig:
+      providerSpec:
         value:
           sshPublicKeys:
             - "<< YOUR_PUBLIC_KEY >>"

examples/kubevirt-machinedeployment.yaml

@@ -14,10 +14,10 @@ spec:
   additionalPrinterColumns:
   - name: Provider
     type: string
-    JSONPath: .spec.providerConfig.value.cloudProvider
+    JSONPath: .spec.providerSpec.value.cloudProvider
   - name: OS
     type: string
-    JSONPath: .spec.providerConfig.value.operatingSystem
+    JSONPath: .spec.providerSpec.value.operatingSystem
   - name: Address
     type: string
     JSONPath: .status.addresses[0].address
@@ -48,10 +48,10 @@ spec:
     JSONPath: .spec.replicas
   - name: Provider
     type: string
-    JSONPath: .spec.template.spec.providerConfig.value.cloudProvider
+    JSONPath: .spec.template.spec.providerSpec.value.cloudProvider
   - name: OS
     type: string
-    JSONPath: .spec.template.spec.providerConfig.value.operatingSystem
+    JSONPath: .spec.template.spec.providerSpec.value.operatingSystem
   - name: Age
     type: date
     JSONPath: .metadata.creationTimestamp
@@ -78,10 +78,10 @@ spec:
     JSONPath: .spec.replicas
   - name: Provider
     type: string
-    JSONPath: .spec.template.spec.providerConfig.value.cloudProvider
+    JSONPath: .spec.template.spec.providerSpec.value.cloudProvider
   - name: OS
     type: string
-    JSONPath: .spec.template.spec.providerConfig.value.operatingSystem
+    JSONPath: .spec.template.spec.providerSpec.value.operatingSystem
   - name: Age
     type: date
     JSONPath: .metadata.creationTimestamp