Skip to content

Commit

Permalink
Change all references in Go files to sigs.k8s.io/cluster-api
Browse files Browse the repository at this point in the history
sed -i 's@k8s\.io/[email protected]/cluster-api@g' **/*.go
  • Loading branch information
Kris committed Apr 16, 2018
1 parent 7cd3a9e commit 3cf2565
Show file tree
Hide file tree
Showing 100 changed files with 283 additions and 856 deletions.
10 changes: 5 additions & 5 deletions cluster-api/cloud/google/cmd/gce-machine-controller/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apiserver/pkg/util/logs"

"k8s.io/kube-deploy/cluster-api/cloud/google"
"k8s.io/kube-deploy/cluster-api/pkg/client/clientset_generated/clientset"
"k8s.io/kube-deploy/cluster-api/pkg/controller/config"
"k8s.io/kube-deploy/cluster-api/pkg/controller/machine"
"k8s.io/kube-deploy/cluster-api/pkg/controller/sharedinformers"
"sigs.k8s.io/cluster-api/cluster-api/cloud/google"
"sigs.k8s.io/cluster-api/cluster-api/pkg/client/clientset_generated/clientset"
"sigs.k8s.io/cluster-api/cluster-api/pkg/controller/config"
"sigs.k8s.io/cluster-api/cluster-api/pkg/controller/machine"
"sigs.k8s.io/cluster-api/cluster-api/pkg/controller/sharedinformers"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion cluster-api/cloud/google/cmd/generate-image/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/golang/glog"
"github.com/spf13/cobra"
"k8s.io/kube-deploy/cluster-api/cloud/google"
"sigs.k8s.io/cluster-api/cluster-api/cloud/google"
)

type options struct {
Expand Down
2 changes: 1 addition & 1 deletion cluster-api/cloud/google/gceproviderconfig/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.
*/

// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kube-deploy/cluster-api/machinecontroller/cloud/google/gceproviderconfig
// +k8s:conversion-gen=sigs.k8s.io/cluster-api/cluster-api/machinecontroller/cloud/google/gceproviderconfig
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta

Expand Down
2 changes: 1 addition & 1 deletion cluster-api/cloud/google/gceproviderconfig/v1alpha1/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ limitations under the License.
*/

// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kube-deploy/cluster-api/machinecontroller/cloud/google/gceproviderconfig
// +k8s:conversion-gen=sigs.k8s.io/cluster-api/cluster-api/machinecontroller/cloud/google/gceproviderconfig
// +k8s:openapi-gen=true
// +k8s:defaulter-gen=TypeMeta

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/runtime/serializer"
"k8s.io/kube-deploy/cluster-api/cloud/google/gceproviderconfig"
"sigs.k8s.io/cluster-api/cluster-api/cloud/google/gceproviderconfig"
)

const GroupName = "gceproviderconfig"
Expand Down
4 changes: 2 additions & 2 deletions cluster-api/cloud/google/instancestatus.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"bytes"
"k8s.io/apimachinery/pkg/runtime/serializer/json"

clusterv1 "k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1"
"k8s.io/kube-deploy/cluster-api/util"
clusterv1 "sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1"
"sigs.k8s.io/cluster-api/cluster-api/util"
"k8s.io/apimachinery/pkg/runtime/schema"
)

Expand Down
12 changes: 6 additions & 6 deletions cluster-api/cloud/google/machineactuator.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ import (

"regexp"

gceconfig "k8s.io/kube-deploy/cluster-api/cloud/google/gceproviderconfig"
gceconfigv1 "k8s.io/kube-deploy/cluster-api/cloud/google/gceproviderconfig/v1alpha1"
apierrors "k8s.io/kube-deploy/cluster-api/errors"
clusterv1 "k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1"
client "k8s.io/kube-deploy/cluster-api/pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1"
"k8s.io/kube-deploy/cluster-api/util"
gceconfig "sigs.k8s.io/cluster-api/cluster-api/cloud/google/gceproviderconfig"
gceconfigv1 "sigs.k8s.io/cluster-api/cluster-api/cloud/google/gceproviderconfig/v1alpha1"
apierrors "sigs.k8s.io/cluster-api/cluster-api/errors"
clusterv1 "sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1"
client "sigs.k8s.io/cluster-api/cluster-api/pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1"
"sigs.k8s.io/cluster-api/cluster-api/util"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cluster-api/cloud/google/pods.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

"github.com/golang/glog"
corev1 "k8s.io/api/core/v1"
"k8s.io/kube-deploy/cluster-api/cloud/google/config"
"sigs.k8s.io/cluster-api/cluster-api/cloud/google/config"
)

var apiServerImage = "gcr.io/k8s-cluster-api/cluster-apiserver:0.0.2"
Expand Down
4 changes: 2 additions & 2 deletions cluster-api/cloud/google/serviceaccount.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"os/exec"

"github.com/golang/glog"
clusterv1 "k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1"
"k8s.io/kube-deploy/cluster-api/util"
clusterv1 "sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1"
"sigs.k8s.io/cluster-api/cluster-api/util"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cluster-api/cloud/google/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strings"

"github.com/golang/glog"
clusterv1 "k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1"
clusterv1 "sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cluster-api/cloud/google/templates.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"fmt"
"text/template"

clusterv1 "k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1"
clusterv1 "sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1"
)

type templateParams struct {
Expand Down
4 changes: 2 additions & 2 deletions cluster-api/cmd/apiserver/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"github.com/kubernetes-incubator/apiserver-builder/pkg/cmd/server"
_ "k8s.io/client-go/plugin/pkg/client/auth" // Enable cloud provider auth

"k8s.io/kube-deploy/cluster-api/pkg/apis"
"k8s.io/kube-deploy/cluster-api/pkg/openapi"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis"
"sigs.k8s.io/cluster-api/cluster-api/pkg/openapi"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions cluster-api/cmd/controller-manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

"github.com/golang/glog"
"k8s.io/apiserver/pkg/util/logs"
"k8s.io/kube-deploy/cluster-api/pkg/controller"
"k8s.io/kube-deploy/cluster-api/pkg/controller/config"
"sigs.k8s.io/cluster-api/cluster-api/pkg/controller"
"sigs.k8s.io/cluster-api/cluster-api/pkg/controller/config"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion cluster-api/errors/machines.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package errors
import (
"fmt"

commonerrors "k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/common"
commonerrors "sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/common"
)

// A more descriptive kind of error that represents an error condition that
Expand Down
2 changes: 1 addition & 1 deletion cluster-api/gcp-deployer/cmd/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/golang/glog"
"github.com/spf13/cobra"
"k8s.io/kube-deploy/cluster-api/gcp-deployer/deploy"
"sigs.k8s.io/cluster-api/cluster-api/gcp-deployer/deploy"
)

type AddOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion cluster-api/gcp-deployer/cmd/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/golang/glog"
"github.com/spf13/cobra"
"k8s.io/kube-deploy/cluster-api/gcp-deployer/deploy"
"sigs.k8s.io/cluster-api/cluster-api/gcp-deployer/deploy"
)

type CreateOptions struct {
Expand Down
2 changes: 1 addition & 1 deletion cluster-api/gcp-deployer/cmd/delete.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package cmd
import (
"github.com/golang/glog"
"github.com/spf13/cobra"
"k8s.io/kube-deploy/cluster-api/gcp-deployer/deploy"
"sigs.k8s.io/cluster-api/cluster-api/gcp-deployer/deploy"
)

var deleteCmd = &cobra.Command{
Expand Down
4 changes: 2 additions & 2 deletions cluster-api/gcp-deployer/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"github.com/golang/glog"
"github.com/spf13/cobra"
"k8s.io/apiserver/pkg/util/logs"
clusterv1 "k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1"
"k8s.io/kube-deploy/cluster-api/util"
clusterv1 "sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1"
"sigs.k8s.io/cluster-api/cluster-api/util"
)

var RootCmd = &cobra.Command{
Expand Down
12 changes: 6 additions & 6 deletions cluster-api/gcp-deployer/deploy/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (

"github.com/golang/glog"

"k8s.io/kube-deploy/cluster-api/cloud/google"
clusterv1 "k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1"
"k8s.io/kube-deploy/cluster-api/pkg/client/clientset_generated/clientset"
"k8s.io/kube-deploy/cluster-api/pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1"
"k8s.io/kube-deploy/cluster-api/util"
apiutil "k8s.io/kube-deploy/cluster-api/util"
"sigs.k8s.io/cluster-api/cluster-api/cloud/google"
clusterv1 "sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1"
"sigs.k8s.io/cluster-api/cluster-api/pkg/client/clientset_generated/clientset"
"sigs.k8s.io/cluster-api/cluster-api/pkg/client/clientset_generated/clientset/typed/cluster/v1alpha1"
"sigs.k8s.io/cluster-api/cluster-api/util"
apiutil "sigs.k8s.io/cluster-api/cluster-api/util"
)

type deployer struct {
Expand Down
4 changes: 2 additions & 2 deletions cluster-api/gcp-deployer/deploy/deploy_helper.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
apiv1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
clusterv1 "k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1"
"k8s.io/kube-deploy/cluster-api/util"
clusterv1 "sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1"
"sigs.k8s.io/cluster-api/cluster-api/util"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions cluster-api/gcp-deployer/deploy/machinedeployer.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package deploy

import (
clusterv1 "k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1"
"k8s.io/kube-deploy/cluster-api/pkg/controller/machine"
clusterv1 "sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1"
"sigs.k8s.io/cluster-api/cluster-api/pkg/controller/machine"
)

// Provider-specific machine logic the deployer needs.
Expand Down
2 changes: 1 addition & 1 deletion cluster-api/gcp-deployer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

package main

import "k8s.io/kube-deploy/cluster-api/gcp-deployer/cmd"
import "sigs.k8s.io/cluster-api/cluster-api/gcp-deployer/cmd"

func main() {
cmd.Execute()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"k8s.io/apimachinery/pkg/apimachinery/announced"
"k8s.io/apimachinery/pkg/apimachinery/registered"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kube-deploy/cluster-api/pkg/apis"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis"
)

func Install(
Expand Down
4 changes: 2 additions & 2 deletions cluster-api/pkg/apis/cluster/v1alpha1/cluster_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/validation/field"

"k8s.io/kube-deploy/cluster-api/pkg/apis/cluster"
"k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/common"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/common"
)

// +genclient
Expand Down
6 changes: 3 additions & 3 deletions cluster-api/pkg/apis/cluster/v1alpha1/cluster_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1"
"k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1/testutil"
"k8s.io/kube-deploy/cluster-api/pkg/client/clientset_generated/clientset"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1/testutil"
"sigs.k8s.io/cluster-api/cluster-api/pkg/client/clientset_generated/clientset"
)

func crudAccessToClusterClient(t *testing.T, cs *clientset.Clientset) {
Expand Down
4 changes: 2 additions & 2 deletions cluster-api/pkg/apis/cluster/v1alpha1/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ limitations under the License.

// +k8s:openapi-gen=true
// +k8s:deepcopy-gen=package,register
// +k8s:conversion-gen=k8s.io/kube-deploy/cluster-api/pkg/apis/cluster
// +k8s:conversion-gen=sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster
// +k8s:defaulter-gen=TypeMeta
// +groupName=cluster.k8s.io
package v1alpha1 // import "k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1"
package v1alpha1 // import "sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1"

4 changes: 2 additions & 2 deletions cluster-api/pkg/apis/cluster/v1alpha1/machine_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/validation/field"

"k8s.io/kube-deploy/cluster-api/pkg/apis/cluster"
clustercommon "k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/common"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster"
clustercommon "sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/common"
)

// Finalizer is set on PreareForCreate callback
Expand Down
4 changes: 2 additions & 2 deletions cluster-api/pkg/apis/cluster/v1alpha1/machine_types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1"
"k8s.io/kube-deploy/cluster-api/pkg/client/clientset_generated/clientset"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1"
"sigs.k8s.io/cluster-api/cluster-api/pkg/client/clientset_generated/clientset"
)

func crudAccessToMachineClient(t *testing.T, cs *clientset.Clientset) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
utilvalidation "k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field"

"k8s.io/kube-deploy/cluster-api/pkg/apis/cluster"
"k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/common"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/common"
)

// +genclient
Expand Down
4 changes: 2 additions & 2 deletions cluster-api/pkg/apis/cluster/v1alpha1/machineset_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/common"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/common"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/kube-deploy/cluster-api/pkg/apis/cluster"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster"
metav1validation "k8s.io/apimachinery/pkg/apis/meta/v1/validation"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (

metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

"k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1"
"k8s.io/kube-deploy/cluster-api/pkg/apis/cluster"
"k8s.io/kube-deploy/cluster-api/pkg/client/clientset_generated/clientset"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster"
"sigs.k8s.io/cluster-api/cluster-api/pkg/client/clientset_generated/clientset"
genericapirequest "k8s.io/apiserver/pkg/endpoints/request"
)

Expand Down
2 changes: 1 addition & 1 deletion cluster-api/pkg/apis/cluster/v1alpha1/testutil/testutil.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

package testutil

import "k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/v1alpha1"
import "sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/v1alpha1"

// GetVanillaCluster return a bare minimum functional cluster resource object
func GetVanillaCluster() v1alpha1.Cluster {
Expand Down
6 changes: 3 additions & 3 deletions cluster-api/pkg/apis/cluster/v1alpha1/v1alpha1_suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (

"github.com/kubernetes-incubator/apiserver-builder/pkg/test"

"k8s.io/kube-deploy/cluster-api/pkg/apis"
"k8s.io/kube-deploy/cluster-api/pkg/client/clientset_generated/clientset"
"k8s.io/kube-deploy/cluster-api/pkg/openapi"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis"
"sigs.k8s.io/cluster-api/cluster-api/pkg/client/clientset_generated/clientset"
"sigs.k8s.io/cluster-api/cluster-api/pkg/openapi"
)

func TestV1alpha1(t *testing.T) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kube-deploy/cluster-api/pkg/apis/cluster"
"sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster"
)

var (
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
v1 "k8s.io/api/core/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
intstr "k8s.io/apimachinery/pkg/util/intstr"
common "k8s.io/kube-deploy/cluster-api/pkg/apis/cluster/common"
common "sigs.k8s.io/cluster-api/cluster-api/pkg/apis/cluster/common"
)

// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
Expand Down
Loading

0 comments on commit 3cf2565

Please sign in to comment.