Merge branch 'improvement/bump-salt-30029' into q/123.0

scality · Jul 6, 2022 · b24dd70 · b24dd70
2 parents 1b52c2e + a141f65
commit b24dd70
Show file tree

Hide file tree

Showing 5 changed files with 248 additions and 215 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -51,7 +51,7 @@ repos:
         files: salt/tests/unit/formulas/.*\.py
         additional_dependencies:
           - 'pyenchant~=3.2'
-          - 'salt==3002.8'
+          - 'salt==3002.9'
           - pytest
           - Jinja2
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -123,6 +123,9 @@
   `salt-master` container
   (PR[#3773](https://github.com/scality/metalk8s/pull/3773))
 
+ - Bump Salt version to [3002.9](https://github.com/saltstack/salt/blob/v3002.9/doc/topics/releases/3002.9.rst)
+  (PR[#3811](https://github.com/scality/metalk8s/pull/3811))
+
 - Bump Dex chart version to [0.8.2](https://artifacthub.io/packages/helm/dex/dex/0.8.2),
   Dex image has been bumped accordingly to
   [v2.31.2](https://github.com/dexidp/dex/releases/tag/v2.31.2)

diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
@@ -20,7 +20,7 @@
 
 CALICO_VERSION: str = "3.23.1"
 K8S_VERSION: str = "1.23.5"
-SALT_VERSION: str = "3002.8"
+SALT_VERSION: str = "3002.9"
 CONTAINERD_VERSION: str = "1.6.4"
 
 CALICO_RELEASE: str = "1"

diff --git a/salt/tests/requirements.in b/salt/tests/requirements.in
@@ -1,6 +1,6 @@
 pytest
 pytest-cov
-salt == 3002.8
+salt == 3002.9
 mock == 3.0.5
 parameterized == 0.7.4
 etcd3 != 0.11.0