Merge remote-tracking branch 'origin/w/2.8/improvement/upgrade-salt-3…

…0025' into w/2.9/improvement/upgrade-salt-30025

CHANGELOG.md

@@ -84,6 +84,25 @@
 
 ## Release 2.7.3 (in development)
 
+### Security fixes
+- Due to vulnerabilities (
+[CVE-2021-3197](https://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-3197),
+[CVE-2021-25281](https://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-25281),
+[CVE-2021-25282](https://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-25282),
+[CVE-2021-25283](https://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-25283),
+[CVE-2021-25284](https://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-25284),
+[CVE-2021-3148](https://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-3148),
+[CVE-2020-35662](https://cve.mitre.org/cgi-bin/cvename.cgi?name=2020-35662),
+[CVE-2021-3144](https://cve.mitre.org/cgi-bin/cvename.cgi?name=2021-3144),
+[CVE-2020-28972](https://cve.mitre.org/cgi-bin/cvename.cgi?name=2020-28972)
+and
+[CVE-2020-28243](https://cve.mitre.org/cgi-bin/cvename.cgi?name=2020-28243))
+affecting all Salt versions inferior to `3002.5`, this release ships with
+all Saltstack updated to `3002.5`.
+
+    Upgrade Salt to version `3002.5`
+    (PR [#3158](https://github.com/scality/metalk8s/pull/3158))
+
 ## Release 2.7.2
 ### Enhancements
 - Bump Kubernetes version to 1.18.16

buildchain/buildchain/versions.py

@@ -19,7 +19,7 @@
 
 CALICO_VERSION: str = "3.17.0"
 K8S_VERSION: str = "1.20.4"
-SALT_VERSION: str = "3002.2"
+SALT_VERSION: str = "3002.5"
 CONTAINERD_VERSION: str = "1.4.3"
 
 CALICO_RELEASE: str = "1"

images/salt-master/Dockerfile

@@ -3,7 +3,7 @@ FROM centos:7.6.1810
 MAINTAINER moonshot-platform <moonshot-platform@scality.com>
 
 # Versions to use
-ARG SALT_VERSION=3002.2
+ARG SALT_VERSION
 
 # Install saltstack
 RUN printf "[saltstack-repo]\n\

salt/metalk8s/salt/master/files/master-99-metalk8s.conf.j2

@@ -29,6 +29,9 @@ roster_defaults:
     use_superseded:
       - module.run
 
+# Set default roster to kubernetes
+roster: kubernetes
+
 # Globally disable SSH host key checks
 no_host_keys: true
 

salt/tests/requirements.in

@@ -1,6 +1,6 @@
 pytest
 pytest-cov
-salt == 3002.2
+salt == 3002.5
 mock == 3.0.5
 parameterized == 0.7.4
 etcd3 != 0.11.0