Improvement/bump salt 3006.6 #4237

eg-ayoub · 2024-02-14T10:27:43Z

WIP

bert-e · 2024-02-14T10:27:47Z

Hello eg-ayoub,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

bert-e · 2024-02-14T10:27:54Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

eg-ayoub · 2024-02-14T14:08:52Z

salt/tests/requirements.in

 mock == 3.0.5
 parameterized == 0.7.4
 etcd3 != 0.11.0
 kubernetes == 18.20.0
 urllib3
 pyfakefs
 psutil
+# because etcd3 package 


maybe find another etcd lib

eg-ayoub · 2024-02-14T14:18:50Z

images/salt-master/Dockerfile

 && dnf install -y git \
- && pip3 install "git+https://github.com/kubernetes-client/python.git@cef5e9bd10a6d5ca4d9c83da46ccfe2114cdaaf8#egg=kubernetes" \
+ && salt-pip install "git+https://github.com/kubernetes-client/python.git@aab72fdeb4122337e0e3e27ad4b489dcdb7bd00d#egg=kubernetes" \


use tag instead v27.2.0

eg-ayoub · 2024-02-14T14:19:42Z

images/salt-master/Dockerfile

- && pip3 install "pip == 20.1" \
- && pip3 install "protobuf ~= 3.19.4" "etcd3 != 0.11.0" \
+ && dnf install -y salt-master salt-api salt-ssh openssh-clients procps-ng \
+ && salt-pip install "protobuf ~= 3.19.4" "etcd3 != 0.11.0" \


protobuf <= 3.20.1 from tests

bert-e · 2024-02-16T13:52:44Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2024-02-20T12:17:00Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2024-02-20T15:06:57Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2024-02-22T14:45:03Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2024-02-26T15:17:17Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2024-02-27T09:06:49Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2024-02-28T18:01:42Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2024-03-04T09:03:13Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2024-03-04T11:59:56Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2024-03-13T08:49:15Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2024-03-19T17:10:26Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2024-03-26T11:02:29Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

bert-e · 2024-03-26T21:47:59Z

Waiting for approval

The following approvals are needed before I can proceed with the merge:

the author
one peer

Peer approvals must include at least 1 approval from the following list:

Version 7.0.0 drops usage of 'style' key which we use in our theme cf. sphinx-doc/sphinx#11381

saltstack/salt#65692 temporarily until the fix for this bug is released in 3006.7

(cherry picked from commit 7363b9e)

- Remove m2crypto - Remove now empty epel repo - Edit states to match the new x509_v2 modules and states

This reverts commit ff714ba.

bert-e · 2024-05-15T15:38:47Z

Request integration branches

Waiting for integration branch creation to be requested by the user.

To request integration branches, please comment on this pull request with the following command:

/create_integration_branches

Alternatively, the /approve and /create_pull_requests commands will automatically
create the integration branches.

eg-ayoub commented Feb 14, 2024

View reviewed changes

eg-ayoub force-pushed the improvement/bump-salt-3006.6 branch from c0e6cf7 to c084c49 Compare February 20, 2024 15:06

eg-ayoub force-pushed the improvement/bump-salt-3006.6 branch 2 times, most recently from fc81652 to af048a1 Compare February 28, 2024 09:06

eg-ayoub force-pushed the improvement/bump-salt-3006.6 branch 2 times, most recently from bd0c7f6 to 6832aea Compare March 1, 2024 09:54

eg-ayoub force-pushed the improvement/bump-salt-3006.6 branch from 6832aea to 2c14260 Compare March 4, 2024 11:59

eg-ayoub force-pushed the improvement/bump-salt-3006.6 branch 3 times, most recently from 7b76412 to ff714ba Compare March 4, 2024 15:17

eg-ayoub force-pushed the improvement/bump-salt-3006.6 branch 3 times, most recently from f355038 to adf2e08 Compare March 26, 2024 13:50

eg-ayoub and others added 25 commits May 15, 2024 17:36

docs: rename sphinxcontrib.jinja to sphinx_jinja

f548d26

docs: bind sphinx version under 6.2.1

b655e21

Version 7.0.0 drops usage of 'style' key which we use in our theme cf. sphinx-doc/sphinx#11381

Revert ssalt to 3006.4

e0af5f9

saltstack/salt#65692 temporarily until the fix for this bug is released in 3006.7

Extract process name from cmdline when using psutil

4e839ea

Fix get_pillar due to change in behaviour

3b564e9

POC: link protobuf in google dir because of overlapping namespace

c022c57

salt: Fix invalide require_in in deploy_node orchestrate

62b30f8

(cherry picked from commit 7363b9e)

POC workaround, install psutil manually in salt-ssh hosts

2caea95

python kubernetes: Eviciton object is now V1

340e88e

use_superseded is no longer needed for module.run

6af35e5

use new argument layout for module.run

2c202d9

Remove module_run state and use module.run as it was fixed

f40603b

Bump salt to 3006.7, remove workarounds

5ee0607

fix _extract_process_name func

274163f

fix etcd3 package ver and protobuf dep

7f01c13

Use new x509_v2 modules

b8499bd

- Remove m2crypto - Remove now empty epel repo - Edit states to match the new x509_v2 modules and states

Revert "Use new x509_v2 modules"

393f55e

This reverts commit ff714ba.

Bump to 3007 to fix Minions not connecting

9b733d8

Pass __grains__ to get_pillar in 3002

c9a4e9f

Manually install m2crypto

7bbf984

Enable netapi (salt-api)

6a67f9d

Timeout in solutions pillar

be2150c

Punctuation=false

d3cb512

Manually patch salt in minion and master

8ce1915

debug logging

293f1f0

eg-ayoub force-pushed the improvement/bump-salt-3006.6 branch from 2661cc6 to 293f1f0 Compare May 15, 2024 15:38

eg-ayoub added 3 commits May 21, 2024 10:35

upgrade: automate some things + logging

8d2ff67

spoof version

77595f0

don't patch salt stuff yet

091d6cf

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improvement/bump salt 3006.6 #4237

Improvement/bump salt 3006.6 #4237

eg-ayoub commented Feb 14, 2024

bert-e commented Feb 14, 2024

bert-e commented Feb 14, 2024

eg-ayoub Feb 14, 2024

eg-ayoub Feb 14, 2024

eg-ayoub Feb 14, 2024

bert-e commented Feb 16, 2024

bert-e commented Feb 20, 2024

bert-e commented Feb 20, 2024

bert-e commented Feb 22, 2024

bert-e commented Feb 26, 2024

bert-e commented Feb 27, 2024

bert-e commented Feb 28, 2024

bert-e commented Mar 4, 2024

bert-e commented Mar 4, 2024

bert-e commented Mar 13, 2024

bert-e commented Mar 19, 2024

bert-e commented Mar 26, 2024

bert-e commented Mar 26, 2024

bert-e commented May 15, 2024

Improvement/bump salt 3006.6 #4237

Are you sure you want to change the base?

Improvement/bump salt 3006.6 #4237

Conversation

eg-ayoub commented Feb 14, 2024

bert-e commented Feb 14, 2024

Hello eg-ayoub,

bert-e commented Feb 14, 2024

Waiting for approval

eg-ayoub Feb 14, 2024

Choose a reason for hiding this comment

eg-ayoub Feb 14, 2024

Choose a reason for hiding this comment

eg-ayoub Feb 14, 2024

Choose a reason for hiding this comment

bert-e commented Feb 16, 2024

Waiting for approval

bert-e commented Feb 20, 2024

Waiting for approval

bert-e commented Feb 20, 2024

Waiting for approval

bert-e commented Feb 22, 2024

Waiting for approval

bert-e commented Feb 26, 2024

Waiting for approval

bert-e commented Feb 27, 2024

Waiting for approval

bert-e commented Feb 28, 2024

Waiting for approval

bert-e commented Mar 4, 2024

Waiting for approval

bert-e commented Mar 4, 2024

Waiting for approval

bert-e commented Mar 13, 2024

Waiting for approval

bert-e commented Mar 19, 2024

Waiting for approval

bert-e commented Mar 26, 2024

Waiting for approval

bert-e commented Mar 26, 2024

Waiting for approval

bert-e commented May 15, 2024

Request integration branches