Skip to content

Commit 1526562

Browse files
Sync with upstream/main (excluding .github/workflows)
1 parent fc4c6ba commit 1526562

95 files changed

Lines changed: 3368 additions & 794 deletions

File tree

Some content is hidden

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

.github/ISSUE_TEMPLATE/new_release.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ For details, see [RELEASE.md](https://github.com/kubernetes-sigs/cluster-api-pro
1414
- [ ] [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).
1515
- [ ] [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).
1616
- [ ] [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)
17-
as [described in the CAPI book](https://cluster-api.sigs.k8s.io/clusterctl/provider-contract.html#metadata-yaml)
17+
as [described in the CAPI book](https://cluster-api.sigs.k8s.io/developer/providers/contracts/clusterctl#metadata-yaml)
1818
on the release branch prior to release.
19-
- [ ] Push tag to the repository.
19+
- [ ] 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.
2020
- [ ] Promote the [staging image](https://console.cloud.google.com/cloud-build/builds?project=k8s-staging-capi-openstack) by
2121
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).
22-
- [ ] Verify that the new draft release looks good and make changes if necessary.
22+
- [ ] Verify that the new draft release looks good.
2323
- [ ] Verify that the image was promoted sucessfully.
2424
- [ ] Publish the release.
2525
Mark the release as "latest" if it is the most recent minor release.

.github/dependabot.yml

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ updates:
1212
target-branch: main
1313
groups:
1414
all-github-actions:
15-
patterns: ["*"]
15+
patterns: [ "*" ]
1616
commit-message:
1717
prefix: ":seedling:"
1818
include: scope
@@ -30,20 +30,20 @@ updates:
3030
target-branch: main
3131
groups:
3232
all-go-mod-patch-and-minor:
33-
patterns: ["*"]
34-
update-types: ["patch", "minor"]
33+
patterns: [ "*" ]
34+
update-types: [ "patch", "minor" ]
3535
commit-message:
3636
prefix: ":seedling:"
3737
include: scope
3838
ignore:
3939
# Ignore controller-runtime major and minor bumps as its upgraded manually.
4040
- dependency-name: "sigs.k8s.io/controller-runtime"
41-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
41+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
4242
# Ignore k8s major and minor bumps and its transitives modules
4343
- dependency-name: "k8s.io/*"
44-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
44+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
4545
- dependency-name: "sigs.k8s.io/controller-tools"
46-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
46+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
4747
labels:
4848
- "area/dependency"
4949
- "ok-to-test"
@@ -58,7 +58,7 @@ updates:
5858
target-branch: release-0.13
5959
groups:
6060
all-github-actions:
61-
patterns: ["*"]
61+
patterns: [ "*" ]
6262
commit-message:
6363
prefix: ":seedling:"
6464
include: scope
@@ -76,23 +76,23 @@ updates:
7676
target-branch: release-0.13
7777
groups:
7878
all-go-mod-patch-and-minor:
79-
patterns: ["*"]
80-
update-types: ["patch", "minor"]
79+
patterns: [ "*" ]
80+
update-types: [ "patch", "minor" ]
8181
commit-message:
8282
prefix: ":seedling:"
8383
include: scope
8484
ignore:
8585
# Ignore CAPI major and minor bumps
8686
- dependency-name: "sigs.k8s.io/cluster-api*"
87-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
87+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
8888
# Ignore controller-runtime major and minor bumps as its upgraded manually.
8989
- dependency-name: "sigs.k8s.io/controller-runtime"
90-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
90+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
9191
# Ignore k8s major and minor bumps and its transitives modules
9292
- dependency-name: "k8s.io/*"
93-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
93+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
9494
- dependency-name: "sigs.k8s.io/controller-tools"
95-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
95+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
9696
labels:
9797
- "area/dependency"
9898
- "ok-to-test"
@@ -107,7 +107,7 @@ updates:
107107
target-branch: release-0.12
108108
groups:
109109
all-github-actions:
110-
patterns: ["*"]
110+
patterns: [ "*" ]
111111
commit-message:
112112
prefix: ":seedling:"
113113
include: scope
@@ -125,33 +125,35 @@ updates:
125125
target-branch: release-0.12
126126
groups:
127127
all-go-mod-patch-and-minor:
128-
patterns: ["*"]
129-
update-types: ["patch", "minor"]
128+
patterns: [ "*" ]
129+
update-types: [ "patch", "minor" ]
130130
commit-message:
131131
prefix: ":seedling:"
132132
include: scope
133133
ignore:
134134
# Ignore CAPI major and minor bumps
135135
- dependency-name: "sigs.k8s.io/cluster-api*"
136-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
136+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
137137
# Ignore controller-runtime major and minor bumps as its upgraded manually.
138138
- dependency-name: "sigs.k8s.io/controller-runtime"
139-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
139+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
140140
# Ignore k8s major and minor bumps and its transitives modules
141141
- dependency-name: "k8s.io/*"
142-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
142+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
143143
- dependency-name: "sigs.k8s.io/controller-tools"
144-
update-types: ["version-update:semver-major", "version-update:semver-minor"]
144+
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
145145
# We will need k8s v0.31.3 to bump structured-merge-diff to v4.4.2 (check git history for details).
146146
- dependency-name: "sigs.k8s.io/structured-merge-diff/*"
147147
# These dependencies are skipped because they require a newer version of go:
148148
- dependency-name: "github.com/a8m/envsubst"
149149
- dependency-name: "github.com/onsi/gomega"
150+
- dependency-name: "github.com/itchyny/gojq"
150151
- dependency-name: "golang.org/x/crypto"
151152
- dependency-name: "golang.org/x/text"
152153
# Newer kustomize requires a bump to kube-openapi, which has some incompatibility with gengo.
153154
- dependency-name: "sigs.k8s.io/kustomize/kustomize/*"
154155
labels:
155156
- "area/dependency"
156157
- "ok-to-test"
158+
157159
## release-0.12 branch config ends here

0 commit comments

Comments
 (0)