Skip to content

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

Open
openshift-service-mesh-bot wants to merge 5 commits intoopenshift-service-mesh:masterfrom
openshift-service-mesh-bot:none-master-merge_upstream_istio_master-6253864e
Open

Automator: merge upstream changes to openshift-service-mesh/istio@master#649
openshift-service-mesh-bot wants to merge 5 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-10T05:04:58+00:00

nagendrareddy10 and others added 5 commits March 8, 2026 22:11
* Do not run Envoy in Prometheus TLS sidecar mode

Add commented-out configuration for lightweight TLS cert provisioning
using DISABLE_ENVOY=true and OUTPUT_CERTS in Prometheus addon manifests.
This allows Prometheus to scrape application metrics in Strict mTLS mode
without running a full Envoy sidecar - only pilot-agent is needed to
provision certificates.

Updated files:
- samples/addons/prometheus.yaml: Added TLS annotations, cert volume,
  and volumeMount as commented-out blocks.
- manifests/addons/values-prometheus.yaml: Added equivalent Helm values
  as commented-out podAnnotations.

Fixes #34768

* build: merge generated prometheus.yaml

---------

Co-authored-by: Nagendra Reddy <nagendrareddy10@users.noreply.github.com>
… (#58493)

* `istioctl`: Add JSON/YAML output options to `proxy-status` subcommand

* `XdsStatusWriter`: Fix tests, make use of existing test helper

* `XdsStatusWriter`: Use stable JSON serialization method
* [agw] Agentgateway gateway and listenerSet collections

Signed-off-by: Jackie Elliott <jaellio@microsoft.com>

* Rebased and created seperate class maps for gateway and
agentgateway

Signed-off-by: Jackie Elliott <jaellio@microsoft.com>

* Cleanup some TODOs

Signed-off-by: Jackie Elliott <jaellio@microsoft.com>

* fix lint

Signed-off-by: Jackie Elliott <jaellio@microsoft.com>

* fix gen

Signed-off-by: Jackie Elliott <jaellio@microsoft.com>

* Address PR feedback

Signed-off-by: Jackie Elliott <jaellio@microsoft.com>

---------

Signed-off-by: Jackie Elliott <jaellio@microsoft.com>
* feat: istio-discovery template supports IPv6 remotePilotAddress

Signed-off-by: 王然 <ranwang@alauda.io>

* fix: make gen

Signed-off-by: 王然 <ranwang@alauda.io>

* feat: add IPv6 remotePilotAddress unit test

Signed-off-by: 王然 <ranwang@alauda.io>

* feat: merge master and add nolint:unparam

Signed-off-by: 王然 <ranwang@alauda.io>

---------

Signed-off-by: 王然 <ranwang@alauda.io>
* upstream/master:
  feat: istio-discovery template supports IPv6 remotePilotAddress (#58828)
  [agw] Agentgateway gateway and listenerSet collections  (#59258)
  `istioctl`: Add JSON/YAML output options to `proxy-status` subcommand (#58493)
  Do not run Envoy in Prometheus TLS sidecar mode (#59149)
@MaxBab
Copy link
Contributor

MaxBab commented Mar 10, 2026

/retest

@openshift-ci
Copy link

openshift-ci bot commented Mar 10, 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-ambient 4f5e28c link true /test istio-integration-sail-ambient
ci/prow/istio-integration-sail-security 4f5e28c link true /test istio-integration-sail-security
ci/prow/istio-integration-ambient 4f5e28c link true /test istio-integration-ambient
ci/prow/istio-integration-helm 4f5e28c link true /test istio-integration-helm
ci/prow/istio-integration-pilot 4f5e28c link true /test istio-integration-pilot
ci/prow/istio-integration-sail-pilot 4f5e28c link true /test istio-integration-sail-pilot
ci/prow/istio-integration-sail-telemetry 4f5e28c link true /test istio-integration-sail-telemetry
ci/prow/istio-integration-security 4f5e28c link true /test istio-integration-security
ci/prow/unit-and-gencheck 4f5e28c link true /test unit-and-gencheck
ci/prow/gencheck 4f5e28c link true /test gencheck
ci/prow/istio-integration-telemetry 4f5e28c link true /test istio-integration-telemetry

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