Skip to content

Commit 9419de5

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #3891 from k8s-infra-cherrypick-robot/cherry-pick-3890-to-release-2.0
[release-2.0] drop /v2/ from api/tests/docs
2 parents b479477 + 1600147 commit 9419de5

19 files changed

+134
-134
lines changed

‎api/v1beta2/tags.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ const (
155155
// NameAWSProviderPrefix is the tag prefix we use to differentiate
156156
// cluster-api-provider-aws owned components from other tooling that
157157
// uses NameKubernetesClusterPrefix.
158-
NameAWSProviderPrefix = "sigs.k8s.io/cluster-api-provider-aws/v2/"
158+
NameAWSProviderPrefix = "sigs.k8s.io/cluster-api-provider-aws/"
159159

160160
// NameAWSProviderOwned is the tag name we use to differentiate
161161
// cluster-api-provider-aws owned components from other tooling that

‎controllers/awscluster_controller_test.go

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -320,12 +320,12 @@ func mockedDescribeInstanceCall(m *mocks.MockEC2APIMockRecorder) {
320320
m.DescribeInstances(gomock.Eq(&ec2.DescribeInstancesInput{
321321
Filters: []*ec2.Filter{
322322
{
323-
Name: aws.String("tag:sigs.k8s.io/cluster-api-provider-aws/v2/role"),
323+
Name: aws.String("tag:sigs.k8s.io/cluster-api-provider-aws/role"),
324324
Values: aws.StringSlice([]string{"bastion"}),
325325
},
326326
{
327327
Name: aws.String("tag-key"),
328-
Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"}),
328+
Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"}),
329329
},
330330
{
331331
Name: aws.String("instance-state-name"),
@@ -425,11 +425,11 @@ func mockedCreateVPCCalls(m *mocks.MockEC2APIMockRecorder) {
425425
Value: aws.String("1"),
426426
},
427427
{
428-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
428+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
429429
Value: aws.String("owned"),
430430
},
431431
{
432-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
432+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
433433
Value: aws.String("public"),
434434
},
435435
},
@@ -455,11 +455,11 @@ func mockedCreateVPCCalls(m *mocks.MockEC2APIMockRecorder) {
455455
Value: aws.String("1"),
456456
},
457457
{
458-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
458+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
459459
Value: aws.String("owned"),
460460
},
461461
{
462-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
462+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
463463
Value: aws.String("public"),
464464
},
465465
},
@@ -474,11 +474,11 @@ func mockedCreateVPCCalls(m *mocks.MockEC2APIMockRecorder) {
474474
MapPublicIpOnLaunch: aws.Bool(false),
475475
Tags: []*ec2.Tag{
476476
{
477-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
477+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
478478
Value: aws.String("owned"),
479479
},
480480
{
481-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
481+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
482482
Value: aws.String("public"),
483483
},
484484
{
@@ -519,11 +519,11 @@ func mockedCreateVPCCalls(m *mocks.MockEC2APIMockRecorder) {
519519
MapPublicIpOnLaunch: aws.Bool(false),
520520
Tags: []*ec2.Tag{
521521
{
522-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
522+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
523523
Value: aws.String("owned"),
524524
},
525525
{
526-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
526+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
527527
Value: aws.String("public"),
528528
},
529529
{
@@ -585,7 +585,7 @@ func mockedCreateVPCCalls(m *mocks.MockEC2APIMockRecorder) {
585585
CidrBlock: aws.String("10.0.0.0/8"),
586586
Tags: []*ec2.Tag{
587587
{
588-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
588+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
589589
Value: aws.String("common"),
590590
},
591591
{
@@ -632,7 +632,7 @@ func mockedDeleteVPCCalls(m *mocks.MockEC2APIMockRecorder) {
632632
},
633633
{
634634
Name: aws.String("tag-key"),
635-
Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"}),
635+
Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"}),
636636
},
637637
}})).Return(&ec2.DescribeRouteTablesOutput{
638638
RouteTables: []*ec2.RouteTable{
@@ -686,7 +686,7 @@ func mockedDeleteVPCCalls(m *mocks.MockEC2APIMockRecorder) {
686686
Filters: []*ec2.Filter{
687687
{
688688
Name: aws.String("tag-key"),
689-
Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"}),
689+
Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"}),
690690
}},
691691
})).Return(&ec2.DescribeAddressesOutput{
692692
Addresses: []*ec2.Address{
@@ -722,15 +722,15 @@ func mockedDeleteVPCCalls(m *mocks.MockEC2APIMockRecorder) {
722722
CidrBlock: aws.String("10.0.0.0/8"),
723723
Tags: []*ec2.Tag{
724724
{
725-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
725+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
726726
Value: aws.String("common"),
727727
},
728728
{
729729
Key: aws.String("Name"),
730730
Value: aws.String("test-cluster"),
731731
},
732732
{
733-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
733+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
734734
Value: aws.String("owned"),
735735
},
736736
},
@@ -754,7 +754,7 @@ func mockedCreateSGCalls(m *mocks.MockEC2APIMockRecorder) {
754754
},
755755
{
756756
Name: aws.String("tag-key"),
757-
Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"}),
757+
Values: aws.StringSlice([]string{"sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"}),
758758
},
759759
},
760760
})).Return(
@@ -779,11 +779,11 @@ func mockedCreateSGCalls(m *mocks.MockEC2APIMockRecorder) {
779779
Value: aws.String("test-cluster-bastion"),
780780
},
781781
{
782-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
782+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
783783
Value: aws.String("owned"),
784784
},
785785
{
786-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
786+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
787787
Value: aws.String("bastion"),
788788
},
789789
},
@@ -804,11 +804,11 @@ func mockedCreateSGCalls(m *mocks.MockEC2APIMockRecorder) {
804804
Value: aws.String("test-cluster-apiserver-lb"),
805805
},
806806
{
807-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
807+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
808808
Value: aws.String("owned"),
809809
},
810810
{
811-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
811+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
812812
Value: aws.String("apiserver-lb"),
813813
},
814814
},
@@ -833,11 +833,11 @@ func mockedCreateSGCalls(m *mocks.MockEC2APIMockRecorder) {
833833
Value: aws.String("owned"),
834834
},
835835
{
836-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
836+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
837837
Value: aws.String("owned"),
838838
},
839839
{
840-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
840+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
841841
Value: aws.String("lb"),
842842
},
843843
},
@@ -858,11 +858,11 @@ func mockedCreateSGCalls(m *mocks.MockEC2APIMockRecorder) {
858858
Value: aws.String("test-cluster-controlplane"),
859859
},
860860
{
861-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
861+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
862862
Value: aws.String("owned"),
863863
},
864864
{
865-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
865+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
866866
Value: aws.String("controlplane"),
867867
},
868868
},
@@ -883,11 +883,11 @@ func mockedCreateSGCalls(m *mocks.MockEC2APIMockRecorder) {
883883
Value: aws.String("test-cluster-node"),
884884
},
885885
{
886-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
886+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
887887
Value: aws.String("owned"),
888888
},
889889
{
890-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
890+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
891891
Value: aws.String("node"),
892892
},
893893
},

‎controllers/awsmachine_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ func mockedCreateInstanceCalls(m *mocks.MockEC2APIMockRecorder) {
496496
Values: aws.StringSlice([]string{""}),
497497
},
498498
{
499-
Name: aws.String("tag:sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
499+
Name: aws.String("tag:sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
500500
Values: aws.StringSlice([]string{"owned"}),
501501
},
502502
{

‎controllers/helpers_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ var (
6666
Value: lbName,
6767
},
6868
{
69-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
69+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
7070
Value: aws.String("owned"),
7171
},
7272
{
73-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
73+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
7474
Value: aws.String("apiserver"),
7575
},
7676
}
@@ -179,7 +179,7 @@ func mockedCreateLBCalls(t *testing.T, m *mocks.MockELBAPIMockRecorder) {
179179
LoadBalancerNames: aws.StringSlice([]string{""}),
180180
Tags: []*elb.TagKeyOnly{
181181
{
182-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster-apiserver"),
182+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster-apiserver"),
183183
},
184184
},
185185
})).MaxTimes(1)

‎docs/book/src/topics/accessing-ec2-instances.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ Similarly, to obtain the list of private IP addresses of the cluster nodes, use
147147
for type in control-plane node
148148
do
149149
aws ec2 describe-instances \
150-
--filter="Name=tag:sigs.k8s.io/cluster-api-provider-aws/v2/role,\
150+
--filter="Name=tag:sigs.k8s.io/cluster-api-provider-aws/role,\
151151
Values=${type}" \
152152
| jq '.Reservations[].Instances[].PrivateIpAddress' -r
153153
done
@@ -161,7 +161,7 @@ Finally, to obtain AWS instance IDs for cluster nodes, you can use this AWS CLI
161161
for type in control-plane node
162162
do
163163
aws ec2 describe-instances \
164-
--filter="Name=tag:sigs.k8s.io/cluster-api-provider-aws/v2/role,\
164+
--filter="Name=tag:sigs.k8s.io/cluster-api-provider-aws/role,\
165165
Values=${type}" \
166166
| jq '.Reservations[].Instances[].InstanceId' -r
167167
done

‎docs/book/src/topics/using-clusterawsadm-to-fulfill-prerequisites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ If you want to save the private key directly into AWS Systems Manager Parameter
146146
Store with KMS encryption for security, you can use the following command:
147147
148148
```bash
149-
aws ssm put-parameter --name "/sigs.k8s.io/cluster-api-provider-aws/v2/ssh-key" \
149+
aws ssm put-parameter --name "/sigs.k8s.io/cluster-api-provider-aws/ssh-key" \
150150
--type SecureString \
151151
--value "$(aws ec2 create-key-pair --key-name default --output json | jq .KeyMaterial -r)"
152152
```

‎pkg/cloud/services/autoscaling/autoscalinggroup_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,14 +460,14 @@ func TestServiceCreateASG(t *testing.T) {
460460
Value: aws.String("owned"),
461461
},
462462
{
463-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test"),
463+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test"),
464464
PropagateAtLaunch: aws.Bool(false),
465465
ResourceId: aws.String("create-asg-success"),
466466
ResourceType: aws.String("auto-scaling-group"),
467467
Value: aws.String("owned"),
468468
},
469469
{
470-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
470+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
471471
PropagateAtLaunch: aws.Bool(false),
472472
ResourceId: aws.String("create-asg-success"),
473473
ResourceType: aws.String("auto-scaling-group"),

‎pkg/cloud/services/ec2/instances_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2095,11 +2095,11 @@ func TestCreateInstance(t *testing.T) {
20952095
Value: aws.String("owned"),
20962096
},
20972097
{
2098-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test1"),
2098+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test1"),
20992099
Value: aws.String("owned"),
21002100
},
21012101
{
2102-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
2102+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
21032103
Value: aws.String("node"),
21042104
},
21052105
},
@@ -2232,11 +2232,11 @@ func TestCreateInstance(t *testing.T) {
22322232
Value: aws.String("owned"),
22332233
},
22342234
{
2235-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test1"),
2235+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test1"),
22362236
Value: aws.String("owned"),
22372237
},
22382238
{
2239-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
2239+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
22402240
Value: aws.String("node"),
22412241
},
22422242
},

‎pkg/cloud/services/network/egress_only_gateways_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ func TestReconcileEgressOnlyInternetGateways(t *testing.T) {
9898
Value: aws.String("owned"),
9999
},
100100
{
101-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
101+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
102102
Value: aws.String("common"),
103103
},
104104
{

‎pkg/cloud/services/network/gateways_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func TestReconcileInternetGateways(t *testing.T) {
9696
Value: aws.String("owned"),
9797
},
9898
{
99-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
99+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
100100
Value: aws.String("common"),
101101
},
102102
{

‎pkg/cloud/services/network/natgateways_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ func TestReconcileNatGateways(t *testing.T) {
123123
Value: aws.String("test-cluster-eip-apiserver"),
124124
},
125125
{
126-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
126+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
127127
Value: aws.String("owned"),
128128
},
129129
{
130-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
130+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
131131
Value: aws.String("apiserver"),
132132
},
133133
},
@@ -149,11 +149,11 @@ func TestReconcileNatGateways(t *testing.T) {
149149
Value: aws.String("test-cluster-nat"),
150150
},
151151
{
152-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
152+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
153153
Value: aws.String("owned"),
154154
},
155155
{
156-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
156+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
157157
Value: aws.String("common"),
158158
},
159159
},
@@ -230,11 +230,11 @@ func TestReconcileNatGateways(t *testing.T) {
230230
Value: aws.String("test-cluster-eip-apiserver"),
231231
},
232232
{
233-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
233+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
234234
Value: aws.String("owned"),
235235
},
236236
{
237-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
237+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
238238
Value: aws.String("apiserver"),
239239
},
240240
},
@@ -256,11 +256,11 @@ func TestReconcileNatGateways(t *testing.T) {
256256
Value: aws.String("test-cluster-nat"),
257257
},
258258
{
259-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
259+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
260260
Value: aws.String("owned"),
261261
},
262262
{
263-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
263+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
264264
Value: aws.String("common"),
265265
},
266266
},
@@ -318,15 +318,15 @@ func TestReconcileNatGateways(t *testing.T) {
318318
SubnetId: aws.String("subnet-1"),
319319
Tags: []*ec2.Tag{
320320
{
321-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/role"),
321+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/role"),
322322
Value: aws.String("common"),
323323
},
324324
{
325325
Key: aws.String("Name"),
326326
Value: aws.String("test-cluster-nat"),
327327
},
328328
{
329-
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/v2/cluster/test-cluster"),
329+
Key: aws.String("sigs.k8s.io/cluster-api-provider-aws/cluster/test-cluster"),
330330
Value: aws.String("owned"),
331331
},
332332
},

0 commit comments

Comments
 (0)