Skip to content

OSDOCS-17133-2:MSH-APPs-1#107740

Merged
JoeAldinger merged 1 commit intoopenshift:mainfrom
JoeAldinger:OSDOCS-17133-2
Mar 17, 2026
Merged

OSDOCS-17133-2:MSH-APPs-1#107740
JoeAldinger merged 1 commit intoopenshift:mainfrom
JoeAldinger:OSDOCS-17133-2

Conversation

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

openshift-ci-robot commented Mar 2, 2026

@JoeAldinger: This pull request references OSDOCS-17113 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 story to target the "4.22.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/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 2, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 3, 2026

@JoeAldinger: This pull request references OSDOCS-17113 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Version(s):
4.16+

Issue:
#107740

Link to docs preview:
107740--ocpdocs-pr.netlify.app/microshift/latest/microshift_install_rpm_opt/microshift-install-optional-rpms.html
107740--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift-greenboot-workload-health-checks.html
107740--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift-observability-service.html

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 Mar 3, 2026

@JoeAldinger: This pull request references OSDOCS-17113 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Version(s):
4.16+

Issue:
https://issues.redhat.com/browse/OSDOCS-17113

Link to docs preview:
107740--ocpdocs-pr.netlify.app/microshift/latest/microshift_install_rpm_opt/microshift-install-optional-rpms.html
107740--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift-greenboot-workload-health-checks.html
107740--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift-observability-service.html

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.

@JoeAldinger JoeAldinger force-pushed the OSDOCS-17133-2 branch 3 times, most recently from edec9ca to 2f50405 Compare March 3, 2026 19:59
@JoeAldinger JoeAldinger added the merge-review-needed Signifies that the merge review team needs to review this PR label Mar 3, 2026
@kalexand-rh kalexand-rh removed the merge-review-needed Signifies that the merge review team needs to review this PR label Mar 4, 2026
@kalexand-rh
Copy link
Contributor

We are pausing reviews and merges of CQAs. Please put this back in the queue when we resume CQA merges.

@JoeAldinger JoeAldinger changed the title OSDOCS-17113-2:MSH-APPs-1 OSDOCS-17133-2:MSH-APPs-1 Mar 4, 2026
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 4, 2026

@JoeAldinger: This pull request references OSDOCS-17133 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 story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Version(s):
4.16+

Issue:
https://issues.redhat.com/browse/OSDOCS-17113

Link to docs preview:
107740--ocpdocs-pr.netlify.app/microshift/latest/microshift_install_rpm_opt/microshift-install-optional-rpms.html
107740--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift-greenboot-workload-health-checks.html
107740--ocpdocs-pr.netlify.app/microshift/latest/microshift_running_apps/microshift-observability-service.html

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.

Script '00_wanted_scripts_start.sh' SUCCESS
Running Required Health Check Scripts...
--------------------
DEPRECATION NOTICE:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you check on this since you're here? looks like this might have been missed; @ggiguash is the SME

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The planned removal release is MicroShift 4.22 - it did not happen in 4.21

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@pmtk can you ptal?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't usually place firm dates or releases in our docs like this so I think the best thing to do is simply to remove it.

Copy link
Contributor

@ShaunaDiaz ShaunaDiaz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a few thoughts, one deprecation notice i saw that could be checked if you have bandwidth; otherwise LGTM

@openshift-ci
Copy link

openshift-ci bot commented Mar 17, 2026

@JoeAldinger: 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.

@JoeAldinger JoeAldinger merged commit 318524f into openshift:main Mar 17, 2026
2 checks passed
@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.16

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.17

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.18

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.19

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.20

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.21

@JoeAldinger
Copy link
Contributor Author

/cherrypick enterprise-4.22

@openshift-cherrypick-robot

@JoeAldinger: #107740 failed to apply on top of branch "enterprise-4.16":

Applying: OSDOCS-17113-2:MSH-APPs-1
Using index info to reconstruct a base tree...
A	microshift_running_apps/microshift-greenboot-workload-health-checks.adoc
A	modules/microshift-greenboot-app-health-check-script.adoc
A	modules/microshift-greenboot-health-check-command.adoc
A	modules/microshift-greenboot-how-workload-health-checks-work.adoc
M	modules/microshift-greenboot-testing-workload-script.adoc
A	modules/microshift-greenboot-workload-health-script-ex.adoc
A	modules/microshift-otel-config-examples.adoc
A	modules/microshift-otel-config-large.adoc
A	modules/microshift-otel-config-medium.adoc
A	modules/microshift-otel-config-small.adoc
A	modules/microshift-otel-config.adoc
A	modules/microshift-otel-install.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/microshift-otel-install.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-otel-install.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-otel-config.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-otel-config.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-otel-config-small.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-otel-config-small.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-otel-config-medium.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-otel-config-medium.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-otel-config-large.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-otel-config-large.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-otel-config-examples.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-otel-config-examples.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-greenboot-workload-health-script-ex.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-greenboot-workload-health-script-ex.adoc left in tree.
Auto-merging modules/microshift-greenboot-testing-workload-script.adoc
CONFLICT (content): Merge conflict in modules/microshift-greenboot-testing-workload-script.adoc
CONFLICT (modify/delete): modules/microshift-greenboot-how-workload-health-checks-work.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-greenboot-how-workload-health-checks-work.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-greenboot-health-check-command.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-greenboot-health-check-command.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-greenboot-app-health-check-script.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-greenboot-app-health-check-script.adoc left in tree.
CONFLICT (modify/delete): microshift_running_apps/microshift-greenboot-workload-health-checks.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of microshift_running_apps/microshift-greenboot-workload-health-checks.adoc left in tree.
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 OSDOCS-17113-2:MSH-APPs-1

Details

In response to this:

/cherrypick 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

@JoeAldinger: #107740 failed to apply on top of branch "enterprise-4.17":

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

Details

In response to this:

/cherrypick 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.

@openshift-cherrypick-robot

@JoeAldinger: #107740 failed to apply on top of branch "enterprise-4.18":

Applying: OSDOCS-17113-2:MSH-APPs-1
Using index info to reconstruct a base tree...
A	microshift_running_apps/microshift-greenboot-workload-health-checks.adoc
A	modules/microshift-greenboot-app-health-check-script.adoc
A	modules/microshift-greenboot-health-check-command.adoc
A	modules/microshift-greenboot-how-workload-health-checks-work.adoc
M	modules/microshift-greenboot-testing-workload-script.adoc
A	modules/microshift-greenboot-workload-health-script-ex.adoc
A	modules/microshift-otel-config-examples.adoc
A	modules/microshift-otel-config-large.adoc
A	modules/microshift-otel-config-medium.adoc
A	modules/microshift-otel-config-small.adoc
A	modules/microshift-otel-config.adoc
A	modules/microshift-otel-install.adoc
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modules/microshift-otel-install.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-otel-install.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-otel-config.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-otel-config.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-otel-config-small.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-otel-config-small.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-otel-config-medium.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-otel-config-medium.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-otel-config-large.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-otel-config-large.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-otel-config-examples.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-otel-config-examples.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-greenboot-workload-health-script-ex.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-greenboot-workload-health-script-ex.adoc left in tree.
Auto-merging modules/microshift-greenboot-testing-workload-script.adoc
CONFLICT (content): Merge conflict in modules/microshift-greenboot-testing-workload-script.adoc
CONFLICT (modify/delete): modules/microshift-greenboot-how-workload-health-checks-work.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-greenboot-how-workload-health-checks-work.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-greenboot-health-check-command.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-greenboot-health-check-command.adoc left in tree.
CONFLICT (modify/delete): modules/microshift-greenboot-app-health-check-script.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of modules/microshift-greenboot-app-health-check-script.adoc left in tree.
CONFLICT (modify/delete): microshift_running_apps/microshift-greenboot-workload-health-checks.adoc deleted in HEAD and modified in OSDOCS-17113-2:MSH-APPs-1. Version OSDOCS-17113-2:MSH-APPs-1 of microshift_running_apps/microshift-greenboot-workload-health-checks.adoc left in tree.
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 OSDOCS-17113-2:MSH-APPs-1

Details

In response to this:

/cherrypick 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.

@openshift-cherrypick-robot

@JoeAldinger: new pull request created: #108508

Details

In response to this:

/cherrypick 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

@JoeAldinger: new pull request created: #108509

Details

In response to this:

/cherrypick 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

@JoeAldinger: new pull request created: #108510

Details

In response to this:

/cherrypick 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.

@openshift-cherrypick-robot

@JoeAldinger: new pull request created: #108511

Details

In response to this:

/cherrypick enterprise-4.22

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants