Skip to content

Updates release and nightly-images GH workflows to work with new FBC …#854

Merged
istio-testing merged 1 commit intoistio-ecosystem:mainfrom
FilipB:fbc-nightly-builds
May 29, 2025
Merged

Updates release and nightly-images GH workflows to work with new FBC …#854
istio-testing merged 1 commit intoistio-ecosystem:mainfrom
FilipB:fbc-nightly-builds

Conversation

@FilipB
Copy link
Copy Markdown
Collaborator

@FilipB FilipB commented May 28, 2025

…used in community-operators-prod

Adds new PREVIOUS_VERSION variable to the Makefile - see the comment for details

Also:

  • Disables nightly releases for 1.0 version
  • Removes redundant parameters from release GH workflow and github-workflow make target
  • Removes extra white spaces in the nightly version string
  • Use VERSION as a default value for the bundle-publish make target

This will have to be cherry-picked to release-1.26

Which issue(s) this PR fixes:

Fixes #527
Fixes #331

@FilipB FilipB requested a review from a team as a code owner May 28, 2025 09:17
@codecov
Copy link
Copy Markdown

codecov bot commented May 28, 2025 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 76.47%. Comparing base (2b37f67) to head (0162064).
Report is 47 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main     #854      +/-   ##
==========================================
+ Coverage   76.32%   76.47%   +0.15%     
==========================================
  Files          44       44              
  Lines        2640     2640              
==========================================
+ Hits         2015     2019       +4     
+ Misses        536      533       -3     
+ Partials       89       88       -1

☔ 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.

@FilipB
Updates release and nightly-images GH workflows to work with new FBC …
0162064 
…used in community-operators-prod

Adds new PREVIOUS_VERSION variable to the Makefile - see the comment for details

Also:
- Disables nightly releases for 1.0 version
- Removes redundant parameters from release GH workflow and github-workflow make target
- Removes extra white spaces in the nightly version string
- Use VERSION as a default value for the bundle-publish make target

Signed-off-by: Filip Brychta <fbrychta@redhat.com>
@FilipB FilipB force-pushed the fbc-nightly-builds branch from 028915a to 0162064 Compare May 28, 2025 09:29
@FilipB
Copy link
Copy Markdown
Collaborator Author

FilipB commented May 28, 2025

/retest

@fjglira
Copy link
Copy Markdown
Contributor

fjglira commented May 29, 2025

/test e2e-kind-multicluster

@fjglira
Copy link
Copy Markdown
Contributor

fjglira commented May 29, 2025

The multicluster test has been flaky for a few days. I had pending to check it

@istio-testing istio-testing merged commit b803a43 into istio-ecosystem:main May 29, 2025
17 checks passed
@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented May 29, 2025

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

Applying: Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod Adds new PREVIOUS_VERSION variable to the Makefile - see the comment for details
Using index info to reconstruct a base tree...
M	.github/workflows/release.yaml
M	Makefile.core.mk
Falling back to patching base and 3-way merge...
Auto-merging Makefile.core.mk
Auto-merging .github/workflows/release.yaml
CONFLICT (content): Merge conflict in .github/workflows/release.yaml
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 advice.mergeConflict false"
Patch failed at 0001 Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod Adds new PREVIOUS_VERSION variable to the Makefile - see the comment for details

@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented May 29, 2025

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

@istio-testing istio-testing mentioned this pull request May 29, 2025
Closed
FilipB added a commit to FilipB/sail-operator that referenced this pull request May 29, 2025
@FilipB
Updates release and nightly-images GH workflows to work with new FBC …
0a32c8c 
…used in community-operators-prod (istio-ecosystem#854)

Adds new PREVIOUS_VERSION variable to the Makefile - see the comment for details

Also:
- Disables nightly releases for 1.0 version
- Removes redundant parameters from release GH workflow and github-workflow make target
- Removes extra white spaces in the nightly version string
- Use VERSION as a default value for the bundle-publish make target

Signed-off-by: Filip Brychta <fbrychta@redhat.com>
@FilipB FilipB mentioned this pull request May 29, 2025
Merged
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request May 29, 2025
Automated merge
906d136 
* upstream/main:
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request May 29, 2025
Automated merge
e79cc0b 
* upstream/main:
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request May 30, 2025
Automated merge
12ee700 
* upstream/main:
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request May 30, 2025
Automated merge
c473070 
* upstream/main:
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request May 30, 2025
Automated merge
1b5aec3 
* upstream/main:
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request May 30, 2025
Automated merge
5a9c260 
* upstream/main:
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request May 30, 2025
Automated merge
0ac5c2b 
* upstream/main:
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 2, 2025
Automated merge
ef6da12 
* upstream/main:
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 2, 2025
Automated merge
d9f4d4b 
* upstream/main:
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 2, 2025
Automated merge
d8aeb50 
* upstream/main:
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
istio-testing pushed a commit that referenced this pull request Jun 2, 2025
@FilipB @istio-testing
Updates release and nightly-images GH workflows to work with new FBC …
53a9371 
…used in community-operators-prod (#854)

Adds new PREVIOUS_VERSION variable to the Makefile - see the comment for details

Also:
- Disables nightly releases for 1.0 version
- Removes redundant parameters from release GH workflow and github-workflow make target
- Removes extra white spaces in the nightly version string
- Use VERSION as a default value for the bundle-publish make target

Signed-off-by: Filip Brychta <fbrychta@redhat.com>
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 2, 2025
Automated merge
a969b08 
* upstream/main:
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 2, 2025
Automated merge
9d3d49e 
* upstream/main:
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 9, 2025
Automated merge
2390a3c 
* upstream/main:
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 9, 2025
Automated merge
8f45b4f 
* upstream/main:
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 9, 2025
Automated merge
e3a371b 
* upstream/main:
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 9, 2025
Automated merge
9bf32fc 
* upstream/main:
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 10, 2025
Automated merge
4acf308 
* upstream/main:
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 10, 2025
Automated merge
9202d2f 
* upstream/main:
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 10, 2025
Automated merge
7c7a056 
* upstream/main:
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 10, 2025
Automated merge
9dc8d3c 
* upstream/main:
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 10, 2025
Automated merge
b623b94 
* upstream/main:
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 11, 2025
Automated merge
2166db1 
* upstream/main:
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 11, 2025
Automated merge
6110a63 
* upstream/main:
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 11, 2025
Automated merge
a289923 
* upstream/main:
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 11, 2025
Automated merge
cd2d53c 
* upstream/main:
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 11, 2025
Automated merge
e65eaef 
* upstream/main:
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 12, 2025
Automated merge
7d33def 
* upstream/main:
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 12, 2025
Automated merge
7e91754 
* upstream/main:
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 12, 2025
Automated merge
c101bc4 
* upstream/main:
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 12, 2025
Automated merge
03cbd52 
* upstream/main:
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 12, 2025
Automated merge
d4fd991 
* upstream/main:
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 13, 2025
Automated merge
4d74b33 
* upstream/main:
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 13, 2025
Automated merge
116eeca 
* upstream/main:
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 13, 2025
Automated merge
efbfff3 
* upstream/main:
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  Add misspell to do basic spell validation in our docs (istio-ecosystem#853)
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Jun 13, 2025
Automated merge
4e18772 
* upstream/main: (21 commits)
  Annotate only our clusters when using kind (istio-ecosystem#904)
  Fix log message for cleaner when waiting (istio-ecosystem#903)
  Consolidate multicluster operator deploy/cleanup (istio-ecosystem#902)
  Improve e2e test cleanup by recording & cleaning up (istio-ecosystem#889)
  Enchance debug information when e2e fails: add istioctl proxy status (istio-ecosystem#891)
  Update github action for broken links (istio-ecosystem#888)
  Fix "Check broken link" workflow (istio-ecosystem#887)
  Split Documentation: splitting docs, adding table of content and fixing links (istio-ecosystem#881)
  Do not block the workflow on errors when publishing to operatorhub.io (istio-ecosystem#877)
  chore(docs): cleans up IstioCNI section (istio-ecosystem#867)
  Force push to operator hub fork (istio-ecosystem#873)
  Make a yaml linter in the community-operators-prod happy (istio-ecosystem#869)
  Adding description for release workflow run (istio-ecosystem#868)
  Docs: adding istiod HA documentations (istio-ecosystem#865)
  Add to vendors_default the possibility to add values for IstioCNI (istio-ecosystem#845)
  Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod (istio-ecosystem#854)
  Simplify logic when using `KEEP_ON_FAILURE` (istio-ecosystem#858)
  Add KEEP_ON_FAILURE flag to e2e kind tests (istio-ecosystem#832)
  switch to ubi-micro (istio-ecosystem#856)
  Speed up docs tests by running on a single cluster (istio-ecosystem#855)
  ...
@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Jun 30, 2025

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

Applying: Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod Adds new PREVIOUS_VERSION variable to the Makefile - see the comment for details
Using index info to reconstruct a base tree...
M	.github/workflows/nightly-images.yaml
M	.github/workflows/release.yaml
M	Makefile.core.mk
Falling back to patching base and 3-way merge...
Auto-merging Makefile.core.mk
CONFLICT (content): Merge conflict in Makefile.core.mk
Auto-merging .github/workflows/release.yaml
CONFLICT (content): Merge conflict in .github/workflows/release.yaml
Auto-merging .github/workflows/nightly-images.yaml
CONFLICT (content): Merge conflict in .github/workflows/nightly-images.yaml
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 advice.mergeConflict false"
Patch failed at 0001 Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod Adds new PREVIOUS_VERSION variable to the Makefile - see the comment for details

@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Jun 30, 2025

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

@istio-testing istio-testing mentioned this pull request Jun 30, 2025
Closed
@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Jun 30, 2025

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

Applying: Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod Adds new PREVIOUS_VERSION variable to the Makefile - see the comment for details
Using index info to reconstruct a base tree...
M	.github/workflows/nightly-images.yaml
M	.github/workflows/release.yaml
M	Makefile.core.mk
M	hack/operatorhub/publish-bundle.sh
Falling back to patching base and 3-way merge...
Auto-merging hack/operatorhub/publish-bundle.sh
CONFLICT (content): Merge conflict in hack/operatorhub/publish-bundle.sh
Auto-merging Makefile.core.mk
CONFLICT (content): Merge conflict in Makefile.core.mk
Auto-merging .github/workflows/release.yaml
CONFLICT (content): Merge conflict in .github/workflows/release.yaml
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 advice.mergeConflict false"
Patch failed at 0001 Updates release and nightly-images GH workflows to work with new FBC used in community-operators-prod Adds new PREVIOUS_VERSION variable to the Makefile - see the comment for details

@istio-testing
Copy link
Copy Markdown
Collaborator

istio-testing commented Jun 30, 2025

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

@istio-testing istio-testing mentioned this pull request Jun 30, 2025
Closed
@FilipB FilipB mentioned this pull request Jun 30, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MaxBab MaxBab MaxBab approved these changes

@fjglira fjglira fjglira approved these changes

Assignees

No one assigned

Labels

cherrypick/release-1.0 cherrypick/release-1.26 size/M

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[BUG] Operator is not upgraded when switching to new channel with newer version Migrate to File Based Catalog

4 participants

@FilipB @fjglira @istio-testing @MaxBab