Skip to content

Fix serves metrics securely test#1860

Merged
istio-testing merged 1 commit into
istio-ecosystem:mainfrom
mkralik3:fixMetricsTest
Apr 21, 2026
Merged

Fix serves metrics securely test#1860
istio-testing merged 1 commit into
istio-ecosystem:mainfrom
mkralik3:fixMetricsTest

Conversation

@mkralik3
Copy link
Copy Markdown
Contributor

What type of PR is this?

  • Enhancement / New Feature
  • Bug Fix
  • Refactor
  • Optimization
  • Test
  • Documentation Update

What this PR does / why we need it:

It fixes the hard-coded cluster role name sailoperator-metrics-reader in serves metrics securely test. The cluster role name may vary since it is dynamically created {{ .Values.name }}-metrics-reader

Which issue(s) this PR fixes:

Fixes: #1858

Related Issue/PR #

Additional information:

It fixes the hard-coded cluster role name sailoperator-metrics-reader in serves metrics securely test. The cluster role name may vary since it is dynamically created {{ .Values.name }}-metrics-reader

Signed-off-by: mkralik3 <mkralik@redhat.com>
@codecov
Copy link
Copy Markdown

codecov Bot commented Apr 21, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 80.57%. Comparing base (791b725) to head (fcf65a4).
⚠️ Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1860      +/-   ##
==========================================
+ Coverage   80.22%   80.57%   +0.35%     
==========================================
  Files          51       51              
  Lines        2569     2569              
==========================================
+ Hits         2061     2070       +9     
+ Misses        385      379       -6     
+ Partials      123      120       -3     
Flag Coverage Δ
integration-tests 72.03% <ø> (+0.26%) ⬆️
unit-tests 51.84% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@istio-testing istio-testing merged commit 4038914 into istio-ecosystem:main Apr 21, 2026
17 checks passed
@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: #1860 failed to apply on top of branch "release-1.26":

Applying: Fix serves metrics securely test
Using index info to reconstruct a base tree...
M	tests/e2e/operator/operator_install_test.go
M	tests/e2e/util/kubectl/kubectl.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/util/kubectl/kubectl.go
Auto-merging tests/e2e/operator/operator_install_test.go
CONFLICT (content): Merge conflict in tests/e2e/operator/operator_install_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix serves metrics securely test

@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: new issue created for failed cherrypick: #1861

@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: #1860 failed to apply on top of branch "release-1.27":

Applying: Fix serves metrics securely test
Using index info to reconstruct a base tree...
M	tests/e2e/operator/operator_install_test.go
M	tests/e2e/util/kubectl/kubectl.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/util/kubectl/kubectl.go
Auto-merging tests/e2e/operator/operator_install_test.go
CONFLICT (content): Merge conflict in tests/e2e/operator/operator_install_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix serves metrics securely test

@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: new issue created for failed cherrypick: #1862

@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: #1860 failed to apply on top of branch "release-1.28":

Applying: Fix serves metrics securely test
Using index info to reconstruct a base tree...
M	tests/e2e/operator/operator_install_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/operator/operator_install_test.go
CONFLICT (content): Merge conflict in tests/e2e/operator/operator_install_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix serves metrics securely test

@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: new issue created for failed cherrypick: #1863

@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: #1860 failed to apply on top of branch "release-1.29":

Applying: Fix serves metrics securely test
Using index info to reconstruct a base tree...
M	tests/e2e/cleanup-ocp.sh
M	tests/e2e/operator/operator_install_test.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/operator/operator_install_test.go
CONFLICT (content): Merge conflict in tests/e2e/operator/operator_install_test.go
Auto-merging tests/e2e/cleanup-ocp.sh
CONFLICT (content): Merge conflict in tests/e2e/cleanup-ocp.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Fix serves metrics securely test

@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: new issue created for failed cherrypick: #1864

openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Apr 22, 2026
* upstream/main: (26 commits)
  Sync min tls version from `TLSConfig` to `Istio` (istio-ecosystem#1859)
  Fix serves metrics securely test (istio-ecosystem#1860)
  refactor: vendor kubernetes manifests into the repo (istio-ecosystem#1853)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1856)
  Modify "download-charts" script for alpha/beta releases (istio-ecosystem#1852)
  Add operator `TLSConfig` and sync with APIServer TLS profile on openshift (istio-ecosystem#1513)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1851)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1850)
  Add documentation for resource customization (istio-ecosystem#1292)
  refactor error and status condition handling (istio-ecosystem#1807)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1848)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1845)
  feat: add targetRef field to ZTunnel CRD (istio-ecosystem#1259)
  Add 1.29.2 and 1.28.6 versions (istio-ecosystem#1844)
  Use typed Go structs for FIPS values instead of helm.Values (istio-ecosystem#1695)
  Add helm.sh/helm/v3 to license allowlist alongside v4 (istio-ecosystem#1840)
  Update getLatestVersionByPrefix helm to v4 on update_deps.sh (istio-ecosystem#1833)
  Update kustomization files with registry.istio.io (istio-ecosystem#1829)
  Improve testing images tags for OLM and Operator images (istio-ecosystem#1819)
  Automator: Update EOL Istio versions in istio-ecosystem/sail-operator@main (istio-ecosystem#1821)
  ...
mkralik3 added a commit to mkralik3/sail-operator that referenced this pull request Apr 22, 2026
It fixes the hard-coded cluster role name sailoperator-metrics-reader in serves metrics securely test. The cluster role name may vary since it is dynamically created {{ .Values.name }}-metrics-reader

Signed-off-by: mkralik3 <mkralik@redhat.com>
istio-testing pushed a commit that referenced this pull request Apr 22, 2026
It fixes the hard-coded cluster role name sailoperator-metrics-reader in serves metrics securely test. The cluster role name may vary since it is dynamically created {{ .Values.name }}-metrics-reader

Signed-off-by: mkralik3 <mkralik@redhat.com>
istio-testing pushed a commit that referenced this pull request Apr 22, 2026
It fixes the hard-coded cluster role name sailoperator-metrics-reader in serves metrics securely test. The cluster role name may vary since it is dynamically created {{ .Values.name }}-metrics-reader

Signed-off-by: mkralik3 <mkralik@redhat.com>
istio-testing pushed a commit that referenced this pull request Apr 22, 2026
* fix: use operator name as prefix in metrics-reader clusterrole. (#1762)

Signed-off-by: riccardo1991 <riccardo1991@users.noreply.github.com>

* Fix serves metrics securely test (#1860)

It fixes the hard-coded cluster role name sailoperator-metrics-reader in serves metrics securely test. The cluster role name may vary since it is dynamically created {{ .Values.name }}-metrics-reader

Signed-off-by: mkralik3 <mkralik@redhat.com>

---------

Signed-off-by: riccardo1991 <riccardo1991@users.noreply.github.com>
Signed-off-by: mkralik3 <mkralik@redhat.com>
Co-authored-by: riccardo1991 <riccardo1991@users.noreply.github.com>
istio-testing pushed a commit that referenced this pull request Apr 22, 2026
It fixes the hard-coded cluster role name sailoperator-metrics-reader in serves metrics securely test. The cluster role name may vary since it is dynamically created {{ .Values.name }}-metrics-reader

Signed-off-by: mkralik3 <mkralik@redhat.com>
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Apr 22, 2026
* upstream/release-1.28:
  Fix serves metrics securely test (istio-ecosystem#1860) (istio-ecosystem#1867)
openshift-merge-bot Bot pushed a commit to openshift-service-mesh/sail-operator that referenced this pull request Apr 22, 2026
It fixes the hard-coded cluster role name sailoperator-metrics-reader in serves metrics securely test. The cluster role name may vary since it is dynamically created {{ .Values.name }}-metrics-reader

Signed-off-by: mkralik3 <mkralik@redhat.com>
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Apr 22, 2026
* upstream/release-1.27:
  Fix serves metrics securely test (istio-ecosystem#1860) (istio-ecosystem#1866)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Apr 22, 2026
* upstream/release-1.26:
  Fix serves metrics securely test (istio-ecosystem#1860) (istio-ecosystem#1865)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Apr 23, 2026
* upstream/release-1.26:
  Fix serves metrics securely test (istio-ecosystem#1860) (istio-ecosystem#1865)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Apr 23, 2026
* upstream/release-1.27:
  Fix serves metrics securely test (istio-ecosystem#1860) (istio-ecosystem#1866)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Apr 23, 2026
* upstream/main: (27 commits)
  Using crane instead of skopeo which is not available in the build-tools (istio-ecosystem#1870)
  Sync min tls version from `TLSConfig` to `Istio` (istio-ecosystem#1859)
  Fix serves metrics securely test (istio-ecosystem#1860)
  refactor: vendor kubernetes manifests into the repo (istio-ecosystem#1853)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1856)
  Modify "download-charts" script for alpha/beta releases (istio-ecosystem#1852)
  Add operator `TLSConfig` and sync with APIServer TLS profile on openshift (istio-ecosystem#1513)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1851)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1850)
  Add documentation for resource customization (istio-ecosystem#1292)
  refactor error and status condition handling (istio-ecosystem#1807)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1848)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1845)
  feat: add targetRef field to ZTunnel CRD (istio-ecosystem#1259)
  Add 1.29.2 and 1.28.6 versions (istio-ecosystem#1844)
  Use typed Go structs for FIPS values instead of helm.Values (istio-ecosystem#1695)
  Add helm.sh/helm/v3 to license allowlist alongside v4 (istio-ecosystem#1840)
  Update getLatestVersionByPrefix helm to v4 on update_deps.sh (istio-ecosystem#1833)
  Update kustomization files with registry.istio.io (istio-ecosystem#1829)
  Improve testing images tags for OLM and Operator images (istio-ecosystem#1819)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Apr 23, 2026
* upstream/release-1.27:
  Fix serves metrics securely test (istio-ecosystem#1860) (istio-ecosystem#1866)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Apr 24, 2026
* upstream/main: (31 commits)
  Update update-deps flow with 1.30 and remove 1.27 branch (istio-ecosystem#1875)
  tests: Skip TLS profile change test when is executed on Hosted clusters (istio-ecosystem#1873)
  Add 1.30.0-alpha.2 charts (istio-ecosystem#1854)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1872)
  Using crane instead of skopeo which is not available in the build-tools (istio-ecosystem#1870)
  Sync min tls version from `TLSConfig` to `Istio` (istio-ecosystem#1859)
  Fix serves metrics securely test (istio-ecosystem#1860)
  refactor: vendor kubernetes manifests into the repo (istio-ecosystem#1853)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1856)
  Modify "download-charts" script for alpha/beta releases (istio-ecosystem#1852)
  Add operator `TLSConfig` and sync with APIServer TLS profile on openshift (istio-ecosystem#1513)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1851)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1850)
  Add documentation for resource customization (istio-ecosystem#1292)
  refactor error and status condition handling (istio-ecosystem#1807)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1848)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1845)
  feat: add targetRef field to ZTunnel CRD (istio-ecosystem#1259)
  Add 1.29.2 and 1.28.6 versions (istio-ecosystem#1844)
  Use typed Go structs for FIPS values instead of helm.Values (istio-ecosystem#1695)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Apr 27, 2026
* upstream/main: (35 commits)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1886)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1884)
  Fixing two problems with our hack/update-istio.sh script (istio-ecosystem#1882)
  test: Modify await_operator to dinamically get deployment name from csv when OLM is true (istio-ecosystem#1874)
  Update update-deps flow with 1.30 and remove 1.27 branch (istio-ecosystem#1875)
  tests: Skip TLS profile change test when is executed on Hosted clusters (istio-ecosystem#1873)
  Add 1.30.0-alpha.2 charts (istio-ecosystem#1854)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1872)
  Using crane instead of skopeo which is not available in the build-tools (istio-ecosystem#1870)
  Sync min tls version from `TLSConfig` to `Istio` (istio-ecosystem#1859)
  Fix serves metrics securely test (istio-ecosystem#1860)
  refactor: vendor kubernetes manifests into the repo (istio-ecosystem#1853)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1856)
  Modify "download-charts" script for alpha/beta releases (istio-ecosystem#1852)
  Add operator `TLSConfig` and sync with APIServer TLS profile on openshift (istio-ecosystem#1513)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1851)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1850)
  Add documentation for resource customization (istio-ecosystem#1292)
  refactor error and status condition handling (istio-ecosystem#1807)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1848)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Apr 30, 2026
* upstream/main: (39 commits)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1896)
  Fix test docs test failure (istio-ecosystem#1890)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1892)
  Skip processing aliases referencing pre-released versions in EOL updater (istio-ecosystem#1883)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1886)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1884)
  Fixing two problems with our hack/update-istio.sh script (istio-ecosystem#1882)
  test: Modify await_operator to dinamically get deployment name from csv when OLM is true (istio-ecosystem#1874)
  Update update-deps flow with 1.30 and remove 1.27 branch (istio-ecosystem#1875)
  tests: Skip TLS profile change test when is executed on Hosted clusters (istio-ecosystem#1873)
  Add 1.30.0-alpha.2 charts (istio-ecosystem#1854)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1872)
  Using crane instead of skopeo which is not available in the build-tools (istio-ecosystem#1870)
  Sync min tls version from `TLSConfig` to `Istio` (istio-ecosystem#1859)
  Fix serves metrics securely test (istio-ecosystem#1860)
  refactor: vendor kubernetes manifests into the repo (istio-ecosystem#1853)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1856)
  Modify "download-charts" script for alpha/beta releases (istio-ecosystem#1852)
  Add operator `TLSConfig` and sync with APIServer TLS profile on openshift (istio-ecosystem#1513)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1851)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request May 1, 2026
* upstream/main: (41 commits)
  fix: handle repos with different release branch naming in crd-schema-checker (istio-ecosystem#1897)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1899)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1896)
  Fix test docs test failure (istio-ecosystem#1890)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1892)
  Skip processing aliases referencing pre-released versions in EOL updater (istio-ecosystem#1883)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1886)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1884)
  Fixing two problems with our hack/update-istio.sh script (istio-ecosystem#1882)
  test: Modify await_operator to dinamically get deployment name from csv when OLM is true (istio-ecosystem#1874)
  Update update-deps flow with 1.30 and remove 1.27 branch (istio-ecosystem#1875)
  tests: Skip TLS profile change test when is executed on Hosted clusters (istio-ecosystem#1873)
  Add 1.30.0-alpha.2 charts (istio-ecosystem#1854)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1872)
  Using crane instead of skopeo which is not available in the build-tools (istio-ecosystem#1870)
  Sync min tls version from `TLSConfig` to `Istio` (istio-ecosystem#1859)
  Fix serves metrics securely test (istio-ecosystem#1860)
  refactor: vendor kubernetes manifests into the repo (istio-ecosystem#1853)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1856)
  Modify "download-charts" script for alpha/beta releases (istio-ecosystem#1852)
  ...
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request May 4, 2026
* upstream/main: (41 commits)
  fix: handle repos with different release branch naming in crd-schema-checker (istio-ecosystem#1897)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1899)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1896)
  Fix test docs test failure (istio-ecosystem#1890)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1892)
  Skip processing aliases referencing pre-released versions in EOL updater (istio-ecosystem#1883)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1886)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1884)
  Fixing two problems with our hack/update-istio.sh script (istio-ecosystem#1882)
  test: Modify await_operator to dinamically get deployment name from csv when OLM is true (istio-ecosystem#1874)
  Update update-deps flow with 1.30 and remove 1.27 branch (istio-ecosystem#1875)
  tests: Skip TLS profile change test when is executed on Hosted clusters (istio-ecosystem#1873)
  Add 1.30.0-alpha.2 charts (istio-ecosystem#1854)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1872)
  Using crane instead of skopeo which is not available in the build-tools (istio-ecosystem#1870)
  Sync min tls version from `TLSConfig` to `Istio` (istio-ecosystem#1859)
  Fix serves metrics securely test (istio-ecosystem#1860)
  refactor: vendor kubernetes manifests into the repo (istio-ecosystem#1853)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1856)
  Modify "download-charts" script for alpha/beta releases (istio-ecosystem#1852)
  ...
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.

[BUG] Hardcoded Clusterrole name in serves metrics securely test

3 participants