Skip to content

Commit

Permalink
Merge branch 'kubernetes-sigs:main' into return-set-of-issues-when-ng…
Browse files Browse the repository at this point in the history
…-in-degraded-state
  • Loading branch information
stefanSpectro authored Sep 3, 2024
2 parents 8307d07 + abe918c commit ebbcfa7
Show file tree
Hide file tree
Showing 381 changed files with 31,778 additions and 8,211 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 **k8s-infra-staging-cluster-api-aws@kubernetes.io** [here](https://github.com/kubernetes/k8s.io/blob/main/groups/sig-cluster-lifecycle/groups.yaml)
- [ ] Update **sig-cluster-lifecycle-cluster-api-aws-alerts@kubernetes.io** [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)
```
72 changes: 53 additions & 19 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,68 @@
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: "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"
# Ignore k8s and its transitives modules as they are upgraded manually
# together with 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:
Expand All @@ -41,46 +73,48 @@ updates:
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"
# Ignore k8s and its transitives modules as they are upgraded manually
# together with 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/*"
# Ignore controller-tools as its upgraded manually.
- dependency-name: "sigs.k8s.io/controller-tools"
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"
day: "wednesday"
commit-message:
prefix: ":seedling:"
labels:
- "kind/cleanup"
groups:
dependencies:
patterns:
- "*"

- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
commit-message:
prefix: ":seedling:"
labels:
- "kind/cleanup"
- "area/dependency"
- "ok-to-test"
- "release-note-none"
groups:
dependencies:
patterns:
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ on:
description: 'Run code generation manually from GH CLI'
required: true
default: 'Make Generate'

permissions:
contents: write # Allow actions to update dependabot PRs

jobs:
build:
name: Build
Expand All @@ -21,7 +25,7 @@ jobs:
- name: Set up Go 1.x
uses: actions/setup-go@v5
with:
go-version: '1.21'
go-version: '1.22'
id: go
- name: Check out code into the Go module directory
uses: actions/checkout@v4.1.1
Expand Down
33 changes: 33 additions & 0 deletions .github/workflows/pr-golangci-lint.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: PR golangci-lint

on:
pull_request:
types: [opened, edited, synchronize, reopened]

# Remove all permissions from GITHUB_TOKEN except metadata.
permissions: {}

jobs:
golangci:
name: lint
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
working-directory:
- ""
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # tag=v4.1.1
- name: Calculate go version
id: vars
run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
- name: Set up Go
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # tag=v5.0.0
with:
go-version: ${{ steps.vars.outputs.go_version }}
- name: golangci-lint
uses: golangci/golangci-lint-action@a4f60bb28d35aeee14e6880718e0c85ff1882e64 # tag=v6.0.1
with:
version: v1.56.1
args: --out-format=colored-line-number
working-directory: ${{matrix.working-directory}}
3 changes: 3 additions & 0 deletions .github/workflows/pr-verify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ on:
pull_request_target:
types: [opened, edited, synchronize, reopened]

permissions:
checks: write

jobs:
verify:
runs-on: ubuntu-latest
Expand Down
38 changes: 38 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: release

on:
push:
tags:
- 'v*'

permissions:
contents: write # required to write to github release.

jobs:
release:
name: Create draft release
runs-on: ubuntu-latest
steps:
- name: checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: '1.22'
- name: Set version info
run: |
echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
echo "PREVIOUS_VERSION=$(git describe --abbrev=0 2> /dev/null)" >> $GITHUB_ENV
echo "RELEASE_BRANCH=release-$(echo ${GITHUB_REF_NAME} | grep -Eo '[0-9]\.[0-9]+')" >> $GITHUB_ENV
echo "RELEASE_TAG=${GITHUB_REF_NAME}" >> $GITHUB_ENV
- name: Run release
run: |
echo "Version is: $VERSION"
echo "Previous version is: $PREVIOUS_VERSION"
echo "Release branch is: $RELEASE_BRANCH"
echo "Release tag is: $RELEASE_TAG"
make release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ junit.*.xml
.DS_Store

.tiltbuild
dist

# test results
_artifacts
Expand Down
Loading

0 comments on commit ebbcfa7

Please sign in to comment.