Skip to content

Conversation

@max-cx
Copy link
Contributor

@max-cx max-cx commented Dec 1, 2025

Version(s): OCP 4.12-4.21

Issue: https://issues.redhat.com/browse/OBSDOCS-1699

This PR consolidates the following PRs:
#102702
#103126
#102819
#102760
#102804
#102897

Link to docs preview: See the listed PRs

QE review:

  • QE has approved this change.

Additional information:

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Dec 1, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 1, 2025

@max-cx: This pull request references OBSDOCS-1699 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the epic to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Version(s):

Issue:

Link to docs preview:

QE review:

  • QE has approved this change.

Additional information:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 1, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 1, 2025

@max-cx: This pull request references OBSDOCS-1699 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the epic to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Version(s): OCP 4.12-4.21

Issue: https://issues.redhat.com/browse/OBSDOCS-1699

This PR consolidates the following PRs:
#102702
#103126
#102819
#102760
#102804
#102897

Link to docs preview: See the listed PRs

QE review:

  • QE has approved this change.

Additional information:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Dec 1, 2025

@max-cx: This pull request references OBSDOCS-1699 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the epic to target the "4.21.0" version, but no target version was set.

Details

In response to this:

Version(s): OCP 4.12-4.21

Issue: https://issues.redhat.com/browse/OBSDOCS-1699

This PR consolidates the following PRs:
#102702
#103126
#102819
#102760
#102804
#102897

Link to docs preview: See the listed PRs

QE review:

  • QE has approved this change.

Additional information:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci
Copy link

openshift-ci bot commented Dec 1, 2025

@max-cx: all tests passed!

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.

@max-cx max-cx merged commit 0275123 into openshift:main Dec 1, 2025
2 checks passed
@max-cx
Copy link
Contributor Author

max-cx commented Dec 1, 2025

/cherry-pick enterprise-4.12

@max-cx
Copy link
Contributor Author

max-cx commented Dec 1, 2025

/cherry-pick enterprise-4.13

@max-cx
Copy link
Contributor Author

max-cx commented Dec 1, 2025

/cherry-pick enterprise-4.14

@max-cx
Copy link
Contributor Author

max-cx commented Dec 1, 2025

/cherry-pick enterprise-4.15

@max-cx
Copy link
Contributor Author

max-cx commented Dec 1, 2025

/cherry-pick enterprise-4.16

@openshift-cherrypick-robot

@max-cx: #103188 failed to apply on top of branch "enterprise-4.12":

Applying: "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry
.git/rebase-apply/patch:224: trailing whitespace.
metadata:   
.git/rebase-apply/patch:227: trailing whitespace.
spec:  
.git/rebase-apply/patch:228: trailing whitespace.
 args: 
.git/rebase-apply/patch:230: trailing whitespace.
  config:     
.git/rebase-apply/patch:231: trailing whitespace.
    receivers:       
warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/distr-tracing-tempo-install-web-console.adoc
M	modules/otel-install-web-console.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/otel-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/otel-install-web-console.adoc
Auto-merging modules/distr-tracing-tempo-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/distr-tracing-tempo-install-web-console.adoc
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 "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry

Details

In response to this:

/cherry-pick enterprise-4.12

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.

@max-cx
Copy link
Contributor Author

max-cx commented Dec 1, 2025

/cherry-pick enterprise-4.17

@openshift-cherrypick-robot

@max-cx: #103188 failed to apply on top of branch "enterprise-4.13":

Applying: "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry
.git/rebase-apply/patch:224: trailing whitespace.
metadata:   
.git/rebase-apply/patch:227: trailing whitespace.
spec:  
.git/rebase-apply/patch:228: trailing whitespace.
 args: 
.git/rebase-apply/patch:230: trailing whitespace.
  config:     
.git/rebase-apply/patch:231: trailing whitespace.
    receivers:       
warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/distr-tracing-tempo-install-web-console.adoc
M	modules/otel-install-web-console.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/otel-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/otel-install-web-console.adoc
Auto-merging modules/distr-tracing-tempo-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/distr-tracing-tempo-install-web-console.adoc
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 "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry

Details

In response to this:

/cherry-pick enterprise-4.13

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.

@max-cx
Copy link
Contributor Author

max-cx commented Dec 1, 2025

/cherry-pick enterprise-4.18

@openshift-cherrypick-robot

@max-cx: #103188 failed to apply on top of branch "enterprise-4.14":

Applying: "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry
.git/rebase-apply/patch:224: trailing whitespace.
metadata:   
.git/rebase-apply/patch:227: trailing whitespace.
spec:  
.git/rebase-apply/patch:228: trailing whitespace.
 args: 
.git/rebase-apply/patch:230: trailing whitespace.
  config:     
.git/rebase-apply/patch:231: trailing whitespace.
    receivers:       
warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/distr-tracing-tempo-install-web-console.adoc
M	modules/otel-install-web-console.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/otel-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/otel-install-web-console.adoc
Auto-merging modules/distr-tracing-tempo-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/distr-tracing-tempo-install-web-console.adoc
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 "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry

Details

In response to this:

/cherry-pick enterprise-4.14

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.

@openshift-cherrypick-robot

@max-cx: #103188 failed to apply on top of branch "enterprise-4.15":

Applying: "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry
.git/rebase-apply/patch:224: trailing whitespace.
metadata:   
.git/rebase-apply/patch:227: trailing whitespace.
spec:  
.git/rebase-apply/patch:228: trailing whitespace.
 args: 
.git/rebase-apply/patch:230: trailing whitespace.
  config:     
.git/rebase-apply/patch:231: trailing whitespace.
    receivers:       
warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/distr-tracing-tempo-install-web-console.adoc
M	modules/otel-install-web-console.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/otel-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/otel-install-web-console.adoc
Auto-merging modules/distr-tracing-tempo-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/distr-tracing-tempo-install-web-console.adoc
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 "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry

Details

In response to this:

/cherry-pick enterprise-4.15

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.

@max-cx
Copy link
Contributor Author

max-cx commented Dec 1, 2025

/cherry-pick enterprise-4.19

@openshift-cherrypick-robot

@max-cx: #103188 failed to apply on top of branch "enterprise-4.16":

Applying: "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry
.git/rebase-apply/patch:224: trailing whitespace.
metadata:   
.git/rebase-apply/patch:227: trailing whitespace.
spec:  
.git/rebase-apply/patch:228: trailing whitespace.
 args: 
.git/rebase-apply/patch:230: trailing whitespace.
  config:     
.git/rebase-apply/patch:231: trailing whitespace.
    receivers:       
warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/distr-tracing-tempo-install-web-console.adoc
M	modules/otel-install-web-console.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/otel-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/otel-install-web-console.adoc
Auto-merging modules/distr-tracing-tempo-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/distr-tracing-tempo-install-web-console.adoc
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 "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry

Details

In response to this:

/cherry-pick enterprise-4.16

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.

@openshift-cherrypick-robot

@max-cx: #103188 failed to apply on top of branch "enterprise-4.17":

Applying: "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry
.git/rebase-apply/patch:224: trailing whitespace.
metadata:   
.git/rebase-apply/patch:227: trailing whitespace.
spec:  
.git/rebase-apply/patch:228: trailing whitespace.
 args: 
.git/rebase-apply/patch:230: trailing whitespace.
  config:     
.git/rebase-apply/patch:231: trailing whitespace.
    receivers:       
warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/distr-tracing-tempo-install-web-console.adoc
M	modules/otel-install-web-console.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/otel-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/otel-install-web-console.adoc
Auto-merging modules/distr-tracing-tempo-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/distr-tracing-tempo-install-web-console.adoc
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 "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry

Details

In response to this:

/cherry-pick enterprise-4.17

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.

@max-cx
Copy link
Contributor Author

max-cx commented Dec 1, 2025

/cherry-pick enterprise-4.20

@openshift-cherrypick-robot

@max-cx: #103188 failed to apply on top of branch "enterprise-4.18":

Applying: "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry
.git/rebase-apply/patch:224: trailing whitespace.
metadata:   
.git/rebase-apply/patch:227: trailing whitespace.
spec:  
.git/rebase-apply/patch:228: trailing whitespace.
 args: 
.git/rebase-apply/patch:230: trailing whitespace.
  config:     
.git/rebase-apply/patch:231: trailing whitespace.
    receivers:       
warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/distr-tracing-tempo-install-web-console.adoc
M	modules/otel-install-web-console.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/otel-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/otel-install-web-console.adoc
Auto-merging modules/distr-tracing-tempo-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/distr-tracing-tempo-install-web-console.adoc
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 "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry

Details

In response to this:

/cherry-pick enterprise-4.18

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.

@max-cx
Copy link
Contributor Author

max-cx commented Dec 1, 2025

/cherry-pick enterprise-4.21

@openshift-cherrypick-robot

@max-cx: #103188 failed to apply on top of branch "enterprise-4.19":

Applying: "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry
.git/rebase-apply/patch:224: trailing whitespace.
metadata:   
.git/rebase-apply/patch:227: trailing whitespace.
spec:  
.git/rebase-apply/patch:228: trailing whitespace.
 args: 
.git/rebase-apply/patch:230: trailing whitespace.
  config:     
.git/rebase-apply/patch:231: trailing whitespace.
    receivers:       
warning: squelched 7 whitespace errors
warning: 12 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/distr-tracing-tempo-install-web-console.adoc
M	modules/otel-install-web-console.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/otel-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/otel-install-web-console.adoc
Auto-merging modules/distr-tracing-tempo-install-web-console.adoc
CONFLICT (content): Merge conflict in modules/distr-tracing-tempo-install-web-console.adoc
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 "OBSDOCS-1699: 3.8 release of Distribute Tracing and OpenTelemetry

Details

In response to this:

/cherry-pick enterprise-4.19

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.

@openshift-cherrypick-robot

@max-cx: new pull request created: #103227

Details

In response to this:

/cherry-pick enterprise-4.20

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.

@openshift-cherrypick-robot

@max-cx: new pull request created: #103228

Details

In response to this:

/cherry-pick enterprise-4.21

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants