Skip to content

Commit 1424bef

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3785 from sbueringer/pr-add-v2-to-module-name
Add /v2 to go module name
2 parents 93bab1f + 58c2d58 commit 1424bef

File tree

348 files changed

+1042
-1017
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

348 files changed

+1042
-1017
lines changed

‎.golangci.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,31 +85,31 @@ linters-settings:
8585
alias: utilconversion
8686
- pkg: k8s.io/apimachinery/pkg/conversion
8787
alias: apiconversion
88-
- pkg: sigs.k8s.io/cluster-api-provider-aws/api/v1beta2
88+
- pkg: sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2
8989
alias: infrav1
90-
- pkg: sigs.k8s.io/cluster-api-provider-aws/api/v1beta1
90+
- pkg: sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1
9191
alias: infrav1beta1
92-
- pkg: sigs.k8s.io/cluster-api-provider-aws/exp/api/v1beta1
92+
- pkg: sigs.k8s.io/cluster-api-provider-aws/v2/exp/api/v1beta1
9393
alias: expinfrav1beta1
94-
- pkg: sigs.k8s.io/cluster-api-provider-aws/exp/api/v1beta2
94+
- pkg: sigs.k8s.io/cluster-api-provider-aws/v2/exp/api/v1beta2
9595
alias: expinfrav1
9696
- pkg: k8s.io/client-go/kubernetes/scheme
9797
alias: cgscheme
9898
- pkg: k8s.io/client-go/tools/record
9999
alias: cgrecord
100-
- pkg: sigs.k8s.io/cluster-api-provider-aws/bootstrap/eks/api/v1beta1
100+
- pkg: sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/api/v1beta1
101101
alias: eksbootstrapv1beta1
102-
- pkg: sigs.k8s.io/cluster-api-provider-aws/bootstrap/eks/api/v1beta2
102+
- pkg: sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/api/v1beta2
103103
alias: eksbootstrapv1
104-
- pkg: sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/api/v1beta1
104+
- pkg: sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta1
105105
alias: ekscontrolplanev1beta1
106-
- pkg: sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/api/v1beta2
106+
- pkg: sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/api/v1beta2
107107
alias: ekscontrolplanev1
108-
- pkg: "sigs.k8s.io/cluster-api-provider-aws/bootstrap/eks/controllers"
108+
- pkg: "sigs.k8s.io/cluster-api-provider-aws/v2/bootstrap/eks/controllers"
109109
alias: eksbootstrapcontrollers
110-
- pkg: "sigs.k8s.io/cluster-api-provider-aws/controlplane/eks/controllers"
110+
- pkg: "sigs.k8s.io/cluster-api-provider-aws/v2/controlplane/eks/controllers"
111111
alias: ekscontrolplanecontrollers
112-
- pkg: "sigs.k8s.io/cluster-api-provider-aws/exp/controllers"
112+
- pkg: "sigs.k8s.io/cluster-api-provider-aws/v2/exp/controllers"
113113
alias: expcontrollers
114114
- pkg: "k8s.io/apimachinery/pkg/runtime"
115115
alias: runtime
@@ -129,9 +129,9 @@ linters-settings:
129129
alias: logf
130130
- pkg: "github.com/google/gofuzz"
131131
alias: fuzz
132-
- pkg: "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/logs"
132+
- pkg: "sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/logs"
133133
alias: awslogs
134-
- pkg: "sigs.k8s.io/cluster-api-provider-aws/pkg/cloud/metrics"
134+
- pkg: "sigs.k8s.io/cluster-api-provider-aws/v2/pkg/cloud/metrics"
135135
alias: awsmetrics
136136
- pkg: "sigs.k8s.io/cluster-api/errors"
137137
alias: capierrors

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -239,23 +239,23 @@ generate-go-apis: ## Alias for .build/generate-go-apis
239239

240240
$(CONVERSION_GEN) \
241241
--input-dirs=./$(EXP_DIR)/api/v1beta1 \
242-
--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/api/v1beta1 \
242+
--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
243243
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
244244
--build-tag=ignore_autogenerated_conversions \
245245
--output-file-base=zz_generated.conversion $(GEN_OUTPUT_BASE) \
246246
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
247247

248248
$(CONVERSION_GEN) \
249249
--input-dirs=./bootstrap/eks/api/v1beta1 \
250-
--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/api/v1beta1 \
250+
--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
251251
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
252252
--build-tag=ignore_autogenerated_conversions \
253253
--output-file-base=zz_generated.conversion $(GEN_OUTPUT_BASE) \
254254
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
255255

256256
$(CONVERSION_GEN) \
257257
--input-dirs=./controlplane/eks/api/v1beta1 \
258-
--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/api/v1beta1 \
258+
--extra-peer-dirs=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta1 \
259259
--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
260260
--build-tag=ignore_autogenerated_conversions \
261261
--output-file-base=zz_generated.conversion $(GEN_OUTPUT_BASE) \

‎api/v1beta1/awscluster_conversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1beta1
1818

1919
import (
20-
infrav1 "sigs.k8s.io/cluster-api-provider-aws/api/v1beta2"
20+
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2121
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2222
"sigs.k8s.io/controller-runtime/pkg/conversion"
2323
)

‎api/v1beta1/awsclustertemplate_conversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1beta1
1818

1919
import (
20-
infrav1 "sigs.k8s.io/cluster-api-provider-aws/api/v1beta2"
20+
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2121
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2222
"sigs.k8s.io/controller-runtime/pkg/conversion"
2323
)

‎api/v1beta1/awsidentity_conversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1beta1
1818

1919
import (
20-
infrav1 "sigs.k8s.io/cluster-api-provider-aws/api/v1beta2"
20+
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2121
"sigs.k8s.io/controller-runtime/pkg/conversion"
2222
)
2323

‎api/v1beta1/awsmachine_conversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1beta1
1818

1919
import (
20-
infrav1 "sigs.k8s.io/cluster-api-provider-aws/api/v1beta2"
20+
infrav1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2121
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2222
"sigs.k8s.io/controller-runtime/pkg/conversion"
2323
)

‎api/v1beta1/conversion.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package v1beta1
1818

1919
import (
2020
"k8s.io/apimachinery/pkg/conversion"
21-
"sigs.k8s.io/cluster-api-provider-aws/api/v1beta2"
21+
"sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2222
)
2323

2424
func Convert_v1beta2_AWSClusterSpec_To_v1beta1_AWSClusterSpec(in *v1beta2.AWSClusterSpec, out *AWSClusterSpec, s conversion.Scope) error {

‎api/v1beta1/conversion_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
. "github.com/onsi/gomega"
2323

2424
runtime "k8s.io/apimachinery/pkg/runtime"
25-
v1beta2 "sigs.k8s.io/cluster-api-provider-aws/api/v1beta2"
25+
v1beta2 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2"
2626
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2727
)
2828

‎api/v1beta1/doc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616

1717
// +gencrdrefdocs:force
1818
// +groupName=infrastructure.cluster.x-k8s.io
19-
// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-aws/api/v1beta2
19+
// +k8s:conversion-gen=sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2
2020

2121
// Package v1beta1 contains the v1beta1 API implementation.
2222
package v1beta1

‎api/v1beta1/s3bucket.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"k8s.io/apimachinery/pkg/util/validation/field"
2424

25-
"sigs.k8s.io/cluster-api-provider-aws/feature"
25+
"sigs.k8s.io/cluster-api-provider-aws/v2/feature"
2626
)
2727

2828
// Validate validates S3Bucket fields.

0 commit comments

Comments
 (0)