metalk8s
metalk8s copied to clipboard
scality
salt: Fix shell-ui configuration upgrade
Component:
salt, shell-ui
Context:
When upgrading from 2.9.x to 2.10.x we lost patches to OIDC and users groups mapping configuration.
Summary:
This solves it by copying the old configuration to the new CMs.
Acceptance criteria:
Tested an upgrade from 2.9 with patched configuration to 2.10.3-dev and the configuration was correctly kept.
Closes: #3496
Hello jbwatenbergscality,
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.
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:
-
@nicolast
-
@teddyandrieux
-
@alexandre-allard-scality
-
@jbwatenbergscality
-
@lucieleonard
-
@chengyanjin
-
@gdemonet
-
@thomasdanan
Integration data created
I have created the integration data for the additional destination branches.
- this pull request will merge
bugfix/upgrade-shell-ui-versionintodevelopment/2.10 - w/2.11/bugfix/upgrade-shell-ui-version will be merged into
development/2.11
The following branches will NOT be impacted:
development/2.0development/2.1development/2.2development/2.3development/2.4development/2.5development/2.6development/2.7development/2.8development/2.9
You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:
@bert-e create_pull_requests
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:
-
@nicolast
-
@teddyandrieux
-
@alexandre-allard-scality
-
@jbwatenbergscality
-
@lucieleonard
-
@chengyanjin
-
@gdemonet
-
@thomasdanan
History mismatch
Merge commit #86ee8886dfda1c337f3609220f901ec9e2f8fb40 on the integration branch
w/2.11/bugfix/upgrade-shell-ui-version is merging a branch which is neither the current
branch bugfix/upgrade-shell-ui-version nor the development branch
development/2.11.
It is likely due to a rebase of the branch bugfix/upgrade-shell-ui-version 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.
Reset complete
I have successfully deleted this pull request's integration branches.
Integration data created
I have created the integration data for the additional destination branches.
- this pull request will merge
bugfix/upgrade-shell-ui-versionintodevelopment/2.10 - w/2.11/bugfix/upgrade-shell-ui-version will be merged into
development/2.11
The following branches will NOT be impacted:
development/2.0development/2.1development/2.2development/2.3development/2.4development/2.5development/2.6development/2.7development/2.8development/2.9
You can set option create_pull_requests if you need me to create
integration pull requests in addition to integration branches, with:
@bert-e create_pull_requests
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:
-
@nicolast
-
@teddyandrieux
-
@alexandre-allard-scality
-
@jbwatenbergscality
-
@lucieleonard
-
@chengyanjin
-
@gdemonet
-
@thomasdanan
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:
-
@nicolast
-
@teddyandrieux
-
@alexandre-allard-scality
-
@jbwatenbergscality
-
@lucieleonard
-
@chengyanjin
-
@gdemonet
-
@thomasdanan
The following reviewers are expecting changes from the author, or must review again:
- @gdemonet