Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions install_config/upgrading/manual_upgrades.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ On RHEL 7 systems, also clear the *yum* cache:
----
# yum clean all
----
endif::openshift-enterprise[]
endif::[]

. Install or update to the latest available version of the
*atomic-openshift-utils* package on each RHEL 7 system, which provides files
Expand Down Expand Up @@ -1274,7 +1274,7 @@ For native HA multiple master deployments:
+
After the service restarts, the certificate update is complete.
// end::30to31updatingcerts[]
endif::openshift-origin[]
endif::[]

[[manual-upgrading-efk-logging-stack]]
== Upgrading the EFK Logging Stack
Expand Down Expand Up @@ -1308,21 +1308,21 @@ ifdef::openshift-enterprise[]
$ oc apply -n openshift -f \
/usr/share/openshift/examples/infrastructure-templates/enterprise/logging-deployer.yaml
----
endif::openshift-enterprise[]
endif::[]
ifdef::openshift-origin[]
----
$ oc apply -n openshift -f \
https://raw.githubusercontent.com/openshift/origin-aggregated-logging/master/deployer/deployer.yaml
----
endif::openshift-origin[]
endif::[]

. Generate any missing service accounts and roles:
+
----
$ oc process logging-deployer-account-template | oc apply -f -
----

. Ensure that the cluster role `oauth-editor` is assigned to the logging-deployer
. Ensure that the cluster role `oauth-editor` is assigned to the *logging-deployer*
service account:
+
----
Expand All @@ -1331,7 +1331,7 @@ $ oadm policy add-cluster-role-to-user oauth-editor \
----

. In preparation for running the deployer, ensure that you have the configurations
for your current deployment in the xref:../aggregate_logging.adoc#aggregate-logging-specifying-deployer-parameters[logging-deployer configmap].
for your current deployment in the xref:../aggregate_logging.adoc#aggregate-logging-specifying-deployer-parameters[*logging-deployer* ConfigMap].
+
[IMPORTANT]
====
Expand All @@ -1345,15 +1345,15 @@ version.
$ oc new-app logging-deployer-template -p MODE=upgrade
----
+
Running the deployer in this mode handles scaling down the components to minimize
loss of logs, patching configs, generating missing secrets and keys, and scaling
the components back up to their previous replica count.
Running the deployer in this mode handles scaling down the components to
minimize loss of logs, patching configurations, generating missing secrets and
keys, and scaling the components back up to their previous replica count.
+
[IMPORTANT]
====
Due to the privileges needed to label and unlabel a node for controlling the deployment
of Fluentd pods, the deployer does delete the logging-fluentd Daemonset and recreates
it from the `logging-fluentd-template` template.
of Fluentd pods, the deployer does delete the *logging-fluentd* Daemonset and recreates
it from the *logging-fluentd-template* template.
====

[[manual-upgrading-cluster-metrics]]
Expand Down Expand Up @@ -1411,7 +1411,7 @@ This section will be updated over time as new asynchronous updates are released
for {product-title} 3.3.

See the xref:../../release_notes/ose_3_2_release_notes.adoc#release-notes-ocp-3-3-release-notes[{product-title} 3.3 Release Notes] to review the latest release notes.
endif::openshift-enterprise[]
endif::[]

ifdef::openshift-origin[]
Read through the following sections carefully depending on your upgrade path, as
Expand Down