Skip to content

Set DEPLOYMENT_NAME to csv name when OLM is true#1918

Merged
istio-testing merged 1 commit into
istio-ecosystem:mainfrom
fjglira:fix-deployment-name
May 7, 2026
Merged

Set DEPLOYMENT_NAME to csv name when OLM is true#1918
istio-testing merged 1 commit into
istio-ecosystem:mainfrom
fjglira:fix-deployment-name

Conversation

@fjglira
Copy link
Copy Markdown
Contributor

@fjglira fjglira commented May 7, 2026

This will avoid issues on the test while waiting for operator because will set DEPLOYMENT_NAME to the csv name used into fork test

What type of PR is this?

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

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Related Issue/PR #

Additional information:

This will avoid issues on the test while waiting for operator because will set DEPLOYMENT_NAME to the csv name used into fork test

Signed-off-by: Francisco Herrera <fjglira@gmail.com>
@fjglira fjglira requested a review from a team as a code owner May 7, 2026 16:32
@codecov
Copy link
Copy Markdown

codecov Bot commented May 7, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 80.71%. Comparing base (9fa65a1) to head (0e46df0).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1918   +/-   ##
=======================================
  Coverage   80.71%   80.71%           
=======================================
  Files          51       51           
  Lines        2598     2598           
=======================================
  Hits         2097     2097           
  Misses        380      380           
  Partials      121      121           
Flag Coverage Δ
integration-tests 71.77% <ø> (+0.13%) ⬆️
unit-tests 52.30% <ø> (ø)

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 9a08acd into istio-ecosystem:main May 7, 2026
17 checks passed
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request May 8, 2026
* upstream/main:
  Set DEPLOYMENT_NAME to csv name when OLM is true (istio-ecosystem#1918)
  fix: single-node cluster example in Istiod HA docs (istio-ecosystem#1915)
@istio-testing
Copy link
Copy Markdown
Collaborator

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

Applying: Set DEPLOYMENT_NAME to csv name when OLM is true
Using index info to reconstruct a base tree...
M	tests/e2e/common-operator-integ-suite.sh
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/common-operator-integ-suite.sh
CONFLICT (content): Merge conflict in tests/e2e/common-operator-integ-suite.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 Set DEPLOYMENT_NAME to csv name when OLM is true

@istio-testing
Copy link
Copy Markdown
Collaborator

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

@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: new pull request created: #1921

@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: new pull request created: #1922

@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: new pull request created: #1923

@istio-testing
Copy link
Copy Markdown
Collaborator

In response to a cherrypick label: new pull request created: #1924

openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request May 11, 2026
* upstream/main:
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#1916)
  Set DEPLOYMENT_NAME to csv name when OLM is true (istio-ecosystem#1918)
  fix: single-node cluster example in Istiod HA docs (istio-ecosystem#1915)
istio-testing pushed a commit that referenced this pull request May 19, 2026
* test: Modify await_operator to dinamically get deployment name from csv when OLM is true (#1874)

* test: Modify await_operator to dinamically get deployment name from csv when OLM is true

If bundle name is different to sail operator and OLM is set to true in the test we got failures because await_operator never find a sail-operator deployment in the namespace

Signed-off-by: Francisco Herrera <fjglira@gmail.com>

* Get the deployment name from current .clusterserviceversion.yaml file in the manifest/bundle folder

Changes from review

Signed-off-by: Francisco Herrera <fjglira@gmail.com>

---------

Signed-off-by: Francisco Herrera <fjglira@gmail.com>

* Set DEPLOYMENT_NAME to csv name when OLM is true (#1918)

This will avoid issues on the test while waiting for operator because will set DEPLOYMENT_NAME to the csv name used into fork test

Signed-off-by: Francisco Herrera <fjglira@gmail.com>

---------

Signed-off-by: Francisco Herrera <fjglira@gmail.com>
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