Bump to 3007.1 - don't patch for await none bug

scality · May 23, 2024 · 9ad0aad · 9ad0aad
1 parent d0bacc0
commit 9ad0aad
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 13 deletions.
diff --git a/buildchain/buildchain/versions.py b/buildchain/buildchain/versions.py
@@ -26,7 +26,7 @@
 K8S_VERSION: str = f"{K8S_SHORT_VERSION}.{K8S_VERSION_PATCH}"
 
 CALICO_VERSION: str = "3.26.1"
-SALT_VERSION: str = "3007.0"
+SALT_VERSION: str = "3007.1"
 CONTAINERD_VERSION: str = "1.6.24"
 
 CONTAINERD_RELEASE: str = "1"

diff --git a/images/salt-master/patch.sh b/images/salt-master/patch.sh
@@ -2,14 +2,11 @@
 
 patch_salt() {
  declare -a PATCH_FILES=(
- loader/lazy.py
- metaproxy/deltaproxy.py
- metaproxy/proxy.py
- minion.py
+ states/x509_v2.py
  )
  for pfile in "${PATCH_FILES[@]}"; do
  mkdir -p "/tmp/$(dirname "$pfile")"
- curl -Lo "/tmp/$pfile" "https://github.com/saltstack/salt/raw/3007.x/salt/$pfile"
+ curl -Lo "/tmp/$pfile" "https://github.com/lkubb/salt/raw/x509-v2-signing-key-policy/salt/$pfile"
  cp "/tmp/$pfile" "/opt/saltstack/salt/lib/python3.10/site-packages/salt/$pfile"
  done
 }

diff --git a/scripts/bootstrap.sh.in b/scripts/bootstrap.sh.in
@@ -181,15 +181,13 @@ main() {
  run "Installing Python3 package" install_packages python3
  PYTHON=${PYTHON:-$(command -v python3)}
  fi
- run "DEV: Installing extra packages" install_packages lvm2 tmux vim make automake gcc gcc-c++ kernel-devel swig openssl-devel
  run "Checking that BootstrapConfiguration is present" bootstrap_file_is_present
  run "Pre-minion system tests" pre_minion_checks
  run "Configure internal repositories" configure_repositories
  run "Check mandatory packages presence" check_packages_presence
  run "Disabling Salt minion service" disable_salt_minion_service
  run "Stopping Salt minion service" stop_salt_minion_service
  run "Installing mandatory packages" install_packages "${PACKAGES[@]}"
- run "Install extra salt packes" salt_install_extra
  run "Patch salt files" patch_salt
  run "Checking Salt minion ID" check_minion_id
  run "Configuring Salt minion to run in local mode" configure_salt_minion_local_mode

diff --git a/scripts/common.sh.in b/scripts/common.sh.in
@@ -17,14 +17,11 @@ LOGFILE_MAX_ROTATIONS=10
 
 patch_salt() {
  declare -a PATCH_FILES=(
- loader/lazy.py
- metaproxy/deltaproxy.py
- metaproxy/proxy.py
- minion.py
+ states/x509_v2.py
  )
  for pfile in "${PATCH_FILES[@]}"; do
  mkdir -p "/tmp/$(dirname "$pfile")"
- curl -Lo "/tmp/$pfile" "https://github.com/saltstack/salt/raw/3007.x/salt/$pfile"
+ curl -Lo "/tmp/$pfile" "https://github.com/lkubb/salt/raw/x509-v2-signing-key-policy/salt/$pfile"
  "$SALT_CALL" --local file.copy "/tmp/$pfile" "/opt/saltstack/salt/lib/python3.10/site-packages/salt/$pfile"
  done
 }