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

[release-v1.10] Sync upstream release #106

Merged
merged 3 commits into from
Oct 12, 2023

Conversation

github-actions[bot]
Copy link

Sync upstream release

@openshift-ci
Copy link

openshift-ci bot commented Oct 12, 2023

Hi @github-actions[bot]. Thanks for your PR.

I'm waiting for a openshift-knative member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@ReToCode
Copy link
Member

/ok-to-test

@ReToCode
Copy link
Member

We do not want that change in our fork: https://github.com/openshift-knative/net-kourier/actions/runs/6492840467/job/17632564714?pr=106

/override "verify / Verify Deps and Codegen"

@openshift-ci
Copy link

openshift-ci bot commented Oct 12, 2023

@ReToCode: Overrode contexts on behalf of ReToCode: verify / Verify Deps and Codegen

In response to this:

We do not want that change in our fork: https://github.com/openshift-knative/net-kourier/actions/runs/6492840467/job/17632564714?pr=106

/override "verify / Verify Deps and Codegen"

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.

knative.dev/networking v0.0.0-20230419144338-e5d04e805e50
knative.dev/pkg v0.0.0-20230418073056-dfad48eaa5d0
knative.dev/networking v0.0.0-20231012063223-0b0f2107abef
knative.dev/pkg v0.0.0-20231011201526-df28feae6d34
Copy link

Choose a reason for hiding this comment

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

This contains the fix right? Same for networking?

Copy link
Member

Choose a reason for hiding this comment

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

Yes, networking 1.10 commit is https://github.com/knative/networking/commits/release-1.10 (0b0f2107abefcf776c72e1325678f0a33b9b45ef)

@skonto
Copy link

skonto commented Oct 12, 2023

@ReToCode do you know why #106 (comment) was not required for net-istio?

Changes in vendor/knative.dev/pkg/environment/client_config.go were not propagated to net-istio 1.10?

@ReToCode
Copy link
Member

Changes in vendor/knative.dev/pkg/environment/client_config.go were not propagated to net-istio 1.10?

AFAIK, I don't think we have the changes in net-istio at all. As what we have in net-kourier is a patch we added, right? Maybe we are missing a git patch for those changes here, so that the diff occurs at all?

our net-istio is like upstream net-istio: https://github.com/openshift-knative/net-istio/blob/release-v1.10/vendor/knative.dev/pkg/environment/client_config.go#L45

@ReToCode
Copy link
Member

We do have the patch, maybe it is not applied in that verify script in this branch somehow? No idea, but we do not want the upstream version, so should be fine?

@skonto
Copy link

skonto commented Oct 12, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Oct 12, 2023
@openshift-ci
Copy link

openshift-ci bot commented Oct 12, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: github-actions[bot], skonto

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

@skonto
Copy link

skonto commented Oct 12, 2023

Correct it is not applied I am wondering if istio has such patch. It seems it was not udpated: https://github.com/openshift-knative/net-istio/blob/release-v1.10/vendor/knative.dev/pkg/environment/client_config.go

@openshift-ci openshift-ci bot merged commit 4ab2c10 into release-v1.10 Oct 12, 2023
28 of 29 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants