Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ATMOSPHERE-584] Fix the number of max active fernet keys in Keystone #2109

Merged
merged 1 commit into from
Nov 12, 2024

Conversation

okozachenko1203
Copy link
Member

@mnaser mnaser added the gate label Nov 12, 2024
@atmosphere-ci atmosphere-ci bot merged commit 3b80011 into main Nov 12, 2024
7 checks passed
@atmosphere-ci atmosphere-ci bot deleted the fix-keystone-fernet-keys branch November 12, 2024 05:44
@okozachenko1203
Copy link
Member Author

/cherry-pick stable/2024.1

@okozachenko1203
Copy link
Member Author

/cherry-pick stable/2023.2

@okozachenko1203
Copy link
Member Author

/cherry-pick stable/2023.1

@okozachenko1203
Copy link
Member Author

/cherry-pick stable/zed

@vexxhost-bot
Copy link
Collaborator

@okozachenko1203: #2109 failed to apply on top of branch "stable/2024.1":

Applying: Fix the number of max active fernet keys in Keystone
Using index info to reconstruct a base tree...
M	.charts.yml
M	charts/keystone/Chart.yaml
M	charts/keystone/templates/bin/_cred-clean.py.tpl
M	charts/keystone/templates/bin/_endpoint-update.py.tpl
M	charts/keystone/values.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/keystone/values.yaml
Auto-merging charts/keystone/templates/bin/_endpoint-update.py.tpl
CONFLICT (content): Merge conflict in charts/keystone/templates/bin/_endpoint-update.py.tpl
Auto-merging charts/keystone/templates/bin/_cred-clean.py.tpl
CONFLICT (content): Merge conflict in charts/keystone/templates/bin/_cred-clean.py.tpl
Auto-merging charts/keystone/Chart.yaml
CONFLICT (content): Merge conflict in charts/keystone/Chart.yaml
Auto-merging .charts.yml
CONFLICT (content): Merge conflict in .charts.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix the number of max active fernet keys in Keystone
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick stable/2024.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@okozachenko1203: new issue created for failed cherrypick: #2115

In response to this:

/cherry-pick stable/2024.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@okozachenko1203: #2109 failed to apply on top of branch "stable/2023.2":

Applying: Fix the number of max active fernet keys in Keystone
Using index info to reconstruct a base tree...
M	.charts.yml
M	charts/keystone/Chart.yaml
M	charts/keystone/templates/bin/_cred-clean.py.tpl
M	charts/keystone/templates/bin/_endpoint-update.py.tpl
M	charts/keystone/values.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/keystone/values.yaml
Auto-merging charts/keystone/templates/bin/_endpoint-update.py.tpl
CONFLICT (content): Merge conflict in charts/keystone/templates/bin/_endpoint-update.py.tpl
Auto-merging charts/keystone/templates/bin/_cred-clean.py.tpl
CONFLICT (content): Merge conflict in charts/keystone/templates/bin/_cred-clean.py.tpl
Auto-merging charts/keystone/Chart.yaml
CONFLICT (content): Merge conflict in charts/keystone/Chart.yaml
Auto-merging .charts.yml
CONFLICT (content): Merge conflict in .charts.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix the number of max active fernet keys in Keystone
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick stable/2023.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@okozachenko1203: new issue created for failed cherrypick: #2116

In response to this:

/cherry-pick stable/2023.2

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@okozachenko1203: #2109 failed to apply on top of branch "stable/2023.1":

Applying: Fix the number of max active fernet keys in Keystone
Using index info to reconstruct a base tree...
M	.charts.yml
M	charts/keystone/Chart.yaml
M	charts/keystone/templates/bin/_cred-clean.py.tpl
M	charts/keystone/templates/bin/_endpoint-update.py.tpl
M	charts/keystone/values.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/keystone/values.yaml
Auto-merging charts/keystone/templates/bin/_endpoint-update.py.tpl
CONFLICT (content): Merge conflict in charts/keystone/templates/bin/_endpoint-update.py.tpl
Auto-merging charts/keystone/templates/bin/_cred-clean.py.tpl
CONFLICT (content): Merge conflict in charts/keystone/templates/bin/_cred-clean.py.tpl
Auto-merging charts/keystone/Chart.yaml
CONFLICT (content): Merge conflict in charts/keystone/Chart.yaml
Auto-merging .charts.yml
CONFLICT (content): Merge conflict in .charts.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix the number of max active fernet keys in Keystone
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick stable/2023.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@okozachenko1203: new issue created for failed cherrypick: #2117

In response to this:

/cherry-pick stable/2023.1

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@okozachenko1203: #2109 failed to apply on top of branch "stable/zed":

Applying: Fix the number of max active fernet keys in Keystone
Using index info to reconstruct a base tree...
M	.charts.yml
M	charts/keystone/Chart.yaml
M	charts/keystone/templates/bin/_cred-clean.py.tpl
M	charts/keystone/templates/bin/_endpoint-update.py.tpl
M	charts/keystone/values.yaml
Falling back to patching base and 3-way merge...
Auto-merging charts/keystone/values.yaml
Auto-merging charts/keystone/templates/bin/_endpoint-update.py.tpl
CONFLICT (content): Merge conflict in charts/keystone/templates/bin/_endpoint-update.py.tpl
Auto-merging charts/keystone/templates/bin/_cred-clean.py.tpl
CONFLICT (content): Merge conflict in charts/keystone/templates/bin/_cred-clean.py.tpl
Auto-merging charts/keystone/Chart.yaml
CONFLICT (content): Merge conflict in charts/keystone/Chart.yaml
Auto-merging .charts.yml
CONFLICT (content): Merge conflict in .charts.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix the number of max active fernet keys in Keystone
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick stable/zed

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@vexxhost-bot
Copy link
Collaborator

@okozachenko1203: new issue created for failed cherrypick: #2118

In response to this:

/cherry-pick stable/zed

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants