Skip to content

Sync with upstream/main #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Sync with upstream/main #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/new_release.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ For details, see [RELEASE.md](https://github.com/kubernetes-sigs/cluster-api-pro
- [ ] [When bumping `X` or `Y`] Add a new entry of new release branch to [depandabot.yml](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/main/.github/dependabot.yml).
- [ ] [When bumping `X` or `Y`] Add a new entry of new release branch to [security-scan.yaml](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/main/.github/workflows/security-scan.yaml).
- [ ] [When bumping `X` or `Y`] Add a new entry to [metadata.yaml](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/main/metadata.yaml)
as [described in the CAPI book](https://cluster-api.sigs.k8s.io/clusterctl/provider-contract.html#metadata-yaml)
as [described in the CAPI book](https://cluster-api.sigs.k8s.io/developer/providers/contracts/clusterctl#metadata-yaml)
on the release branch prior to release.
- [ ] Push tag to the repository.
- [ ] Create the PR after generating release notes according to [RELEASE.md](https://github.com/kubernetes-sigs/cluster-api-provider-openstack/blob/main/RELEASE.md). Verify that the release PR looks good and make changes if necessary. When this PR is merged, release automation will push the tag to upstream and create a draft release notes.
- [ ] Promote the [staging image](https://console.cloud.google.com/cloud-build/builds?project=k8s-staging-capi-openstack) by
adding the new sha=>tag mapping to [images.yaml](https://github.com/kubernetes/k8s.io/blob/main/registry.k8s.io/images/k8s-staging-capi-openstack/images.yaml).
- [ ] Verify that the new draft release looks good and make changes if necessary.
- [ ] Verify that the new draft release looks good.
- [ ] Verify that the image was promoted sucessfully.
- [ ] Publish the release.
Mark the release as "latest" if it is the most recent minor release.
Expand Down
42 changes: 22 additions & 20 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ updates:
target-branch: main
groups:
all-github-actions:
patterns: ["*"]
patterns: [ "*" ]
commit-message:
prefix: ":seedling:"
include: scope
Expand All @@ -30,20 +30,20 @@ updates:
target-branch: main
groups:
all-go-mod-patch-and-minor:
patterns: ["*"]
update-types: ["patch", "minor"]
patterns: [ "*" ]
update-types: [ "patch", "minor" ]
commit-message:
prefix: ":seedling:"
include: scope
ignore:
# Ignore controller-runtime major and minor bumps as its upgraded manually.
- dependency-name: "sigs.k8s.io/controller-runtime"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
# Ignore k8s major and minor bumps and its transitives modules
- dependency-name: "k8s.io/*"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
- dependency-name: "sigs.k8s.io/controller-tools"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
labels:
- "area/dependency"
- "ok-to-test"
Expand All @@ -58,7 +58,7 @@ updates:
target-branch: release-0.13
groups:
all-github-actions:
patterns: ["*"]
patterns: [ "*" ]
commit-message:
prefix: ":seedling:"
include: scope
Expand All @@ -76,23 +76,23 @@ updates:
target-branch: release-0.13
groups:
all-go-mod-patch-and-minor:
patterns: ["*"]
update-types: ["patch", "minor"]
patterns: [ "*" ]
update-types: [ "patch", "minor" ]
commit-message:
prefix: ":seedling:"
include: scope
ignore:
# Ignore CAPI major and minor bumps
- dependency-name: "sigs.k8s.io/cluster-api*"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
# Ignore controller-runtime major and minor bumps as its upgraded manually.
- dependency-name: "sigs.k8s.io/controller-runtime"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
# Ignore k8s major and minor bumps and its transitives modules
- dependency-name: "k8s.io/*"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
- dependency-name: "sigs.k8s.io/controller-tools"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
labels:
- "area/dependency"
- "ok-to-test"
Expand All @@ -107,7 +107,7 @@ updates:
target-branch: release-0.12
groups:
all-github-actions:
patterns: ["*"]
patterns: [ "*" ]
commit-message:
prefix: ":seedling:"
include: scope
Expand All @@ -125,33 +125,35 @@ updates:
target-branch: release-0.12
groups:
all-go-mod-patch-and-minor:
patterns: ["*"]
update-types: ["patch", "minor"]
patterns: [ "*" ]
update-types: [ "patch", "minor" ]
commit-message:
prefix: ":seedling:"
include: scope
ignore:
# Ignore CAPI major and minor bumps
- dependency-name: "sigs.k8s.io/cluster-api*"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
# Ignore controller-runtime major and minor bumps as its upgraded manually.
- dependency-name: "sigs.k8s.io/controller-runtime"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
# Ignore k8s major and minor bumps and its transitives modules
- dependency-name: "k8s.io/*"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
- dependency-name: "sigs.k8s.io/controller-tools"
update-types: ["version-update:semver-major", "version-update:semver-minor"]
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
# We will need k8s v0.31.3 to bump structured-merge-diff to v4.4.2 (check git history for details).
- dependency-name: "sigs.k8s.io/structured-merge-diff/*"
# These dependencies are skipped because they require a newer version of go:
- dependency-name: "github.com/a8m/envsubst"
- dependency-name: "github.com/onsi/gomega"
- dependency-name: "github.com/itchyny/gojq"
- dependency-name: "golang.org/x/crypto"
- dependency-name: "golang.org/x/text"
# Newer kustomize requires a bump to kube-openapi, which has some incompatibility with gengo.
- dependency-name: "sigs.k8s.io/kustomize/kustomize/*"
labels:
- "area/dependency"
- "ok-to-test"

## release-0.12 branch config ends here
Loading