Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OSDOCS-2427: Update best practices guidance #68477

Merged
merged 1 commit into from Jan 15, 2024

Conversation

skopacz1
Copy link
Contributor

@skopacz1 skopacz1 commented Nov 28, 2023

OSDOCS-2427

Version(s): 4.13+ (note to merge reviewer - the 4.13 auto CP will likely fail)

This PR adds guidance for users about best practices they can employ to ensure that their cluster update is successful. This is not meant to be a list of additional prerequisites that users must follow before initiating an update.

QE review:

  • QE has approved this change.

Preview: Best practices for cluster updates (VPN required)

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

openshift-ci-robot commented Nov 28, 2023

@skopacz1: This pull request references OSDOCS-2427 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.15.0" version, but no target version was set.

In response to this:

OSDOCS-2427

Version(s): 4.13+ (note to merge reviewer - the 4.13 auto CP will likely fail)

This PR adds guidance for users about best practices they can employ to ensure that their cluster update is successful. This is not meant to be a list of additional prerequisites that users must follow before initiating an update.

QE review:

  • QE has approved this change.

Preview:

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/test-infra repository.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Nov 28, 2023
@ocpdocs-previewbot
Copy link

ocpdocs-previewbot commented Nov 28, 2023

🤖 Fri Jan 12 20:33:58 - Prow CI generated the docs preview: https://68477--ocpdocs-pr.netlify.app

@openshift-ci-robot
Copy link

openshift-ci-robot commented Nov 28, 2023

@skopacz1: This pull request references OSDOCS-2427 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.15.0" version, but no target version was set.

In response to this:

OSDOCS-2427

Version(s): 4.13+ (note to merge reviewer - the 4.13 auto CP will likely fail)

This PR adds guidance for users about best practices they can employ to ensure that their cluster update is successful. This is not meant to be a list of additional prerequisites that users must follow before initiating an update.

QE review:

  • QE has approved this change.

Preview: Best practices for cluster updates

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/test-infra repository.

=== Ensure that the cluster is in an Upgradable state

When one or more Operators have not reported their `Upgradeable` condition as `true` for more than an hour, the `ClusterNotUpgradeable` warning alert is triggered in the cluster.
In most cases patch updates are not blocked by this alert, but you cannot perform a minor version update until this alert is resolved and all Operators report `Upgradeable` as `true`.
Copy link
Member

Choose a reason for hiding this comment

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

nit: true -> True (API).

@petr-muller
Copy link
Member

/cc

=== Choose versions recommended by the OpenShift Update Service

The OpenShift Update Service (OSUS) provides update recommendations based on cluster characteristics such as the cluster's subscribed channel, which are then saved by the Cluster Version Operator as either recommended or conditional updates.
While it is possible to attempt an update to a version that is not recommended by OSUS, doing so significantly increases the risk of update failure or unintended consequences to the cluster after the update has finished.
Copy link
Member

Choose a reason for hiding this comment

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

Can we spin this into a positive-sounding (or at least less negative) statement? I think "significantly increases risk" is not even that much true. "update failure" is very strong term, but actually very rare, most upgrade issues are annoyances. I'd say recommended paths are near-zero risk and non-recommended is low risk, we just don't have enough data to actually claim near-zero risk (even if it likely is safe - we do a lot of testing, and we do not have enough resources to test every possible path).

So I would maybe just say that following recommended paths protects the users from encountering known issues or unintended consequences, or something like that.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll replace my wording with yours, sure thing.


[discrete]
[id="nodes-ready_{context}"]
=== Ensure that all nodes are available
Copy link
Member

Choose a reason for hiding this comment

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

I think "all nodes are available" is not exactly the condition that we want. The point is that the cluster should not be running with little to no spare capacity. If the cluster is "full", then taking down a node to upgrade it can be either slow or even impossible. So I would describe this section as "make sure the cluster has enough spare capacity so that the upgrade process can actually take some nodes offline to update them."

This has two flavors, (you already mention one of them):

  1. There is spare capacity on compute nodes, so that when taking a node offline temporarily, its workloads can be placed on other nodes comfortably
  2. Worker pools do not have enough unavailable notes to prevent taking more nodes offline temporarily.

Copy link
Member

Choose a reason for hiding this comment

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

We have noticed that many times when a node is down MCO gets stuck. So I am supportive of the idea. I also agree that we should have spare nodes which would give some breathing room to pods.

=== Ensure that the cluster's PodDisruptionBudget is properly configured

The `PodDisruptionBudget` object allows you to define the minimum number or percentage of pod replicas that must be available at any given time.
This configuration allows workloads to be protected from disruptions during maintenance tasks such as cluster updates.
Copy link
Member

Choose a reason for hiding this comment

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

I think we can afford to be a bit more specific:

  1. Make sure that for HA workloads, there are replicas that can be temporarily taken offline without PDB configuration prohibiting that
  2. Make sure that non-HA workloads are either not protected by PDBs, or that there is an alternative reliable mechanism that allows draining these workloads eventually (such as periodic restart, guaranteed eventual termination or something else)

Critical alerts must always be addressed as soon as possible, but it is especially important to address these alerts and resolve any problems before initiating a cluster update.
Failing to address critical alerts before beginning an update can cause a loss of data or a major failure of cluster services.

You should also periodically review Warning and Info alerts on the cluster to address any potentially problematic conditions before initiating an update.
Copy link
Member

Choose a reason for hiding this comment

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

I do not think we should ask customers to review info alerts , thats a lot of work without much value for update success. Just asking to review critical alerts is good enough.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds good, I'll remove this sentence.


[discrete]
[id="nodes-ready_{context}"]
=== Ensure that all nodes are available
Copy link
Member

Choose a reason for hiding this comment

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

We have noticed that many times when a node is down MCO gets stuck. So I am supportive of the idea. I also agree that we should have spare nodes which would give some breathing room to pods.

@petr-muller
Copy link
Member

LGTM 👍

@skopacz1
Copy link
Contributor Author

skopacz1 commented Dec 7, 2023

@shellyyang1989 could you PTAL when you have a chance? Thanks!

@shellyyang1989
Copy link

@JianLi-RH Could you please help take a look? Thank you!


[discrete]
[id="recommended-versions_{context}"]
=== Choose versions recommended by the OpenShift Update Service

Choose a reason for hiding this comment

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

If this is the second level section of Best practices for cluster updates, can we set it like the second levels of Kubernetes API deprecations and removals, so that we can navigate them in the right side bar.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can change it to be a second level heading, sure. I made it a third level for stylistic reasons but it's not super important to keep it that way. The reason they don't show up in the navigation on the right, however is because of the [discrete] elements, such as the one on line 14.

I put those there because I thought it would overwhelm the sidebar navigation, but I guess if there are only 5 of these sections then that's okay for now!

Choose a reason for hiding this comment

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

@skopacz1 I am sure you have updated the navigation level, but I can't see the change on preview page, could you help to confirm it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The automated preview page is not working correctly, sorry about that. I've manually uploaded the most recent preview with your feedback here: https://file.rdu.redhat.com/skopacz/OSDOCS-2427/updating/preparing_for_updates/updating-cluster-prepare.html#update-best-practices_updating-cluster-prepare

(you'll need to be on VPN to access this site)


[discrete]
[id="critical-alerts_{context}"]
=== Address all critical alerts on the cluster

Choose a reason for hiding this comment

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

Please make it as the second level section of Best practices for cluster updates


[discrete]
[id="cluster-upgradeable_{context}"]
=== Ensure that the cluster is in an Upgradable state

Choose a reason for hiding this comment

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

Please make it as the second level section of Best practices for cluster updates


[discrete]
[id="nodes-ready_{context}"]
=== Ensure that enough spare nodes are available

Choose a reason for hiding this comment

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

Please make it as the second level section of Best practices for cluster updates


[discrete]
[id="pod-disruption-budget_{context}"]
=== Ensure that the cluster's PodDisruptionBudget is properly configured

Choose a reason for hiding this comment

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

Please make it as the second level section of Best practices for cluster updates


[discrete]
[id="recommended-versions_{context}"]
=== Choose versions recommended by the OpenShift Update Service

Choose a reason for hiding this comment

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

I think it is better to let customers know how to get the OSUS recommended versions, like on web console or command line.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unless I'm mistaken - I think as long as users follow our update procedures then they'll always use recommended versions, unless users look up how to find conditional updates or use --to-image. But those two options take more work to find in the docs.

So I think we already show users how to get recommended versions because that's the default method that we document in almost all of our procedures.

Choose a reason for hiding this comment

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

um...you are right.


[discrete]
[id="critical-alerts_{context}"]
=== Address all critical alerts on the cluster

Choose a reason for hiding this comment

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

Where can customer find the critical alerts? and which alerts are critical? maybe a summarize here is helpful.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can add a sentence describing where to find alerts in the UI. I don't think there's currently a command to see alerts.

Choose a reason for hiding this comment

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

I think run oc adm upgrade can also find the critical alerts. /cc @shellyyang1989 for confirm.

Copy link
Member

Choose a reason for hiding this comment

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

Currently alerts are not surfaced in any oc command. OTA-1080 and OTA-1157 should eventually improve this state.


[discrete]
[id="cluster-upgradeable_{context}"]
=== Ensure that the cluster is in an Upgradable state

Choose a reason for hiding this comment

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

How do we know if a cluster is in an Upgradable state?

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 document the Upgradeable condition of cluster Operators here: Understanding cluster Operator condition types.

I can add a link to that page underneath this overall best practices section

Choose a reason for hiding this comment

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

That would be greatly help. Thanks!

@skopacz1
Copy link
Contributor Author

skopacz1 commented Jan 8, 2024

@JianLi-RH Sorry that I've taken so long to get back to your feedback! Would you mind taking another look and seeing if I addressed all of your points? Thanks!

@skopacz1
Copy link
Contributor Author

skopacz1 commented Jan 9, 2024

/retest

@skopacz1
Copy link
Contributor Author

skopacz1 commented Jan 9, 2024

Closing and reopening to restart automated tests and hopefully causing the preview to be updated

@skopacz1 skopacz1 closed this Jan 9, 2024
@skopacz1 skopacz1 reopened this Jan 9, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 9, 2024

@skopacz1: This pull request references OSDOCS-2427 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.16.0" version, but no target version was set.

In response to this:

OSDOCS-2427

Version(s): 4.13+ (note to merge reviewer - the 4.13 auto CP will likely fail)

This PR adds guidance for users about best practices they can employ to ensure that their cluster update is successful. This is not meant to be a list of additional prerequisites that users must follow before initiating an update.

QE review:

  • QE has approved this change.

Preview: Best practices for cluster updates

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.

@skopacz1
Copy link
Contributor Author

skopacz1 commented Jan 9, 2024

/retest

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 9, 2024

@skopacz1: This pull request references OSDOCS-2427 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.16.0" version, but no target version was set.

In response to this:

OSDOCS-2427

Version(s): 4.13+ (note to merge reviewer - the 4.13 auto CP will likely fail)

This PR adds guidance for users about best practices they can employ to ensure that their cluster update is successful. This is not meant to be a list of additional prerequisites that users must follow before initiating an update.

QE review:

  • QE has approved this change.

Preview: Best practices for cluster updates (VPN required)

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.

@JianLi-RH
Copy link

Thank you @skopacz1.

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2024
@skopacz1
Copy link
Contributor Author

/label peer-review-needed

@openshift-ci openshift-ci bot added the peer-review-needed Signifies that the peer review team needs to review this PR label Jan 10, 2024
Copy link
Contributor

@bscott-rh bscott-rh left a comment

Choose a reason for hiding this comment

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

Nice work, left a few style guide comments.

/remove-label peer-review-in-progress
/remove-label peer-review-needed
/label peer-review-done

[id="update-best-practices_{context}"]
= Best practices for cluster updates

{product-title} is designed to provide a robust update experience that allows clusters to update with minimal disruptions to workloads.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
{product-title} is designed to provide a robust update experience that allows clusters to update with minimal disruptions to workloads.
{product-title} provides a robust update experience that minimizes workload disruptions.

Reworded to avoid passive voice and the use of "allow" per ISG:
"Avoid stating that inanimate objects grant abilities to people, as in “the product allows you to…”. Whenever possible, use a direct, user-focused alternative such as “you can use the product to…” or “with this product, users can…”.

= Best practices for cluster updates

{product-title} is designed to provide a robust update experience that allows clusters to update with minimal disruptions to workloads.
Updates will not begin unless the cluster is determined to be in an upgradeable state at the time of the update request.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Updates will not begin unless the cluster is determined to be in an upgradeable state at the time of the update request.
Updates will not begin unless the cluster is in an upgradeable state at the time of the update request.

Passive voice

{product-title} is designed to provide a robust update experience that allows clusters to update with minimal disruptions to workloads.
Updates will not begin unless the cluster is determined to be in an upgradeable state at the time of the update request.

This design ensures that some key conditions are met before initiating an update, but there are a number of actions you can take to increase your chances of a successful cluster update.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
This design ensures that some key conditions are met before initiating an update, but there are a number of actions you can take to increase your chances of a successful cluster update.
This design enforces some key conditions before initiating an update, but there are a number of actions you can take to ensure a successful cluster update.

Reworded passive voice and added stronger tone. "increase your chances" sounds like the user is gambling

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The first part of your suggestion sounds good, but I'm actively avoiding using terms like "ensuring" to avoid making promises to the user about the success of an update. The spirit of this doc is to acknowledge factors that can affect the success of an update and inform users how they can mitigate risk factors, it's not to assuage users that their updates will be universally successful.

IMO while we wouldn't want to explicitly state that updates are a gamble, that's sort of the nature of major tasks that introduce change and instability to the cluster, such as an update, and we don't want to misrepresent that nature in a doc meant to give users best practices and advice.

//
// * updating/preparing_for_updates/updating-cluster-prepare.adoc

:_mod-docs-content-type: PROCEDURE
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
:_mod-docs-content-type: PROCEDURE
:_mod-docs-content-type: REFERENCE

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch, I copied and pasted this metadata stuff from another module

[id="recommended-versions_{context}"]
== Choose versions recommended by the OpenShift Update Service

The OpenShift Update Service (OSUS) provides update recommendations based on cluster characteristics such as the cluster's subscribed channel, which are then saved by the Cluster Version Operator as either recommended or conditional updates.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
The OpenShift Update Service (OSUS) provides update recommendations based on cluster characteristics such as the cluster's subscribed channel, which are then saved by the Cluster Version Operator as either recommended or conditional updates.
The OpenShift Update Service (OSUS) provides update recommendations based on cluster characteristics such as the cluster's subscribed channel. The Cluster Version Operator saves these recommendations as either recommended or conditional updates.

Rewording suggestion

== Ensure that the cluster is in an Upgradable state

When one or more Operators have not reported their `Upgradeable` condition as `True` for more than an hour, the `ClusterNotUpgradeable` warning alert is triggered in the cluster.
In most cases patch updates are not blocked by this alert, but you cannot perform a minor version update until this alert is resolved and all Operators report `Upgradeable` as `True`.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
In most cases patch updates are not blocked by this alert, but you cannot perform a minor version update until this alert is resolved and all Operators report `Upgradeable` as `True`.
In most cases this alert does not block patch updates, but you cannot perform a minor version update until you resolve this alert and all Operators report `Upgradeable` as `True`.

passive voice

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds good for the first part, but as to changing the second part to "until you resolve this alert": I'm honestly not familiar enough with OCP to suggest that this alert always requires user intervention to resolve. Maybe in some cases something weird happens to an Operator for an hour to trigger the Upgradeable=false condition, then it fixes itself, reports Upgradeable as true, and the alert goes away solely due to system actions?

I think I'll keep it as "this alert is resolved" to keep that user vs system ambiguity, unless an SME can confirm that basically every time an Operator reports Upgradeable as false, it's an issue that requires user action to resolve.

CC @petr-muller and @wking

Copy link
Member

Choose a reason for hiding this comment

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

It can be both, but I think most cases of Upgradeable=False signal that the user needs to do something.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds good, I suppose the distinction is probably not relevant enough to leave that ambiguity in.

Comment on lines +43 to +44
A cluster should not be running with little to no spare node capacity, especially when initiating a cluster update.
Nodes that are not running and available may limit a cluster's ability to perform an update with minimal disruption to cluster workloads.
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it would be better to reword this in a positive voice, such as "You should have spare node capacity to ensure.." and "Having available nodes is important for cluster updates to complete with minimal disruption" or something to that effect. I'm not entirely sure what is meant by "running and available" though.

Copy link
Contributor Author

@skopacz1 skopacz1 Jan 12, 2024

Choose a reason for hiding this comment

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

I'll admit this sounds negative but I think it's useful to talk about the consequences this can have on update success, especially since there's already a more positive sounding, actionable piece of advice at the end of the section here on line 49. I feel like it would be a bit redundant to also have similar phrasing here. That's just my opinion though, let me know if you disagree.

A cluster should not be running with little to no spare node capacity, especially when initiating a cluster update.
Nodes that are not running and available may limit a cluster's ability to perform an update with minimal disruption to cluster workloads.

Depending on the configured value of the cluster's `maxUnavailable` spec, an unavailable node can also prevent itself and other nodes from having machine configuration changes applied during a cluster update.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Depending on the configured value of the cluster's `maxUnavailable` spec, an unavailable node can also prevent itself and other nodes from having machine configuration changes applied during a cluster update.
Depending on the configured value of the cluster's `maxUnavailable` spec, the cluster may not be able to apply machine configuration changes to nodes if there is an unavailable node.

passive voice

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can try and reword it in active voice, sure.

[id="pod-disruption-budget_{context}"]
== Ensure that the cluster's PodDisruptionBudget is properly configured

The `PodDisruptionBudget` object allows you to define the minimum number or percentage of pod replicas that must be available at any given time.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
The `PodDisruptionBudget` object allows you to define the minimum number or percentage of pod replicas that must be available at any given time.
You can use the `PodDisruptionBudget` object to define the minimum number or percentage of pod replicas that must be available at any given time.

Removed permissive language

== Ensure that the cluster's PodDisruptionBudget is properly configured

The `PodDisruptionBudget` object allows you to define the minimum number or percentage of pod replicas that must be available at any given time.
This configuration allows workloads to be protected from disruptions during maintenance tasks such as cluster updates.
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
This configuration allows workloads to be protected from disruptions during maintenance tasks such as cluster updates.
This configuration protects workloads from disruptions during maintenance tasks such as cluster updates.

@openshift-ci openshift-ci bot added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-in-progress Signifies that the peer review team is reviewing this PR peer-review-needed Signifies that the peer review team needs to review this PR labels Jan 10, 2024
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 12, 2024
Copy link

openshift-ci bot commented Jan 12, 2024

New changes are detected. LGTM label has been removed.

Copy link

openshift-ci bot commented Jan 12, 2024

@skopacz1: all tests passed!

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

@skopacz1
Copy link
Contributor Author

/label merge-review-needed

@openshift-ci openshift-ci bot added the merge-review-needed Signifies that the merge review team needs to review this PR label Jan 12, 2024
@ShaunaDiaz
Copy link
Contributor

/label merge-review-in-progress

@openshift-ci openshift-ci bot added the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Jan 15, 2024
@ShaunaDiaz
Copy link
Contributor

/remove-label merge-review-needed

@openshift-ci openshift-ci bot removed the merge-review-needed Signifies that the merge review team needs to review this PR label Jan 15, 2024
@ShaunaDiaz ShaunaDiaz merged commit a833ecc into openshift:main Jan 15, 2024
2 checks passed
@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.15

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.14

@ShaunaDiaz
Copy link
Contributor

/cherrypick enterprise-4.13

@ShaunaDiaz
Copy link
Contributor

/remove-label merge-review-in-progress

@openshift-ci openshift-ci bot removed the merge-review-in-progress Signifies that the merge review team is reviewing this PR label Jan 15, 2024
@openshift-cherrypick-robot

@ShaunaDiaz: new pull request created: #70234

In response to this:

/cherrypick 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/test-infra repository.

@openshift-cherrypick-robot

@ShaunaDiaz: #68477 failed to apply on top of branch "enterprise-4.14":

Applying: OSDOCS-2427: Update best practices
Using index info to reconstruct a base tree...
M	updating/preparing_for_updates/updating-cluster-prepare.adoc
Falling back to patching base and 3-way merge...
Auto-merging updating/preparing_for_updates/updating-cluster-prepare.adoc
CONFLICT (content): Merge conflict in updating/preparing_for_updates/updating-cluster-prepare.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OSDOCS-2427: Update best practices
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick 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/test-infra repository.

@openshift-cherrypick-robot

@ShaunaDiaz: #68477 failed to apply on top of branch "enterprise-4.13":

Applying: OSDOCS-2427: Update best practices
Using index info to reconstruct a base tree...
A	updating/preparing_for_updates/updating-cluster-prepare.adoc
Falling back to patching base and 3-way merge...
Auto-merging updating/updating-cluster-prepare.adoc
CONFLICT (content): Merge conflict in updating/updating-cluster-prepare.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 OSDOCS-2427: Update best practices
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick 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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch/enterprise-4.13 branch/enterprise-4.14 branch/enterprise-4.15 jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. peer-review-done Signifies that the peer review team has reviewed this PR size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet