Skip to content

Commit c9d5874

Browse files
richardcaserichardcase
committed
Merge from main
Signed-off-by: Richard Case <[email protected]>
2 parents 5573c0f + a0439eb commit c9d5874

File tree

552 files changed

+17191
-11082
lines changed

Some content is hidden

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

552 files changed

+17191
-11082
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
language: [ 'go' ]
2222
steps:
2323
- name: Checkout repository
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v3.1.0
2525

2626
# Initializes the CodeQL tools for scanning.
2727
- name: Initialize CodeQL

‎.github/workflows/dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
go-version: '1.18'
2525
id: go
2626
- name: Check out code into the Go module directory
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v3.1.0
2828
- uses: actions/cache@v3
2929
name: Restore go cache
3030
with:

‎.github/workflows/md-link-checker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
check:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/checkout@v2
11+
- uses: actions/checkout@v3.1.0
1212
- uses: artyom/mdlinks@v0
1313
with:
1414
dir: 'docs/book'

‎.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

‎CONTRIBUTING.md

Lines changed: 52 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,64 @@ Kubernetes projects require that you sign a Contributor License Agreement (CLA)
1313
> See the [developer guide](https://cluster-api-aws.sigs.k8s.io/development/development.html) on how to setup your development environment.
1414
5. Submit a pull request.
1515

16-
### Becoming a reviewer
16+
### Contributer Ladder
1717

18-
If you would like to become a reviewer, then please ask one of the maintainers.
19-
There's no hard and defined limit as to who can become a reviewer, but a good
20-
heuristic is 5 or more contributions. A reviewer can get PRs automatically assigned
21-
for review, and can `/lgtm` PRs.
18+
We broadly follow the requirements from the [Kubernetes Community Membership](https://github.com/kubernetes/community/blob/master/community-membership.md).
2219

23-
To become a reviewer, ensure you are a member of the kubernetes-sigs Github organisation
24-
following https://github.com/kubernetes/org/issues/new/choose .
20+
> When making changes to **OWNER_ALIASES** please check that the **sig-cluster-lifecycle-leads**, **cluster-api-admins** and **cluster-api-maintainers** are correct.
2521
26-
### Steps needed to become a maintainer
27-
If you have made significant contributions to Cluster API
28-
Provider AWS, a maintainer may nominate you to become a
29-
maintainer, first by opening a PR to add you to the OWNERS_ALIASES file of the repository.
22+
#### Becoming a reviewer
3023

31-
Maintainers are able to approve PRs, as well as participate
32-
in release processes.
24+
If you would like to become a reviewer, then please ask one of the current maintainers.
3325

34-
Maintainers require membership of the Kubernetes Github organisation via
26+
We generally try to follow the [requirements for a reviewer](https://github.com/kubernetes/community/blob/master/community-membership.md#reviewer) from upstream Kubernetes. But if you feel that you don't full meet the requirements then reach out to us, they are not set in stone.
27+
28+
A reviewer can get PRs automatically assigned for review, and can `/lgtm` PRs.
29+
30+
To become a reviewer, ensure you are a member of the **kubernetes-sigs** Github organisation
31+
following https://github.com/kubernetes/org/issues/new/choose.
32+
33+
The steps to add someone as a reviewer are:
34+
35+
- Add the GitHub alias to the **cluster-api-aws-reviewers** section of [OWNERS_ALIASES](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/OWNERS_ALIASES)
36+
- Create a PR with the change that is held (i.e. by using `/hold`)
37+
- Announce the change within the CAPA slack channel and as a PSA in the next CAPA office hours
38+
- After 7 days of lazy consensus or after the next CAPA office hours (whichever is longer) the PR can be merged
39+
40+
#### Becoming a maintainer
41+
42+
If you have made significant contributions to Cluster API Provider AWS, a maintainer may nominate you to become a maintainer for the project.
43+
44+
We generally follow the [requirements for a approver](https://github.com/kubernetes/community/blob/master/community-membership.md#approver) from upstream Kubernetes. However, if you don't fully meet the requirements then a quorum of maintainers may still propose you if they feel you will make significant contributions.
45+
46+
Maintainers are able to approve PRs, as well as participate in release processes and have write access to the repo. **As a maintainer you will be expected to run the office hours, especially if no else wants to**.
47+
48+
Maintainers require membership of the **Kubernetes** Github organisation via
3549
https://github.com/kubernetes/org/issues/new/choose
3650

37-
The complete list of tasks required to set up maintainer status
38-
follow:
51+
The steps to add someone as a reviewer are:
52+
53+
- Add the GitHub alias to the **cluster-api-aws-maintainers** and remove them from **cluster-api-aws-reviewers** sections of [OWNERS_ALIASES](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/OWNERS_ALIASES)
54+
- Create a PR with the change that is held (i.e. by using `/hold`)
55+
- Announce the change within the CAPA slack channel and as a PSA in the next CAPA office hours
56+
- After 7 days of lazy consensus or after the next CAPA office hours (whichever is longer) the PR can be merged
57+
- Open PR to add Github username to **cluster-api-provider-aws-maintainers**
58+
to https://github.com/kubernetes/org/blob/main/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml
59+
- Open PR to add Github username to https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-sigs/cluster-api-provider-aws/OWNERS
60+
- Open PR to add Github username to https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/images/k8s-staging-cluster-api-aws/OWNERS
61+
- Open PR to add Google ID to the [email protected] Google group in https://github.com/kubernetes/k8s.io/blob/main/groups/groups.yaml
62+
63+
#### Becoming a admin
64+
65+
After a period of time one of the existing CAPA or CAPI admins may propose you to become an admin of the CAPA project.
66+
67+
Admins have GitHub **admin** access to perform tasks on the repo.
68+
69+
The steps to add someone as an admin are:
3970

40-
* Open PR to add Github username to the OWNERS_ALIASES file under cluster-api-aws-maintainers
41-
* Open PR to add Github username to cluster-api-provider-aws-admins and cluster-api-provider-aws-maintainers
71+
- Add the GitHub alias to the **cluster-api-aws-admins** section of [OWNERS_ALIASES](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/OWNERS_ALIASES)
72+
- Create a PR with the change that is held (i.e. by using `/hold`)
73+
- Announce the change within the CAPA slack channel and as a PSA in the next CAPA office hours
74+
- After 7 days of lazy consensus or after the next CAPA office hours (whichever is longer) the PR can be merged
75+
- Open PR to add Github username to **cluster-api-provider-aws-admins**
4276
to https://github.com/kubernetes/org/blob/main/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml
43-
* Open PR to add Github username to https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-sigs/cluster-api-provider-aws/OWNERS
44-
* Open PR to add Github username to https://github.com/kubernetes/k8s.io/blob/main/k8s.gcr.io/images/k8s-staging-cluster-api-aws/OWNERS
45-
* Open PR to add Google ID to the [email protected] Google group in https://github.com/kubernetes/k8s.io/blob/main/groups/groups.yaml

‎Makefile

Lines changed: 5 additions & 4 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) \
@@ -368,7 +368,8 @@ $(ARTIFACTS):
368368

369369
.PHONY: generate-test-flavors
370370
generate-test-flavors: $(KUSTOMIZE) ## Generate test template flavors
371-
./hack/gen-test-flavors.sh
371+
./hack/gen-test-flavors.sh withoutclusterclass
372+
./hack/gen-test-flavors.sh withclusterclass
372373

373374
.PHONY: e2e-image
374375
e2e-image: docker-pull-prerequisites $(TOOLS_BIN_DIR)/start.sh $(TOOLS_BIN_DIR)/restart.sh ## Build an e2e test image

‎README.md

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,11 @@ cluster on AWS.
6262
This provider's versions are compatible with the following versions of Cluster API
6363
and support all Kubernetes versions that is supported by its compatible Cluster API version:
6464

65-
| | Cluster API v1alpha3 (v0.3) | Cluster API v1alpha4 (v0.4) | Cluster API v1beta1 (v1.x) |
66-
| --------------------------- | :-------------------------: | :-------------------------: | :-------------------------: |
67-
| CAPA v1alpha3 `(v0.6)` | ✓ | ☓ | ☓ |
68-
| CAPA v1alpha4 `(v0.7)` | ☓ | ✓ | ☓ |
69-
| CAPA v1beta1 `(v1.x, main)`| ☓ | ☓ | ✓ |
70-
65+
| | Cluster API v1alpha4 (v0.4) | Cluster API v1beta1 (v1.x) |
66+
| --------------------------- | :-------------------------: | :-------------------------: |
67+
| CAPA v1alpha4 `(v0.7)` | ✓ | ☓ |
68+
| CAPA v1beta1 `(v1.x)` | ☓ | ✓ |
69+
| CAPA v1beta2 `(v2.x, main)`| ☓ | ✓ |
7170

7271
(See [Kubernetes support matrix][cluster-api-supported-v] of Cluster API versions).
7372

@@ -86,6 +85,7 @@ See [amis] for the list of most recently published AMIs.
8685
`clusterawsadm` binaries are released with each release, can be found under [assets](https://github.com/kubernetes-sigs/cluster-api-provider-aws/releases/latest) section.
8786

8887
------
88+
8989
## Getting involved and contributing
9090

9191
Are you interested in contributing to cluster-api-provider-aws? We, the
@@ -113,16 +113,13 @@ This repository uses the Kubernetes bots. See a full list of the commands [here
113113

114114
If you want to just build the CAPA containers locally, run
115115

116-
```
117-
REGISTRY=docker.io/my-reg make docker-build
116+
```shell
117+
REGISTRY=docker.io/my-reg make docker-build
118118
```
119119

120120
### Tilt-based development environment
121121

122-
See [development][development] section for details
123-
124-
[development]: https://cluster-api-aws.sigs.k8s.io/development/development.html
125-
122+
See [development][development] section for details.
126123

127124
### Implementer office hours
128125

@@ -172,16 +169,15 @@ and/or other countries."
172169

173170
Thank you to all contributors and a special thanks to our current maintainers & reviewers:
174171

175-
| Maintainers | Reviewers |
176-
| ------------------------------------------------- | ---------------------------------------------- |
177-
| [@richardcase](https://github.com/richardcase) | [@Ankitasw](https://github.com/Ankitasw) |
178-
| [@sedefsavas](https://github.com/sedefsavas) | [@dthorsen](https://github.com/dthorsen) |
179-
| | [@dlipovetsky](https://github.com/dlipovetsky) |
180-
| | [@pydctw](https://github.com/pydctw) |
181-
| | [@shivi28](https://github.com/shivi28) |
182-
| | [@Skarlso](https://github.com/Skarlso) |
172+
| Maintainers | Reviewers |
173+
| -------------------------------------------------------------------- | -------------------------------------------------------------------- |
174+
| [@richardcase](https://github.com/richardcase) (from 2020-12-04) | [@shivi28](https://github.com/shivi28) (from 2021-08-27) |
175+
| [@sedefsavas](https://github.com/sedefsavas) (from 2021-03-21) | [@dthorsen](https://github.com/dthorsen) (from 2020-12-04) |
176+
| [@Skarlso](https://github.com/Skarlso) (from 2022-10-19) | [@pydctw](https://github.com/pydctw) (from 2021-12-09) |
177+
| [@Ankitasw](https://github.com/Ankitasw) (from 2022-10-19) | [@AverageMarcus](https://github.com/AverageMarcus) (from 2022-10-19) |
178+
| [@dlipovetsky](https://github.com/dlipovetsky) (from 2021-10-31) | |
183179

184-
and the previous/emeritus maintainers & reviwers:
180+
and the previous/emeritus maintainers & reviewers:
185181

186182
| Emeritus Maintainers | Emeritus Reviewers |
187183
| ---------------------------------------------------- | ------------------------------------------------------ |
@@ -200,7 +196,6 @@ All the CAPA contributors:
200196
</a>
201197
</p>
202198

203-
204199
<!-- References -->
205200
[slack]: https://kubernetes.slack.com/messages/CD6U2V71N
206201
[good_first_issue]: https://github.com/kubernetes-sigs/cluster-api-provider-aws/issues?q=is%3Aissue+is%3Aopen+sort%3Aupdated-desc+label%3A%22good+first+issue%22
@@ -210,9 +205,8 @@ All the CAPA contributors:
210205
[cluster_api]: https://github.com/kubernetes-sigs/cluster-api
211206
[kops]: https://github.com/kubernetes/kops
212207
[kubicorn]: http://kubicorn.io/
213-
[tilt]: https://tilt.dev
214-
[cluster_api_tilt]: https://master.cluster-api.sigs.k8s.io/developer/tilt.html
215208
[amis]: https://cluster-api-aws.sigs.k8s.io/topics/images/amis.html
216209
[published_amis]: https://cluster-api-aws.sigs.k8s.io/topics/images/built-amis.html
217210
[eks_support]: https://cluster-api-aws.sigs.k8s.io/topics/eks/index.html
218211
[cluster-api-supported-v]: https://cluster-api.sigs.k8s.io/reference/versions.html
212+
[development]: https://cluster-api-aws.sigs.k8s.io/development/development.html

‎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

0 commit comments

Comments
 (0)