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.

Sign up for GitHub

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

Jump to bottom

integrate konflux-ui with namespace-lister #5297

Merged
merged 9 commits into from
Jan 22, 2025
Merged

integrate konflux-ui with namespace-lister #5297

merged 9 commits into from
Jan 22, 2025

Conversation

filariow
Copy link
Member

Signed-off-by: Francesco Ilario [email protected]

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jan 16, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@filariow filariow force-pushed the integrate-namespace-lister-ui branch from b9960bb to 79c08ab Compare January 16, 2025 14:09
@filariow
Copy link
Member Author

/hold

@filariow filariow marked this pull request as ready for review January 16, 2025 14:15
@filariow filariow requested a review from gbenhaim January 16, 2025 14:16
gbenhaim
gbenhaim requested changes Jan 16, 2025
View reviewed changes
components/konflux-ui/staging/base/proxy/nginx.conf Outdated Show resolved Hide resolved
components/konflux-ui/staging/base/proxy/nginx.conf Show resolved Hide resolved
components/konflux-ui/staging/base/proxy/nginx.conf Outdated Show resolved Hide resolved
components/konflux-ui/staging/base/proxy/nginx.conf Outdated
@@ -161,6 +161,24 @@ http {
include /mnt/nginx-generated-config/bearer.conf;
}

location ~* /api/v1/namespaces(/?)$ {
Copy link
Member

Choose a reason for hiding this comment

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

the ui prefixes requests to the k8s api with /api/k8s/

components/konflux-ui/staging/base/proxy/nginx.conf Outdated Show resolved Hide resolved
@filariow filariow requested a review from gbenhaim January 16, 2025 15:35
sadlerap
sadlerap reviewed Jan 16, 2025
View reviewed changes
Copy link
Contributor

@sadlerap sadlerap left a comment

Choose a reason for hiding this comment

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

lgtm, please fix merge conflicts

@filariow
Copy link
Member Author

@sadlerap thanks for merging the conflicts

@sadlerap
Copy link
Contributor

/retest

@filariow filariow force-pushed the integrate-namespace-lister-ui branch from 7c062c9 to 539b099 Compare January 16, 2025 17:31
@filariow filariow force-pushed the integrate-namespace-lister-ui branch from a062b59 to 38ff1ef Compare January 16, 2025 18:38
sadlerap
sadlerap reviewed Jan 17, 2025
View reviewed changes
Copy link
Contributor

@sadlerap sadlerap left a comment

Choose a reason for hiding this comment

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

Looks okay, but there's a merge conflict that can't be resolved from github's web interface.

@filariow
integrate konflux-ui with namespace-lister
abba7d9 
Signed-off-by: Francesco Ilario <[email protected]>
@filariow
address review comments
52dccc3 
Signed-off-by: Francesco Ilario <[email protected]>
@filariow
fix rewrite rule
d5b8528 
Signed-off-by: Francesco Ilario <[email protected]>
@filariow
Update components/konflux-ui/staging/base/proxy/nginx.conf
e88b16f
@filariow
fix nginx.conf
25b72ee 
Signed-off-by: Francesco Ilario <[email protected]>
@filariow
rollback tls changes
c56966a 
Signed-off-by: Francesco Ilario <[email protected]>
@filariow
fix nginx.conf
2d29e53 
Signed-off-by: Francesco Ilario <[email protected]>
@filariow filariow force-pushed the integrate-namespace-lister-ui branch from f72882d to 2d29e53 Compare January 20, 2025 09:35
@filariow filariow requested a review from gbenhaim January 20, 2025 11:29
@filariow
Copy link
Member Author

/unhold

sadlerap
sadlerap reviewed Jan 20, 2025
View reviewed changes
Copy link
Contributor

@sadlerap sadlerap left a comment

Choose a reason for hiding this comment

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

With the suggestion by @gbenhaim, lgtm

@filariow
fix try_files to @namedlocation
af8f275 
Signed-off-by: Francesco Ilario <[email protected]>
@gbenhaim
Copy link
Member

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm label Jan 21, 2025
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Jan 21, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: filariow, gbenhaim, sadlerap

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@gbenhaim
Copy link
Member

/test appstudio-e2e-tests

1 similar comment
@filariow
Copy link
Member Author

/test appstudio-e2e-tests

@sadlerap
Copy link
Contributor

/retest

@filariow
Copy link
Member Author

/test appstudio-e2e-tests

@openshift-merge-bot openshift-merge-bot bot merged commit 5619fc0 into redhat-appstudio:main Jan 22, 2025
6 checks passed
@filariow filariow deleted the integrate-namespace-lister-ui branch January 22, 2025 09:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sadlerap sadlerap sadlerap approved these changes

@gbenhaim gbenhaim gbenhaim requested changes

@dperaza4dustbit dperaza4dustbit Awaiting requested review from dperaza4dustbit

Assignees

@gbenhaim gbenhaim

Labels
approved lgtm
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@filariow @sadlerap @gbenhaim