Renamed providerConfig to providerSpec (openshift#112)

* Updated cluster-api for renaming ProviderConfig

... to ProviderSpec openshift#109

* Changed providerConfig to providerSpec

also added two little railguards in the actuator, to not panic if there
is no `providerSpec.Value`. In theory with this, it is possible to
update the controller and edit existing manifests from `providerConfig`
to `providerSpec`.

* Fixed Gopkg.lock

This resulted in removing a couple of corba license files

Author: Christoph Glaubitz

Gopkg.lock

@@ -9,8 +9,8 @@ spec:
         pods:
             cidrBlocks: ["192.168.0.0/16"]
         serviceDomain: "cluster.local"
-    providerConfig:
+    providerSpec:
       value:
         apiVersion: "openstackproviderconfig/v1alpha1"
-        kind: "OpenstackProviderConfig"
+        kind: "OpenstackProviderSpec"
 

cmd/clusterctl/examples/openstack/centos/cluster.yaml.template

@@ -6,10 +6,10 @@ items:
     labels:
       set: master
   spec:
-    providerConfig:
+    providerSpec:
       value:
         apiVersion: "openstackproviderconfig/v1alpha1"
-        kind: "OpenstackProviderConfig"
+        kind: "OpenstackProviderSpec"
         flavor: m1.medium
         image: CentOS-7-x86_64-GenericCloud
         sshUserName: centos
@@ -29,10 +29,10 @@ items:
     labels:
       set: node
   spec:
-    providerConfig:
+    providerSpec:
       value:
         apiVersion: "openstackproviderconfig/v1alpha1"
-        kind: "OpenstackProviderConfig"
+        kind: "OpenstackProviderSpec"
         flavor: m1.medium
         image: CentOS-7-x86_64-GenericCloud
         sshUserName: centos

cmd/clusterctl/examples/openstack/centos/machines.yaml.template

@@ -9,8 +9,8 @@ spec:
         pods:
             cidrBlocks: ["192.168.0.0/16"]
         serviceDomain: "cluster.local"
-    providerConfig:
+    providerSpec:
       value:
         apiVersion: "openstackproviderconfig/v1alpha1"
-        kind: "OpenstackProviderConfig"
+        kind: "OpenstackProviderSpec"
 

cmd/clusterctl/examples/openstack/ubuntu/cluster.yaml.template

@@ -6,10 +6,10 @@ items:
     labels:
       set: master
   spec:
-    providerConfig:
+    providerSpec:
       value:
         apiVersion: "openstackproviderconfig/v1alpha1"
-        kind: "OpenstackProviderConfig"
+        kind: "OpenstackProviderSpec"
         flavor: m1.medium
         image: Ubuntu-Server-16.04-x64
         sshUserName: ubuntu
@@ -29,10 +29,10 @@ items:
     labels:
       set: node
   spec:
-    providerConfig:
+    providerSpec:
       value:
         apiVersion: "openstackproviderconfig/v1alpha1"
-        kind: "OpenstackProviderConfig"
+        kind: "OpenstackProviderSpec"
         flavor: m1.medium
         image: Ubuntu-Server-16.04-x64
         sshUserName: ubuntu

cmd/clusterctl/examples/openstack/ubuntu/machines.yaml.template

@@ -4,12 +4,12 @@ metadata:
   creationTimestamp: null
   labels:
     controller-tools.k8s.io: "1.0"
-  name: openstackproviderconfigs.openstackproviderconfig.k8s.io
+  name: openstackproviderspecs.openstackproviderconfig.k8s.io
 spec:
   group: openstackproviderconfig.k8s.io
   names:
-    kind: OpenstackProviderConfig
-    plural: openstackproviderconfigs
+    kind: OpenstackProviderSpec
+    plural: openstackproviderspecs
   scope: Namespaced
   validation:
     openAPIV3Schema:

config/crd/openstackproviderconfig_v1alpha1.yaml

@@ -17,6 +17,8 @@ limitations under the License.
 package v1alpha1
 
 import (
+	"errors"
+
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/json"
@@ -36,12 +38,16 @@ var (
 	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
 )
 
-func ClusterConfigFromProviderConfig(providerConfig clusterv1.ProviderConfig) (*OpenstackProviderConfig, error) {
-	var config *OpenstackProviderConfig
-	if err := yaml.Unmarshal(providerConfig.Value.Raw, &config); err != nil {
+func ClusterSpecFromProviderSpec(providerSpec clusterv1.ProviderSpec) (*OpenstackProviderSpec, error) {
+	if providerSpec.Value == nil {
+		return nil, errors.New("no such providerSpec found in manifest")
+	}
+
+	var config OpenstackProviderSpec
+	if err := yaml.Unmarshal(providerSpec.Value.Raw, &config); err != nil {
 		return nil, err
 	}
-	return config, nil
+	return &config, nil
 }
 
 func ClusterStatusFromProviderStatus(extension *runtime.RawExtension) (*OpenstackClusterProviderStatus, error) {
@@ -57,11 +63,15 @@ func ClusterStatusFromProviderStatus(extension *runtime.RawExtension) (*Openstac
 	return status, nil
 }
 
-// This is the same as ClusterConfigFromProviderConfig but we
-// expect there to be a specific Config type for Machines soon
-func MachineConfigFromProviderConfig(providerConfig clusterv1.ProviderConfig) (*OpenstackProviderConfig, error) {
-	var config OpenstackProviderConfig
-	if err := yaml.Unmarshal(providerConfig.Value.Raw, &config); err != nil {
+// This is the same as ClusterSpecFromProviderSpec but we
+// expect there to be a specific Spec type for Machines soon
+func MachineSpecFromProviderSpec(providerSpec clusterv1.ProviderSpec) (*OpenstackProviderSpec, error) {
+	if providerSpec.Value == nil {
+		return nil, errors.New("no such providerSpec found in manifest")
+	}
+
+	var config OpenstackProviderSpec
+	if err := yaml.Unmarshal(providerSpec.Value.Raw, &config); err != nil {
 		return nil, err
 	}
 	return &config, nil

pkg/apis/openstackproviderconfig/v1alpha1/register.go

@@ -21,7 +21,7 @@ import (
 )
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
-type OpenstackProviderConfig struct {
+type OpenstackProviderSpec struct {
 	metav1.TypeMeta `json:",inline"`
 	// The flavor reference for the flavor for your server instance.
 	Flavor string `json:"flavor"`
@@ -97,5 +97,5 @@ type OpenstackClusterProviderStatus struct {
 }
 
 func init() {
-	SchemeBuilder.Register(&OpenstackProviderConfig{})
+	SchemeBuilder.Register(&OpenstackProviderSpec{})
 }

pkg/apis/openstackproviderconfig/v1alpha1/types.go

@@ -179,7 +179,7 @@ func getNetworkIDsByFilter(is *InstanceService, opts *networks.ListOpts) ([]stri
 	return []string{}, nil
 }
 
-func (is *InstanceService) InstanceCreate(name string, config *openstackconfigv1.OpenstackProviderConfig, cmd string, keyName string) (instance *Instance, err error) {
+func (is *InstanceService) InstanceCreate(name string, config *openstackconfigv1.OpenstackProviderSpec, cmd string, keyName string) (instance *Instance, err error) {
 	var createOpts servers.CreateOpts
 	if config == nil {
 		return nil, fmt.Errorf("create Options need be specified to create instace")