Merge pull request kubernetes-sigs#2 from m1093782566/fix-import-path

Fix import path: cluster-provider-api-openstack -> cluster-api-provider-openstack

Makefile

@@ -154,8 +154,8 @@ dist: build-cross
 		cd _dist && \
 		$(DIST_DIRS) cp ../LICENSE {} \; && \
 		$(DIST_DIRS) cp ../README.md {} \; && \
-		$(DIST_DIRS) tar -zcf cluster-provider-api-openstack-$(VERSION)-{}.tar.gz {} \; && \
-		$(DIST_DIRS) zip -r cluster-provider-api-openstack-$(VERSION)-{}.zip {} \; \
+		$(DIST_DIRS) tar -zcf cluster-api-provider-openstack-$(VERSION)-{}.tar.gz {} \; && \
+		$(DIST_DIRS) zip -r cluster-api-provider-openstack-$(VERSION)-{}.zip {} \; \
 	)
 
 .PHONY: build clean cover depend docs fmt functional lint realclean \

README.md

@@ -1,4 +1,4 @@
-# Kubernetes cluster-provider-api-openstack Project
+# Kubernetes cluster-api-provider-openstack Project
 
 This repository hosts a concrete implementation of a provider for OpenStack for the [cluster-api project](https://github.com/dims/cluster-api).
 

RELEASE.md

@@ -1,9 +1,9 @@
 # Release Process
 
-The Kubernetes cluster-provider-api-openstack is released on an as-needed basis. The process is as follows:
+The Kubernetes cluster-api-provider-openstack is released on an as-needed basis. The process is as follows:
 
 1. An issue is proposing a new release with a changelog since the last release
 1. All [OWNERS](OWNERS) must LGTM this release
 1. An OWNER runs `git tag -s $VERSION` and inserts the changelog and pushes the tag with `git push $VERSION`
 1. The release issue is closed
-1. An announcement email is sent to `[email protected]` with the subject `[ANNOUNCE] cluster-provider-api-openstack $VERSION is released`
+1. An announcement email is sent to `[email protected]` with the subject `[ANNOUNCE] cluster-api-provider-openstack $VERSION is released`

cloud/openstack/clients/machineservice.go

@@ -26,7 +26,7 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/extensions/keypairs"
 	"github.com/gophercloud/gophercloud/openstack/compute/v2/servers"
 	"github.com/gophercloud/gophercloud/openstack/identity/v3/tokens"
-	openstackconfigv1 "sigs.k8s.io/cluster-provider-api-openstack/cloud/openstack/openstackproviderconfig/v1alpha1"
+	openstackconfigv1 "sigs.k8s.io/cluster-api-provider-openstack/cloud/openstack/openstackproviderconfig/v1alpha1"
 )
 
 type InstanceService struct {

cloud/openstack/machineactuator.go

@@ -30,9 +30,9 @@ import (
 	"github.com/golang/glog"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
-	"sigs.k8s.io/cluster-provider-api-openstack/cloud/openstack/clients"
-	"sigs.k8s.io/cluster-provider-api-openstack/cloud/openstack/machinesetup"
-	openstackconfigv1 "sigs.k8s.io/cluster-provider-api-openstack/cloud/openstack/openstackproviderconfig/v1alpha1"
+	"sigs.k8s.io/cluster-api-provider-openstack/cloud/openstack/clients"
+	"sigs.k8s.io/cluster-api-provider-openstack/cloud/openstack/machinesetup"
+	openstackconfigv1 "sigs.k8s.io/cluster-api-provider-openstack/cloud/openstack/openstackproviderconfig/v1alpha1"
 	clusterv1 "sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1"
 	client "sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1"
 	apierrors "sigs.k8s.io/cluster-api/pkg/errors"

cloud/openstack/openstackproviderconfig/v1alpha1/register.go

@@ -20,7 +20,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
-	"sigs.k8s.io/cluster-provider-api-openstack/cloud/openstack/openstackproviderconfig"
+	"sigs.k8s.io/cluster-api-provider-openstack/cloud/openstack/openstackproviderconfig"
 )
 
 const GroupName = "openstackproviderconfig"

cmd/openstack-machine-controller/main.go

@@ -23,7 +23,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apiserver/pkg/util/logs"
 
-	"sigs.k8s.io/cluster-provider-api-openstack/cloud/openstack"
+	"sigs.k8s.io/cluster-api-provider-openstack/cloud/openstack"
 	"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
 	"sigs.k8s.io/cluster-api/pkg/controller/config"
 	"sigs.k8s.io/cluster-api/pkg/controller/machine"

images/machine-controller/Dockerfile

@@ -20,7 +20,7 @@ WORKDIR /go/src/sigs.k8s.io/cluster-api
 # e.g. docker build -t <tag> -f <this_Dockerfile> <path_to_cluster-api>
 COPY . . 
 
-RUN CGO_ENABLED=0 GOOS=linux go install -a -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-provider-api-openstack/cloud/openstack/cmd/openstack-machine-controller
+RUN CGO_ENABLED=0 GOOS=linux go install -a -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api-provider-openstack/cloud/openstack/cmd/openstack-machine-controller
 
 # Final container
 FROM debian:stretch-slim