Update istio #394
Update istio #394
Conversation
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: mholder6 The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
.gitignore
Outdated
| @@ -75,3 +75,6 @@ docker-compose.yml | |||
|
|
|||
| # Istio installer downloaded by quick install | |||
| istio-* | |||
|
|
|||
| #Notes on how different versions of the repo | |||
go.mod
Outdated
| @@ -58,7 +58,11 @@ require ( | |||
| github.com/evanphx/json-patch/v5 v5.7.0 // indirect | |||
| github.com/go-kit/log v0.2.1 // indirect | |||
| github.com/go-logfmt/logfmt v0.6.0 // indirect | |||
| <<<<<<< HEAD | |||
go.sum
Outdated
| @@ -14,6 +14,7 @@ cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKV | |||
| cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= | |||
| cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= | |||
| cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= | |||
| <<<<<<< HEAD | |||
There was a problem hiding this comment.
in this file, to fix the conflict, you can remove everything and run go mod tidy .
| @@ -1333,7 +1333,6 @@ func schema_pkg_apis_serving_v1alpha1_SupportedModelFormat(ref common.ReferenceC | |||
| }, | |||
| }, | |||
| }, | |||
|
|
|||
There was a problem hiding this comment.
remove this file from your changes.
Signed-off-by: mholder6 <[email protected]>
|
/retest |
|
PR needs rebase. 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. |
|
@mholder6 looks like it is a dupe, closing it. |
What this PR does / why we need it:
Updated istio versioning based off of go version 1.21 cherry picked from upstream
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):Fixes #
Type of changes
Please delete options that are not relevant.
Feature/Issue validation/testing:
Please describe the tests that you ran to verify your changes and relevant result summary. Provide instructions so it can be reproduced.
Please also list any relevant details for your test configuration.
Test A
Test B
Logs
Special notes for your reviewer:
Checklist:
Release note:
Re-running failed tests
/rerun-all- rerun all failed workflows./rerun-workflow <workflow name>- rerun a specific failed workflow. Only one workflow name can be specified. Multiple /rerun-workflow commands are allowed per comment.