Skip to content

Commit

Permalink
Renaming package so it can be imported by eks-a and updating copyrigh…
Browse files Browse the repository at this point in the history
…t year (#60)
  • Loading branch information
maxdrib authored Jan 3, 2022
1 parent 05ab36d commit f53f04b
Show file tree
Hide file tree
Showing 35 changed files with 65 additions and 65 deletions.
8 changes: 4 additions & 4 deletions PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ domain: cluster.x-k8s.io
layout:
- go.kubebuilder.io/v3
projectName: cluster-api-provider-capc
repo: cluster.x-k8s.io/cluster-api-provider-capc
repo: github.com/aws/cluster-api-provider-cloudstack-staging
resources:
- api:
crdVersion: v1
Expand All @@ -11,7 +11,7 @@ resources:
domain: cluster.x-k8s.io
group: infrastructure
kind: CloudStackCluster
path: cluster.x-k8s.io/cluster-api-provider-capc/api/v1alpha3
path: github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3
version: v1alpha3
webhooks:
defaulting: true
Expand All @@ -24,7 +24,7 @@ resources:
domain: cluster.x-k8s.io
group: infrastructure
kind: CloudStackMachine
path: cluster.x-k8s.io/cluster-api-provider-capc/api/v1alpha3
path: github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3
version: v1alpha3
webhooks:
defaulting: true
Expand All @@ -37,7 +37,7 @@ resources:
domain: cluster.x-k8s.io
group: infrastructure
kind: CloudStackMachineTemplate
path: cluster.x-k8s.io/cluster-api-provider-capc/api/v1alpha3
path: github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3
version: v1alpha3
webhooks:
defaulting: true
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha3/cloudstackcluster_types.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha3/cloudstackcluster_webhook.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -17,8 +17,8 @@ limitations under the License.
package v1alpha3

import (
"cluster.x-k8s.io/cluster-api-provider-capc/pkg/webhook_utilities"
"fmt"
"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/webhook_utilities"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/validation/field"
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha3/cloudstackcluster_webhook_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha3/cloudstackmachine_types.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha3/cloudstackmachine_webhook.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -17,8 +17,8 @@ limitations under the License.
package v1alpha3

import (
"cluster.x-k8s.io/cluster-api-provider-capc/pkg/webhook_utilities"
"fmt"
"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/webhook_utilities"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/validation/field"
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha3/cloudstackmachine_webhook_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha3/cloudstackmachinetemplate_types.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions api/v1alpha3/cloudstackmachinetemplate_webhook.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -17,8 +17,8 @@ limitations under the License.
package v1alpha3

import (
"cluster.x-k8s.io/cluster-api-provider-capc/pkg/webhook_utilities"
"fmt"
"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/webhook_utilities"
"k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/util/validation/field"
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha3/cloudstackmachinetemplate_webhook_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha3/conversion.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha3/groupversion_info.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha3/webhook_suite_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion api/v1alpha3/zz_generated.deepcopy.go

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

6 changes: 3 additions & 3 deletions controllers/cloudstackcluster_controller.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -37,8 +37,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

infrav1 "cluster.x-k8s.io/cluster-api-provider-capc/api/v1alpha3"
"cluster.x-k8s.io/cluster-api-provider-capc/pkg/cloud"
infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud"
)

// CloudStackClusterReconciler reconciles a CloudStackCluster object.
Expand Down
4 changes: 2 additions & 2 deletions controllers/cloudstackcluster_controller_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,7 @@ import (
"context"
"time"

infrav1 "cluster.x-k8s.io/cluster-api-provider-capc/api/v1alpha3"
infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
"github.com/golang/mock/gomock"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
6 changes: 3 additions & 3 deletions controllers/cloudstackmachine_controller.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -40,8 +40,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/source"

infrav1 "cluster.x-k8s.io/cluster-api-provider-capc/api/v1alpha3"
"cluster.x-k8s.io/cluster-api-provider-capc/pkg/cloud"
infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud"
capiv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
)

Expand Down
8 changes: 4 additions & 4 deletions controllers/controllers_suite_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -41,9 +41,9 @@ import (
logf "sigs.k8s.io/controller-runtime/pkg/log"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

infrav1 "cluster.x-k8s.io/cluster-api-provider-capc/api/v1alpha3"
csReconcilers "cluster.x-k8s.io/cluster-api-provider-capc/controllers"
"cluster.x-k8s.io/cluster-api-provider-capc/pkg/mocks"
infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
csReconcilers "github.com/aws/cluster-api-provider-cloudstack-staging/controllers"
"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/mocks"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
//+kubebuilder:scaffold:imports
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module cluster.x-k8s.io/cluster-api-provider-capc
module github.com/aws/cluster-api-provider-cloudstack-staging

go 1.16

Expand Down
2 changes: 1 addition & 1 deletion hack/boilerplate.go.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion hack/nginx.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021.
# Copyright 2022.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion hack/testing_ginkgo_recover_statements.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

# Copyright 2021.
# Copyright 2022.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
8 changes: 4 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -17,8 +17,8 @@ limitations under the License.
package main

import (
"cluster.x-k8s.io/cluster-api-provider-capc/pkg/cloud"
"flag"
"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud"
"os"
clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
"strings"
Expand All @@ -34,8 +34,8 @@ import (
"sigs.k8s.io/controller-runtime/pkg/healthz"
"sigs.k8s.io/controller-runtime/pkg/log/zap"

infrav1 "cluster.x-k8s.io/cluster-api-provider-capc/api/v1alpha3"
"cluster.x-k8s.io/cluster-api-provider-capc/controllers"
infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
"github.com/aws/cluster-api-provider-cloudstack-staging/controllers"
//+kubebuilder:scaffold:imports
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/cloud/client.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -19,14 +19,14 @@ package cloud
import (
"strings"

infrav1 "cluster.x-k8s.io/cluster-api-provider-capc/api/v1alpha3"
"github.com/apache/cloudstack-go/v2/cloudstack"
infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
"github.com/pkg/errors"
"gopkg.in/ini.v1"
capiv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
)

//go:generate mockgen -destination=../mocks/mock_client.go -package=mocks cluster.x-k8s.io/cluster-api-provider-capc/pkg/cloud Client
//go:generate mockgen -destination=../mocks/mock_client.go -package=mocks github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud Client

type Client interface {
GetOrCreateCluster(*infrav1.CloudStackCluster) error
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloud/cloud_suite_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloud/cluster.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -17,7 +17,7 @@ limitations under the License.
package cloud

import (
infrav1 "cluster.x-k8s.io/cluster-api-provider-capc/api/v1alpha3"
infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
"github.com/pkg/errors"
)

Expand Down
6 changes: 3 additions & 3 deletions pkg/cloud/cluster_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -18,9 +18,9 @@ package cloud_test
import (
"fmt"

infrav1 "cluster.x-k8s.io/cluster-api-provider-capc/api/v1alpha3"
"cluster.x-k8s.io/cluster-api-provider-capc/pkg/cloud"
"github.com/apache/cloudstack-go/v2/cloudstack"
infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud"
"github.com/golang/mock/gomock"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
Expand Down
2 changes: 1 addition & 1 deletion pkg/cloud/helpers.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloud/helpers_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -20,7 +20,7 @@ import (
"os"
"path"

"cluster.x-k8s.io/cluster-api-provider-capc/pkg/cloud"
"github.com/aws/cluster-api-provider-cloudstack-staging/pkg/cloud"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloud/instance.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2021.
Copyright 2022.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -25,8 +25,8 @@ import (

capiv1 "sigs.k8s.io/cluster-api/api/v1alpha3"

infrav1 "cluster.x-k8s.io/cluster-api-provider-capc/api/v1alpha3"
"github.com/apache/cloudstack-go/v2/cloudstack"
infrav1 "github.com/aws/cluster-api-provider-cloudstack-staging/api/v1alpha3"
corev1 "k8s.io/api/core/v1"
"k8s.io/utils/pointer"
)
Expand Down
Loading

0 comments on commit f53f04b

Please sign in to comment.