Skip to content

Commit

Permalink
Merge branch 'kubernetes-sigs:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
snehala27 authored Nov 7, 2024
2 parents c67331d + 85759ce commit 34548c5
Showing 612 changed files with 98,410 additions and 20,743 deletions.
57 changes: 57 additions & 0 deletions .github/ISSUE_TEMPLATE/maintainer_change.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
name: Add or remove maintainer
description: To be used when making changes to project maintainers.
labels: ["kind/support"]
body:
- type: markdown
attributes:
value: |
Use this form to make changes to the maintainers of CAPA
- type: input
id: github_handle
attributes:
label: GitHub handle
description: The GitHub handle of the maintainer that changes will be made to.
validations:
required: true
- type: dropdown
id: action
attributes:
label: Action
description: What action is being performed to the maintainers
options:
- Add
- Remove
validations:
required: true
- type: input
id: merge_date
attributes:
label: Merge date
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)
validations:
required: true
- type: textarea
id: reason
attributes:
label: Reason for change
description: What is the reason this change is being made
validations:
required: true
- type: textarea
id: tasks
attributes:
label: 🖱️Tasks
value: |
```[tasklist]
## Tasks to be done
- [ ] 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
- [ ] Create a PR with the change and add `/hold`
- [ ] Announce the change in the CAPA slack channel
- [ ] Add PSA in the notes doc for the next CAPA office hours
- [ ] After the lazy consensus review period remove the hold
- [ ] 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)
- [ ] Update **approvers** for CAPA jobs [here](https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-sigs/cluster-api-provider-aws/OWNERS)
- [ ] 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)
- [ ] Update **[email protected]** [here](https://github.com/kubernetes/k8s.io/blob/main/groups/sig-cluster-lifecycle/groups.yaml)
- [ ] Update **[email protected]** [here](https://github.com/kubernetes/k8s.io/blob/main/groups/sig-cluster-lifecycle/groups.yaml)
```
53 changes: 53 additions & 0 deletions .github/ISSUE_TEMPLATE/reviewer_change.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: Add or remove reviewer
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.
labels: ["kind/support"]
body:
- type: markdown
attributes:
value: |
Use this form to make changes to the reviewers of CAPA
- type: input
id: github_handle
attributes:
label: GitHub handle
description: The GitHub handle of the reviewer that changes will be made to.
validations:
required: true
- type: dropdown
id: action
attributes:
label: Action
description: What action is being performed to the reviewers
options:
- Add
- Remove
validations:
required: true
- type: input
id: merge_date
attributes:
label: Merge date
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)
validations:
required: true
- type: textarea
id: reason
attributes:
label: Reason for change
description: What is the reason this change is being made
validations:
required: true
- type: textarea
id: tasks
attributes:
label: 🖱️Tasks
value: |
```[tasklist]
## Tasks to be done
- [ ] 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
- [ ] Create a PR with the change and add `/hold`
- [ ] Announce the change in the CAPA slack channel
- [ ] Add PSA in the notes doc for the next CAPA office hours
- [ ] After the lazy consensus review period remove the hold
- [ ] Update **reviewers** for CAPA jobs [here](https://github.com/kubernetes/test-infra/blob/master/config/jobs/kubernetes-sigs/cluster-api-provider-aws/OWNERS)
```
10 changes: 10 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -32,5 +32,15 @@ Fixes #

- [ ] squashed commits
- [ ] includes documentation
- [ ] includes [emojis](https://github.com/kubernetes-sigs/kubebuilder-release-tools?tab=readme-ov-file#kubebuilder-project-versioning)
- [ ] adds unit tests
- [ ] adds or updates e2e tests

**Release note**:
<!-- Write your release note:
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".
2. If no release note is required, just write "NONE".
-->
```release-note
```
106 changes: 100 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,27 +1,121 @@
version: 2
updates:
# GitHub Actions
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
commit-message:
prefix: ":seedling:"
labels:
- "kind/cleanup"
- "area/ci"
- "ok-to-test"
- "release-note-none"

# Main Go module
- package-ecosystem: "gomod"
directory: "/"
schedule:
interval: "daily"
interval: "weekly"
day: "monday"
commit-message:
prefix: ":seedling:"
labels:
- "kind/cleanup"
- "area/dependency"
- "ok-to-test"
- "release-note-none"
groups:
dependencies:
patterns:
- "*"
ignore:
# Ignore Cluster-API as its upgraded manually.
- dependency-name: "sigs.k8s.io/cluster-api*"
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
# Ignore controller-runtime as its upgraded manually.
- dependency-name: "sigs.k8s.io/controller-runtime"
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
# Ignore k8s and its transitives modules as they are upgraded manually together with controller-runtime.
- dependency-name: "k8s.io/*"
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
- dependency-name: "go.etcd.io/*"
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
- dependency-name: "google.golang.org/grpc"
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
# Bumping the kustomize API independently can break compatibility with client-go as they share k8s.io/kube-openapi as a dependency.
- dependency-name: "sigs.k8s.io/kustomize/api"
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
# Ignore openshift ROSA pkgs as its upgraded manually.
- dependency-name: "github.com/openshift*"
update-types: [ "version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch" ]

- package-ecosystem: "docker"
directory: "/"
schedule:
interval: "weekly"
day: "monday"
commit-message:
prefix: ":seedling:"
labels:
- "kind/cleanup"
- "area/dependency"
- "ok-to-test"
- "release-note-none"
groups:
dependencies:
patterns:
- "*"

# Enable version updates for Go tools
- package-ecosystem: "gomod"
directory: "/hack/tools"
schedule:
interval: "weekly"
day: "wednesday"
commit-message:
prefix: ":seedling:"
labels:
- "kind/cleanup"
- "area/dependency"
- "ok-to-test"
- "release-note-none"
groups:
dependencies:
patterns:
- "*"
ignore:
# Ignore Cluster-API as its upgraded manually.
- dependency-name: "sigs.k8s.io/cluster-api*"
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
# Ignore controller-runtime as its upgraded manually.
- dependency-name: "sigs.k8s.io/controller-runtime"
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
# Ignore k8s and its transitives modules as they are upgraded manually together with controller-runtime.
- dependency-name: "k8s.io/*"
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
- dependency-name: "go.etcd.io/*"
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
- dependency-name: "google.golang.org/grpc"
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
# Bumping the kustomize API independently can break compatibility with client-go as they share k8s.io/kube-openapi as a dependency.
- dependency-name: "sigs.k8s.io/kustomize/api"
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]

- package-ecosystem: "docker"
directory: "/hack/tools"
schedule:
interval: "weekly"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "daily"
day: "wednesday"
commit-message:
prefix: ":seedling:"
labels:
- "kind/cleanup"
- "area/dependency"
- "ok-to-test"
- "release-note-none"
groups:
dependencies:
patterns:
- "*"
63 changes: 63 additions & 0 deletions .github/workflows/build-ami-varsfile.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: build-and-publish-ami-with-vars

on:
workflow_dispatch:
inputs:
image_builder_version:
description: "Image builder version"
required: true
default: 'v0.1.38'
target:
description: "target os"
required: true
type: choice
options:
- ubuntu-2204
- ubuntu-2404
- flatcar
packer_vars:
description: "Packer vars (json)"
type: string

permissions:
id-token: write
contents: read

jobs:
buildandpublish:
name: Build and publish CAPA AMIs
runs-on: ubuntu-latest
steps:
- name: checkout code
uses: actions/checkout@v4
with:
repository: kubernetes-sigs/image-builder
ref: ${{ inputs.image_builder_version }}
fetch-depth: 0
- name: Create packer vars file
if: inputs.packer_vars != ''
env:
PACKER_VARS: ${{ inputs.packer_vars }}
run: |
echo "$PACKER_VARS" | jq -r > ./images/capi/vars.json
cat ./images/capi/vars.json
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
aws-region: us-east-2
role-to-assume: arn:aws:iam::819546954734:role/gh-image-builder
- name: Install deps
run: make deps-ami
working-directory: ./images/capi
- name: Install Amazon EBS Plugin
working-directory: ./images/capi
run: ./.local/bin/packer plugins install github.com/hashicorp/amazon
- name: Build AMI with vars
if: inputs.packer_vars != ''
working-directory: ./images/capi
run: PACKER_VAR_FILES=vars.json make build-ami-${{ inputs.target }}
- name: Build AMI without vars
if: inputs.packer_vars == ''
working-directory: ./images/capi
run: make build-ami-${{ inputs.target }}

Loading

0 comments on commit 34548c5

Please sign in to comment.