Skip to content

Automator: merge upstream changes to openshift-service-mesh/istio@master#646

Merged
openshift-merge-bot[bot] merged 6 commits intoopenshift-service-mesh:masterfrom
openshift-service-mesh-bot:none-master-merge_upstream_istio_master-6253864e
Mar 9, 2026
Merged

Automator: merge upstream changes to openshift-service-mesh/istio@master#646
openshift-merge-bot[bot] merged 6 commits intoopenshift-service-mesh:masterfrom
openshift-service-mesh-bot:none-master-merge_upstream_istio_master-6253864e

Conversation

@openshift-service-mesh-bot

Generated by Automator - 2026-03-09T05:07:15+00:00

nagendrareddy10 and others added 6 commits March 6, 2026 04:49
* test: replace time.Sleep with retry loops in jwks_resolver_test

Replace two time.Sleep calls in jwks_resolver_test.go with proper
event-driven retry loops to reduce unnecessary wait times:

1. verifyKeyLastRefreshedTime: replaced time.Sleep(200ms) with
   retry.UntilSuccessOrFail polling loop (5ms interval) that exits
   as soon as the refresh timestamp changes (or doesn't).

2. TestJwtPubKeyRefreshedWhenErrorsGettingOtherURLs: replaced
   time.Sleep(2*refreshInterval) with retry.UntilOrFail polling loop
   that exits as soon as the expected JwtPubKey2 is returned.

These tests were listed in istio/istio#37555
as taking 1.25s and 1.06s respectively due to the fixed sleeps.
With retry-based polling, they will complete as soon as the condition
is met rather than always waiting the full sleep duration.

Resolves part of: istio/istio#37555

* test: fix review comments - remove dead code and fix false-positive in wantChanged=false

- Remove dead code after retry.UntilOrFail in TestJwtPubKeyRefreshedWhenErrorsGettingOtherURLs
  (err==nil and pk==JwtPubKey2 are already guaranteed by a successful retry loop)
- Fix false-positive in verifyKeyLastRefreshedTime when wantChanged=false:
  wait for at least one refresh cycle (via refreshJobKeyChangedCount /
  refreshJobFetchFailedCount) before asserting the timestamp did not change

---------

Co-authored-by: Nagendra Reddy <nagendrareddy10@users.noreply.github.com>
This is useful for tests which dump the index output
* fix: make wasm OCI image binary size limit configurable via env var

* Move ISTIO_WASM_OCI_MAX_BINARY_SIZE_BYTES  env var to pilot/pkg/features

* add release note for wasm OCI image binary size limit configuration

* Apply configurable wasm binary size limit to extractOCIArtifactImage as well

* use int64 to match io.LimitReader signature

* Apply pilot feature to httpfetcher wasm binary size limit
* upstream/master:
  Automator: update proxy@master in istio/istio@master (#59336)
  Automator: update go-control-plane in istio/istio@master (#59354)
  Allow configuring wasm binary size limit via pilot env var (#59335)
  krt: allow listing index collection (#59342)
  test: replace time.Sleep with retry loops in jwks_resolver_test (#59246)
@MaxBab
Copy link
Contributor

MaxBab commented Mar 9, 2026

/retest

@openshift-merge-bot openshift-merge-bot bot merged commit 03d195c into openshift-service-mesh:master Mar 9, 2026
14 checks passed
@openshift-ci
Copy link

openshift-ci bot commented Mar 9, 2026

@openshift-service-mesh-bot: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/istio-integration-sail-telemetry 040b939 link unknown /test istio-integration-sail-telemetry
ci/prow/unit-and-gencheck 040b939 link unknown /test unit-and-gencheck

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

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.

6 participants