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

fix: Barbican use same uwsgi config as other services. #1119

Merged
merged 4 commits into from
Apr 21, 2024

Conversation

ricolin
Copy link
Member

@ricolin ricolin commented Apr 16, 2024

This renew Barbican uwsgi config and make sure it uses same uwsgi config as other services.

relate to #42

@ricolin ricolin force-pushed the barbican-uwsgi-use-alias-config branch 2 times, most recently from f682c7a to 5957c86 Compare April 16, 2024 12:41
@ricolin ricolin requested a review from mnaser April 16, 2024 13:14
Copy link
Member

@mnaser mnaser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ricolin

Two issues with this change

  1. I have no idea how the CI didn't catch that there wasn't a patch included.. it should have failed because there is a missing patch.
  2. We either need to push this upstream and add it as a patch into .charts.yml or add it as a local patch.

@mnaser
Copy link
Member

mnaser commented Apr 16, 2024

/cherry-pick stable/zed

@vexxhost-bot
Copy link
Collaborator

@mnaser: once the present PR merges, I will cherry-pick it on top of stable/zed in a new PR and assign it to you.

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/test-infra repository.

@ricolin
Copy link
Member Author

ricolin commented Apr 17, 2024

@ricolin

Two issues with this change

  1. I have no idea how the CI didn't catch that there wasn't a patch included.. it should have failed because there is a missing patch.
  2. We either need to push this upstream and add it as a patch into .charts.yml or add it as a local patch.

No problem, I was targeting of shift it to upstream once we approve it, but let me link from path now

@ricolin ricolin force-pushed the barbican-uwsgi-use-alias-config branch 2 times, most recently from b83825c to e1c2450 Compare April 17, 2024 05:12
@ricolin ricolin force-pushed the barbican-uwsgi-use-alias-config branch from e1c2450 to e36bdf6 Compare April 17, 2024 14:34
@ricolin ricolin requested a review from mnaser April 17, 2024 14:34
@ricolin ricolin force-pushed the barbican-uwsgi-use-alias-config branch from e36bdf6 to 5253012 Compare April 17, 2024 15:19
Copy link
Member

@mnaser mnaser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mnaser mnaser linked an issue Apr 17, 2024 that may be closed by this pull request
@ricolin ricolin force-pushed the barbican-uwsgi-use-alias-config branch from 8139606 to 0ea151a Compare April 18, 2024 05:46
@mnaser mnaser force-pushed the barbican-uwsgi-use-alias-config branch from 0ea151a to c839b46 Compare April 19, 2024 00:03
@mnaser
Copy link
Member

mnaser commented Apr 19, 2024

@ricolin Since we are actually using backports now and have stable branches, we're trying to avoid bumps on master branch for changes that would be backported (such as this one).

We can have another seperate PR for the bump that we would not backport

@mnaser
Copy link
Member

mnaser commented Apr 19, 2024

recheck

@ricolin
Copy link
Member Author

ricolin commented Apr 19, 2024

@ricolin Since we are actually using backports now and have stable branches, we're trying to avoid bumps on master branch for changes that would be backported (such as this one).

We can have another seperate PR for the bump that we would not backport

I just put them to here now #1136

@mnaser mnaser added the gate label Apr 19, 2024
@mnaser
Copy link
Member

mnaser commented Apr 19, 2024

regate

2 similar comments
@mnaser
Copy link
Member

mnaser commented Apr 21, 2024

regate

@mnaser
Copy link
Member

mnaser commented Apr 21, 2024

regate

@mnaser mnaser added gate and removed gate labels Apr 21, 2024
@mnaser
Copy link
Member

mnaser commented Apr 21, 2024

regate

@atmosphere-ci atmosphere-ci bot merged commit 36e65de into main Apr 21, 2024
7 checks passed
@atmosphere-ci atmosphere-ci bot deleted the barbican-uwsgi-use-alias-config branch April 21, 2024 16:08
@vexxhost-bot
Copy link
Collaborator

@mnaser: #1119 failed to apply on top of branch "stable/zed":

Applying: fix: Barbican use same uwsgi config as other services
Using index info to reconstruct a base tree...
M	.charts.yml
Falling back to patching base and 3-way merge...
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: Barbican use same uwsgi config as other services
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/test-infra repository.

@vexxhost-bot
Copy link
Collaborator

@mnaser: new issue created for failed cherrypick: #1144

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/test-infra repository.

mnaser pushed a commit that referenced this pull request Apr 21, 2024
This renew Barbican uwsgi config and make sure it uses same uwsgi config as other services.
relate to #42

Reviewed-by: Mohammed Naser <[email protected]>
atmosphere-ci bot pushed a commit that referenced this pull request Apr 21, 2024
…1146)

Refactor + pin helm-toolkit (#1124)
fix: Barbican use same uwsgi config as other services. (#1119)

Closes #1144
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.

fr: update uwsgi in barbican
3 participants