Skip to content

Commit 34548c5

Browse files
snehala27snehala27
authored
Merge branch 'kubernetes-sigs:main' into main
2 parents c67331d + 85759ce commit 34548c5

File tree

612 files changed

+98410
-20743
lines changed

Some content is hidden

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

612 files changed

+98410
-20743
lines changed

‎.github/ISSUE_TEMPLATE/maintainer_change.yml‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
name: Add or remove maintainer
2+
description: To be used when making changes to project maintainers.
3+
labels: ["kind/support"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Use this form to make changes to the maintainers of CAPA
9+
- type: input
10+
id: github_handle
11+
attributes:
12+
label: GitHub handle
13+
description: The GitHub handle of the maintainer that changes will be made to.
14+
validations:
15+
required: true
16+
- type: dropdown
17+
id: action
18+
attributes:
19+
label: Action
20+
description: What action is being performed to the maintainers
21+
options:
22+
- Add
23+
- Remove
24+
validations:
25+
required: true
26+
- type: input
27+
id: merge_date
28+
attributes:
29+
label: Merge date
30+
description: Enter the date when the changes can merge. The date should be 7 days or after the next CAPA office hours (whichever is longer)
31+
validations:
32+
required: true
33+
- type: textarea
34+
id: reason
35+
attributes:
36+
label: Reason for change
37+
description: What is the reason this change is being made
38+
validations:
39+
required: true
40+
- type: textarea
41+
id: tasks
42+
attributes:
43+
label: 🖱️Tasks
44+
value: |
45+
```[tasklist]
46+
## Tasks to be done
47+
- [ ] Update **cluster-api-aws-maintainers** section in [OWNER_ALIASES](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/OWNERS_ALIASES) in CAPA repo
48+
- [ ] Create a PR with the change and add `/hold`
49+
- [ ] Announce the change in the CAPA slack channel
50+
- [ ] Add PSA in the notes doc for the next CAPA office hours
51+
- [ ] After the lazy consensus review period remove the hold
52+
- [ ] Update **cluster-api-provider-aws-maintainers** team in [this file](https://github.com/kubernetes/org/blob/main/config/kubernetes-sigs/sig-cluster-lifecycle/teams.yaml)
53+
- [ ] Update **approvers** for CAPA jobs [here](https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-sigs/cluster-api-provider-aws/OWNERS)
54+
- [ ] Update **approvers** from CAPA image promotion [here](https://github.com/kubernetes/k8s.io/blob/main/registry.k8s.io/images/k8s-staging-cluster-api-aws/OWNERS)
55+
- [ ] Update **[email protected]** [here](https://github.com/kubernetes/k8s.io/blob/main/groups/sig-cluster-lifecycle/groups.yaml)
56+
- [ ] Update **[email protected]** [here](https://github.com/kubernetes/k8s.io/blob/main/groups/sig-cluster-lifecycle/groups.yaml)
57+
```

‎.github/ISSUE_TEMPLATE/reviewer_change.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Add or remove reviewer
2+
description: To be used when making changes to project reviewers. See [contributing guide(https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/CONTRIBUTING.md)] for details of the projects ladder.
3+
labels: ["kind/support"]
4+
body:
5+
- type: markdown
6+
attributes:
7+
value: |
8+
Use this form to make changes to the reviewers of CAPA
9+
- type: input
10+
id: github_handle
11+
attributes:
12+
label: GitHub handle
13+
description: The GitHub handle of the reviewer that changes will be made to.
14+
validations:
15+
required: true
16+
- type: dropdown
17+
id: action
18+
attributes:
19+
label: Action
20+
description: What action is being performed to the reviewers
21+
options:
22+
- Add
23+
- Remove
24+
validations:
25+
required: true
26+
- type: input
27+
id: merge_date
28+
attributes:
29+
label: Merge date
30+
description: Enter the date when the changes can merge. The date should be 7 days or after the next CAPA office hours (whichever is longer)
31+
validations:
32+
required: true
33+
- type: textarea
34+
id: reason
35+
attributes:
36+
label: Reason for change
37+
description: What is the reason this change is being made
38+
validations:
39+
required: true
40+
- type: textarea
41+
id: tasks
42+
attributes:
43+
label: 🖱️Tasks
44+
value: |
45+
```[tasklist]
46+
## Tasks to be done
47+
- [ ] Update **cluster-api-aws-reviewers** section in [OWNER_ALIASES](https://github.com/kubernetes-sigs/cluster-api-provider-aws/blob/main/OWNERS_ALIASES) in CAPA repo
48+
- [ ] Create a PR with the change and add `/hold`
49+
- [ ] Announce the change in the CAPA slack channel
50+
- [ ] Add PSA in the notes doc for the next CAPA office hours
51+
- [ ] After the lazy consensus review period remove the hold
52+
- [ ] Update **reviewers** for CAPA jobs [here](https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-sigs/cluster-api-provider-aws/OWNERS)
53+
```

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,15 @@ Fixes #
3232

3333
- [ ] squashed commits
3434
- [ ] includes documentation
35+
- [ ] includes [emojis](https://github.com/kubernetes-sigs/kubebuilder-release-tools?tab=readme-ov-file#kubebuilder-project-versioning)
3536
- [ ] adds unit tests
3637
- [ ] adds or updates e2e tests
38+
39+
**Release note**:
40+
<!-- Write your release note:
41+
1. Enter your extended release note in the below block. If the PR requires additional action from users switching to the new release, include the string "action required".
42+
2. If no release note is required, just write "NONE".
43+
-->
44+
```release-note
45+
46+
```

‎.github/dependabot.yml‎

Lines changed: 100 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,121 @@
11
version: 2
22
updates:
3+
# GitHub Actions
4+
- package-ecosystem: "github-actions"
5+
directory: "/"
6+
schedule:
7+
interval: "weekly"
8+
commit-message:
9+
prefix: ":seedling:"
10+
labels:
11+
- "kind/cleanup"
12+
- "area/ci"
13+
- "ok-to-test"
14+
- "release-note-none"
15+
16+
# Main Go module
317
- package-ecosystem: "gomod"
418
directory: "/"
519
schedule:
6-
interval: "daily"
20+
interval: "weekly"
21+
day: "monday"
22+
commit-message:
23+
prefix: ":seedling:"
24+
labels:
25+
- "kind/cleanup"
26+
- "area/dependency"
27+
- "ok-to-test"
28+
- "release-note-none"
29+
groups:
30+
dependencies:
31+
patterns:
32+
- "*"
33+
ignore:
34+
# Ignore Cluster-API as its upgraded manually.
35+
- dependency-name: "sigs.k8s.io/cluster-api*"
36+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
37+
# Ignore controller-runtime as its upgraded manually.
38+
- dependency-name: "sigs.k8s.io/controller-runtime"
39+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
40+
# Ignore k8s and its transitives modules as they are upgraded manually together with controller-runtime.
41+
- dependency-name: "k8s.io/*"
42+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
43+
- dependency-name: "go.etcd.io/*"
44+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
45+
- dependency-name: "google.golang.org/grpc"
46+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
47+
# Bumping the kustomize API independently can break compatibility with client-go as they share k8s.io/kube-openapi as a dependency.
48+
- dependency-name: "sigs.k8s.io/kustomize/api"
49+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
50+
# Ignore openshift ROSA pkgs as its upgraded manually.
51+
- dependency-name: "github.com/openshift*"
52+
update-types: [ "version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch" ]
753

854
- package-ecosystem: "docker"
955
directory: "/"
1056
schedule:
1157
interval: "weekly"
58+
day: "monday"
59+
commit-message:
60+
prefix: ":seedling:"
61+
labels:
62+
- "kind/cleanup"
63+
- "area/dependency"
64+
- "ok-to-test"
65+
- "release-note-none"
66+
groups:
67+
dependencies:
68+
patterns:
69+
- "*"
1270

1371
# Enable version updates for Go tools
1472
- package-ecosystem: "gomod"
1573
directory: "/hack/tools"
1674
schedule:
1775
interval: "weekly"
76+
day: "wednesday"
77+
commit-message:
78+
prefix: ":seedling:"
79+
labels:
80+
- "kind/cleanup"
81+
- "area/dependency"
82+
- "ok-to-test"
83+
- "release-note-none"
84+
groups:
85+
dependencies:
86+
patterns:
87+
- "*"
88+
ignore:
89+
# Ignore Cluster-API as its upgraded manually.
90+
- dependency-name: "sigs.k8s.io/cluster-api*"
91+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
92+
# Ignore controller-runtime as its upgraded manually.
93+
- dependency-name: "sigs.k8s.io/controller-runtime"
94+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
95+
# Ignore k8s and its transitives modules as they are upgraded manually together with controller-runtime.
96+
- dependency-name: "k8s.io/*"
97+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
98+
- dependency-name: "go.etcd.io/*"
99+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
100+
- dependency-name: "google.golang.org/grpc"
101+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
102+
# Bumping the kustomize API independently can break compatibility with client-go as they share k8s.io/kube-openapi as a dependency.
103+
- dependency-name: "sigs.k8s.io/kustomize/api"
104+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
18105

19106
- package-ecosystem: "docker"
20107
directory: "/hack/tools"
21108
schedule:
22109
interval: "weekly"
23-
24-
- package-ecosystem: "github-actions"
25-
directory: "/"
26-
schedule:
27-
interval: "daily"
110+
day: "wednesday"
111+
commit-message:
112+
prefix: ":seedling:"
113+
labels:
114+
- "kind/cleanup"
115+
- "area/dependency"
116+
- "ok-to-test"
117+
- "release-note-none"
118+
groups:
119+
dependencies:
120+
patterns:
121+
- "*"

‎.github/workflows/build-ami-varsfile.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: build-and-publish-ami-with-vars
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
image_builder_version:
7+
description: "Image builder version"
8+
required: true
9+
default: 'v0.1.38'
10+
target:
11+
description: "target os"
12+
required: true
13+
type: choice
14+
options:
15+
- ubuntu-2204
16+
- ubuntu-2404
17+
- flatcar
18+
packer_vars:
19+
description: "Packer vars (json)"
20+
type: string
21+
22+
permissions:
23+
id-token: write
24+
contents: read
25+
26+
jobs:
27+
buildandpublish:
28+
name: Build and publish CAPA AMIs
29+
runs-on: ubuntu-latest
30+
steps:
31+
- name: checkout code
32+
uses: actions/checkout@v4
33+
with:
34+
repository: kubernetes-sigs/image-builder
35+
ref: ${{ inputs.image_builder_version }}
36+
fetch-depth: 0
37+
- name: Create packer vars file
38+
if: inputs.packer_vars != ''
39+
env:
40+
PACKER_VARS: ${{ inputs.packer_vars }}
41+
run: |
42+
echo "$PACKER_VARS" | jq -r > ./images/capi/vars.json
43+
cat ./images/capi/vars.json
44+
- name: Configure AWS credentials
45+
uses: aws-actions/configure-aws-credentials@v4
46+
with:
47+
aws-region: us-east-2
48+
role-to-assume: arn:aws:iam::819546954734:role/gh-image-builder
49+
- name: Install deps
50+
run: make deps-ami
51+
working-directory: ./images/capi
52+
- name: Install Amazon EBS Plugin
53+
working-directory: ./images/capi
54+
run: ./.local/bin/packer plugins install github.com/hashicorp/amazon
55+
- name: Build AMI with vars
56+
if: inputs.packer_vars != ''
57+
working-directory: ./images/capi
58+
run: PACKER_VAR_FILES=vars.json make build-ami-${{ inputs.target }}
59+
- name: Build AMI without vars
60+
if: inputs.packer_vars == ''
61+
working-directory: ./images/capi
62+
run: make build-ami-${{ inputs.target }}
63+

0 commit comments

Comments
 (0)