Merge pull request openshift#1027 from enxebre/providerspec

Providerspec
wking · Jan 9, 2019 · 6880b3e · 6880b3e
2 parents 3166250 + 188884e
commit 6880b3e
Show file tree

Hide file tree

Showing 23 changed files with 1,884 additions and 56 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/asset/machines/aws/machines.go b/pkg/asset/machines/aws/machines.go
@@ -56,7 +56,7 @@ func Machines(config *types.InstallConfig, pool *types.MachinePool, role, userDa
 				},
 			},
 			Spec: clusterapi.MachineSpec{
-				ProviderConfig: clusterapi.ProviderConfig{
+				ProviderSpec: clusterapi.ProviderSpec{
 					Value: &runtime.RawExtension{Object: provider},
 				},
 				// we don't need to set Versions, because we control those via operators.
@@ -122,9 +122,9 @@ func tagsFromUserTags(clusterID, clusterName string, usertags map[string]string)
 // ConfigMasters sets the PublicIP flag and assigns a set of load balancers to the given machines
 func ConfigMasters(machines []clusterapi.Machine, clusterName string) {
 	for _, machine := range machines {
-		providerConfig := machine.Spec.ProviderConfig.Value.Object.(*awsprovider.AWSMachineProviderConfig)
-		providerConfig.PublicIP = pointer.BoolPtr(true)
-		providerConfig.LoadBalancers = []awsprovider.LoadBalancerReference{
+		providerSpec := machine.Spec.ProviderSpec.Value.Object.(*awsprovider.AWSMachineProviderConfig)
+		providerSpec.PublicIP = pointer.BoolPtr(true)
+		providerSpec.LoadBalancers = []awsprovider.LoadBalancerReference{
 			{
 				Name: fmt.Sprintf("%s-ext", clusterName),
 				Type: awsprovider.NetworkLoadBalancerType,

diff --git a/pkg/asset/machines/aws/machinesets.go b/pkg/asset/machines/aws/machinesets.go
@@ -75,7 +75,7 @@ func MachineSets(config *types.InstallConfig, pool *types.MachinePool, role, use
 						},
 					},
 					Spec: clusterapi.MachineSpec{
-						ProviderConfig: clusterapi.ProviderConfig{
+						ProviderSpec: clusterapi.ProviderSpec{
 							Value: &runtime.RawExtension{Object: provider},
 						},
 						// we don't need to set Versions, because we control those via cluster operators.

diff --git a/pkg/asset/machines/libvirt/machines.go b/pkg/asset/machines/libvirt/machines.go
@@ -49,7 +49,7 @@ func Machines(config *types.InstallConfig, pool *types.MachinePool, role, userDa
 				},
 			},
 			Spec: clusterapi.MachineSpec{
-				ProviderConfig: clusterapi.ProviderConfig{
+				ProviderSpec: clusterapi.ProviderSpec{
 					Value: &runtime.RawExtension{Object: provider},
 				},
 				// we don't need to set Versions, because we control those via cluster operators.

diff --git a/pkg/asset/machines/libvirt/machinesets.go b/pkg/asset/machines/libvirt/machinesets.go
@@ -66,7 +66,7 @@ func MachineSets(config *types.InstallConfig, pool *types.MachinePool, role, use
 					},
 				},
 				Spec: clusterapi.MachineSpec{
-					ProviderConfig: clusterapi.ProviderConfig{
+					ProviderSpec: clusterapi.ProviderSpec{
 						Value: &runtime.RawExtension{Object: provider},
 					},
 					// we don't need to set Versions, because we control those via cluster operators.

diff --git a/pkg/asset/machines/openstack/master.go b/pkg/asset/machines/openstack/master.go
@@ -38,7 +38,7 @@ items:
       sigs.k8s.io/cluster-api-machine-role: master
       sigs.k8s.io/cluster-api-machine-type: master
   spec:
-    providerConfig:
+    providerSpec:
       value:
         apiVersion: openstack.cluster.k8s.io/v1alpha1
         kind: OpenStackMachineProviderConfig

diff --git a/pkg/asset/machines/openstack/worker.go b/pkg/asset/machines/openstack/worker.go
@@ -43,7 +43,7 @@ spec:
         sigs.k8s.io/cluster-api-machine-role: worker
         sigs.k8s.io/cluster-api-machine-type: worker
     spec:
-      providerConfig:
+      providerSpec:
         value:
           apiVersion: openstack.cluster.k8s.io/v1alpha1
           kind: OpenStackMachineProviderConfig

diff --git a/...der-libvirt/pkg/apis/libvirtproviderconfig/v1alpha1/libvirtmachineproviderconfig_types.go b/...der-libvirt/pkg/apis/libvirtproviderconfig/v1alpha1/libvirtmachineproviderconfig_types.go
diff --git a/...penshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1alpha1/register.go b/...penshift/cluster-api-provider-libvirt/pkg/apis/libvirtproviderconfig/v1alpha1/register.go
diff --git a/vendor/k8s.io/klog/LICENSE b/vendor/k8s.io/klog/LICENSE