Upgrade salt to 3002.5 #3158

TeddyAndrieux · 2021-03-01T13:03:53Z

Component:

'salt'

Context:

Some CVE was discovered in Salt 3002.2 https://saltproject.io/security_announcements/active-saltstack-cve-release-2021-feb-25/

Summary:

Bump Salt version to 3002.2
Add roster in Salt master configuration file (sees [BUG] Giving roster in kwargs for ssh command is not longer possible since 3002.3 saltstack/salt#59657)

bert-e · 2021-03-01T13:03:56Z

Hello teddyandrieux,

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 · 2021-03-01T13:04:00Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.8/improvement/upgrade-salt-30025 with contents from improvement/upgrade-salt-30025
and development/2.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.8/improvement/upgrade-salt-30025 origin/development/2.8
 $ git merge origin/improvement/upgrade-salt-30025
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.8/improvement/upgrade-salt-30025

bert-e · 2021-03-01T13:26:16Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.9/improvement/upgrade-salt-30025 with contents from w/2.8/improvement/upgrade-salt-30025
and development/2.9.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.9/improvement/upgrade-salt-30025 origin/development/2.9
 $ git merge origin/w/2.8/improvement/upgrade-salt-30025
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.9/improvement/upgrade-salt-30025

bert-e · 2021-03-01T13:28:01Z

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:

images/salt-master/Dockerfile

Do not longer provide the SALT_VERSION default value in the Dockerfile, this docker file is supposed to be used with the right Salt version directly in the argument ``` docker build . --build-arg SALT_VERSION=<salt_version> ``` In the buildchain we override this value automatically with the one in versions.py, so in case of Salt upgrade the one in the dockerfile do not need to be maintained

Add roster directly in salt master config so that it's simpler to do some manual call to `salt-ssh` directly. Also in Salt 3002.5 `roster` from kwargs in ssh command is ignored, sees saltstack/salt#59657

bert-e · 2021-03-01T16:27:18Z

History mismatch

Merge commit #75d22962bfeb70a9f7df6e62576331ca46015f50 on the integration branch
w/2.8/improvement/upgrade-salt-30025 is merging a branch which is neither the current
branch improvement/upgrade-salt-30025 nor the development branch
development/2.8.

It is likely due to a rebase of the branch improvement/upgrade-salt-30025 and the
merge is not possible until all related w/* branches are deleted or updated.

Please use the reset command to have me reinitialize these branches.

TeddyAndrieux · 2021-03-01T16:27:38Z

/reset

bert-e · 2021-03-01T16:27:46Z

Reset complete

I have successfully deleted this pull request's integration branches.

bert-e · 2021-03-01T16:27:52Z

Conflict

A conflict has been raised during the creation of
integration branch w/2.8/improvement/upgrade-salt-30025 with contents from improvement/upgrade-salt-30025
and development/2.8.

I have not created the integration branch.

Here are the steps to resolve this conflict:

 $ git fetch
 $ git checkout -B w/2.8/improvement/upgrade-salt-30025 origin/development/2.8
 $ git merge origin/improvement/upgrade-salt-30025
 $ # <intense conflict resolution>
 $ git commit
 $ git push -u origin w/2.8/improvement/upgrade-salt-30025

bert-e · 2021-03-01T16:31: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:

TeddyAndrieux · 2021-03-02T09:07:37Z

/approve

bert-e · 2021-03-02T09:07:50Z

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

✔️ development/2.7
✔️ development/2.8
✔️ development/2.9

The following branches will NOT be impacted:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

Any commit you add on the source branch will trigger a new cycle after the
current queue is merged.
Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

bert-e · 2021-03-02T09:07:58Z

I have successfully merged the changeset of this pull request
into targetted development branches:

✔️ development/2.7
✔️ development/2.8
✔️ development/2.9

The following branches have NOT changed:

development/1.0
development/1.1
development/1.2
development/1.3
development/2.0
development/2.1
development/2.2
development/2.3
development/2.4
development/2.5
development/2.6

Please check the status of the associated issue None.

Goodbye teddyandrieux.

TeddyAndrieux added topic:build Anything related to building steps complexity:easy Something that requires less than a day to fix topic:salt Everything related to SaltStack in our product labels Mar 1, 2021

TeddyAndrieux added this to the MetalK8s 2.7.3 milestone Mar 1, 2021

TeddyAndrieux requested a review from a team March 1, 2021 13:03

TeddyAndrieux force-pushed the improvement/upgrade-salt-30025 branch from 684b1c6 to 093e2c4 Compare March 1, 2021 13:05

alexandre-allard reviewed Mar 1, 2021

View reviewed changes

images/salt-master/Dockerfile Outdated Show resolved Hide resolved

TeddyAndrieux added 3 commits March 1, 2021 17:26

buid,tests: Bump Salt to 3002.5

cbbdd37

salt: Set roster to kubernetes directly in Salt master config

80ac2a2

Add roster directly in salt master config so that it's simpler to do some manual call to `salt-ssh` directly. Also in Salt 3002.5 `roster` from kwargs in ssh command is ignored, sees saltstack/salt#59657

TeddyAndrieux force-pushed the improvement/upgrade-salt-30025 branch from 093e2c4 to 80ac2a2 Compare March 1, 2021 16:27

alexandre-allard approved these changes Mar 2, 2021

View reviewed changes

bert-e merged commit 80ac2a2 into development/2.7 Mar 2, 2021

bert-e deleted the improvement/upgrade-salt-30025 branch March 2, 2021 09:08

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade salt to 3002.5 #3158

Upgrade salt to 3002.5 #3158

TeddyAndrieux commented Mar 1, 2021

bert-e commented Mar 1, 2021

bert-e commented Mar 1, 2021

bert-e commented Mar 1, 2021

bert-e commented Mar 1, 2021

bert-e commented Mar 1, 2021

TeddyAndrieux commented Mar 1, 2021

bert-e commented Mar 1, 2021

bert-e commented Mar 1, 2021

bert-e commented Mar 1, 2021

TeddyAndrieux commented Mar 2, 2021

bert-e commented Mar 2, 2021

bert-e commented Mar 2, 2021

Upgrade salt to 3002.5 #3158

Upgrade salt to 3002.5 #3158

Conversation

TeddyAndrieux commented Mar 1, 2021

bert-e commented Mar 1, 2021

Hello teddyandrieux,

bert-e commented Mar 1, 2021

Conflict

bert-e commented Mar 1, 2021

Conflict

bert-e commented Mar 1, 2021

Waiting for approval

bert-e commented Mar 1, 2021

History mismatch

TeddyAndrieux commented Mar 1, 2021

bert-e commented Mar 1, 2021

Reset complete

bert-e commented Mar 1, 2021

Conflict

bert-e commented Mar 1, 2021

Waiting for approval

TeddyAndrieux commented Mar 2, 2021

bert-e commented Mar 2, 2021

In the queue

bert-e commented Mar 2, 2021