Skip to content

Commit b24dd70

Browse files
committed
Merge branch 'improvement/bump-salt-30029' into q/123.0
2 parents 1b52c2e + a141f65 commit b24dd70

File tree

5 files changed

+248
-215
lines changed

5 files changed

+248
-215
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ repos:
5151
files: salt/tests/unit/formulas/.*\.py
5252
additional_dependencies:
5353
- 'pyenchant~=3.2'
54-
- 'salt==3002.8'
54+
- 'salt==3002.9'
5555
- pytest
5656
- Jinja2
5757

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@
123123
`salt-master` container
124124
(PR[#3773](https://github.com/scality/metalk8s/pull/3773))
125125

126+
- Bump Salt version to [3002.9](https://github.com/saltstack/salt/blob/v3002.9/doc/topics/releases/3002.9.rst)
127+
(PR[#3811](https://github.com/scality/metalk8s/pull/3811))
128+
126129
- Bump Dex chart version to [0.8.2](https://artifacthub.io/packages/helm/dex/dex/0.8.2),
127130
Dex image has been bumped accordingly to
128131
[v2.31.2](https://github.com/dexidp/dex/releases/tag/v2.31.2)

buildchain/buildchain/versions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
CALICO_VERSION: str = "3.23.1"
2222
K8S_VERSION: str = "1.23.5"
23-
SALT_VERSION: str = "3002.8"
23+
SALT_VERSION: str = "3002.9"
2424
CONTAINERD_VERSION: str = "1.6.4"
2525

2626
CALICO_RELEASE: str = "1"

salt/tests/requirements.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
pytest
22
pytest-cov
3-
salt == 3002.8
3+
salt == 3002.9
44
mock == 3.0.5
55
parameterized == 0.7.4
66
etcd3 != 0.11.0

0 commit comments

Comments
 (0)