Skip to content

Commit 4677032

Browse files
authored
Merge pull request #2949 from Nordix/lentzi90/workflows-release-0.14
🌱 Update dependabot and security scan for release-0.14
2 parents c4cdd79 + acf65c1 commit 4677032

File tree

2 files changed

+30
-44
lines changed

2 files changed

+30
-44
lines changed

.github/dependabot.yml

Lines changed: 29 additions & 43 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,35 +30,35 @@ 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"
5050
## main branch config ends here
51-
## release-0.13 branch config starts here
51+
## release-0.14 branch config starts here
5252
# github-actions
5353
- directory: "/"
5454
package-ecosystem: "github-actions"
5555
schedule:
5656
interval: "weekly"
5757
day: "monday"
58-
target-branch: release-0.13
58+
target-branch: release-0.14
5959
groups:
6060
all-github-actions:
61-
patterns: [ "*" ]
61+
patterns: ["*"]
6262
commit-message:
6363
prefix: ":seedling:"
6464
include: scope
@@ -73,44 +73,41 @@ updates:
7373
schedule:
7474
interval: "weekly"
7575
day: "monday"
76-
target-branch: release-0.13
76+
target-branch: release-0.14
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" ]
96-
# Ignore ORC major and minor bumps to prevent cascading k8s.io and controller-runtime updates
97-
- dependency-name: "github.com/k-orc/openstack-resource-controller*"
98-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
95+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
9996
labels:
10097
- "area/dependency"
10198
- "ok-to-test"
102-
## release-0.13 branch config ends here
103-
## release-0.12 branch config starts here
99+
## release-0.14 branch config ends here
100+
## release-0.13 branch config starts here
104101
# github-actions
105102
- directory: "/"
106103
package-ecosystem: "github-actions"
107104
schedule:
108105
interval: "weekly"
109106
day: "monday"
110-
target-branch: release-0.12
107+
target-branch: release-0.13
111108
groups:
112109
all-github-actions:
113-
patterns: [ "*" ]
110+
patterns: ["*"]
114111
commit-message:
115112
prefix: ":seedling:"
116113
include: scope
@@ -125,41 +122,30 @@ updates:
125122
schedule:
126123
interval: "weekly"
127124
day: "monday"
128-
target-branch: release-0.12
125+
target-branch: release-0.13
129126
groups:
130127
all-go-mod-patch-and-minor:
131-
patterns: [ "*" ]
132-
update-types: [ "patch", "minor" ]
128+
patterns: ["*"]
129+
update-types: ["patch", "minor"]
133130
commit-message:
134131
prefix: ":seedling:"
135132
include: scope
136133
ignore:
137134
# Ignore CAPI major and minor bumps
138135
- dependency-name: "sigs.k8s.io/cluster-api*"
139-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
136+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
140137
# Ignore controller-runtime major and minor bumps as its upgraded manually.
141138
- dependency-name: "sigs.k8s.io/controller-runtime"
142-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
139+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
143140
# Ignore k8s major and minor bumps and its transitives modules
144141
- dependency-name: "k8s.io/*"
145-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
142+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
146143
- dependency-name: "sigs.k8s.io/controller-tools"
147-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
144+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
148145
# Ignore ORC major and minor bumps to prevent cascading k8s.io and controller-runtime updates
149146
- dependency-name: "github.com/k-orc/openstack-resource-controller*"
150-
update-types: [ "version-update:semver-major", "version-update:semver-minor" ]
151-
# We will need k8s v0.31.3 to bump structured-merge-diff to v4.4.2 (check git history for details).
152-
- dependency-name: "sigs.k8s.io/structured-merge-diff/*"
153-
# These dependencies are skipped because they require a newer version of go:
154-
- dependency-name: "github.com/a8m/envsubst"
155-
- dependency-name: "github.com/onsi/gomega"
156-
- dependency-name: "github.com/itchyny/gojq"
157-
- dependency-name: "golang.org/x/crypto"
158-
- dependency-name: "golang.org/x/text"
159-
# Newer kustomize requires a bump to kube-openapi, which has some incompatibility with gengo.
160-
- dependency-name: "sigs.k8s.io/kustomize/kustomize/*"
147+
update-types: ["version-update:semver-major", "version-update:semver-minor"]
161148
labels:
162149
- "area/dependency"
163150
- "ok-to-test"
164-
165-
## release-0.12 branch config ends here
151+
## release-0.13 branch config ends here

.github/workflows/security-scan.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
branch: [ main, release-0.13, release-0.12 ]
16+
branch: [main, release-0.14, release-0.13]
1717
name: Trivy
1818
runs-on: ubuntu-latest
1919
steps:

0 commit comments

Comments
 (0)