diff --git a/logging/cluster-logging-upgrading.adoc b/logging/cluster-logging-upgrading.adoc index ca98c65423..47b2de20c1 100644 --- a/logging/cluster-logging-upgrading.adoc +++ b/logging/cluster-logging-upgrading.adoc @@ -7,7 +7,7 @@ toc::[] -After updating the {product-title} cluster from 4.3 to 4.4, you must then upgrade cluster logging from 4.3 to 4.4. +After updating the {product-title} cluster from 4.4 to 4.5, you must then upgrade cluster logging from 4.4 to 4.5. // The following include statements pull in the module files that comprise // the assembly. Include any combination of concept, procedure, or reference diff --git a/modules/cli-administrator-other.adoc b/modules/cli-administrator-other.adoc index a897f1912f..cb4bccb4fc 100644 --- a/modules/cli-administrator-other.adoc +++ b/modules/cli-administrator-other.adoc @@ -45,8 +45,8 @@ Manage various aspects of the {product-title} release process, such as viewing i .Example: Generate a changelog between two releases and save to `changelog.md` ---- $ oc adm release info --changelog=/tmp/git \ - quay.io/openshift-release-dev/ocp-release:4.4.0-rc.7 \ - quay.io/openshift-release-dev/ocp-release:4.4.0 \ + quay.io/openshift-release-dev/ocp-release:4.5.0-rc.7 \ + quay.io/openshift-release-dev/ocp-release:4.5.0 \ > changelog.md ---- diff --git a/modules/cli-installing-cli-rpm.adoc b/modules/cli-installing-cli-rpm.adoc index 1b29324868..986e4a5999 100644 --- a/modules/cli-installing-cli-rpm.adoc +++ b/modules/cli-installing-cli-rpm.adoc @@ -40,7 +40,7 @@ For {op-system-base-full}, you can install the OpenShift CLI (`oc`) as an RPM if . Enable the repositories required by {product-title} {product-version}: + ---- -# subscription-manager repos --enable="rhel-7-server-ose-4.4-rpms" +# subscription-manager repos --enable="rhel-7-server-ose-4.5-rpms" ---- . Install the `openshift-clients` package: diff --git a/modules/cluster-logging-deploy-cli.adoc b/modules/cluster-logging-deploy-cli.adoc index d66564d6dd..9b9db76d01 100644 --- a/modules/cluster-logging-deploy-cli.adoc +++ b/modules/cluster-logging-deploy-cli.adoc @@ -125,14 +125,14 @@ metadata: name: "elasticsearch-operator" namespace: "openshift-operators-redhat" <1> spec: - channel: "4.4" <2> + channel: "4.5" <2> installPlanApproval: "Automatic" source: "redhat-operators" <3> sourceNamespace: "openshift-marketplace" name: "elasticsearch-operator" ---- <1> You must specify the `openshift-operators-redhat` Namespace. -<2> Specify `4.4` as the channel. +<2> Specify `4.5` as the channel. <3> Specify `redhat-operators`. If your {product-title} cluster is installed on a restricted network, also known as a disconnected cluster, specify the name of the CatalogSource object created when you configured the Operator Lifecycle Manager (OLM). @@ -156,14 +156,14 @@ The Elasticsearch Operator is installed to the `openshift-operators-redhat` Name oc get csv --all-namespaces NAMESPACE NAME DISPLAY VERSION REPLACES PHASE -default elasticsearch-operator.4.4.0-202004222248 Elasticsearch Operator 4.4.0-202004222248 Succeeded -kube-node-lease elasticsearch-operator.4.4.0-202004222248 Elasticsearch Operator 4.4.0-202004222248 Succeeded -kube-public elasticsearch-operator.4.4.0-202004222248 Elasticsearch Operator 4.4.0-202004222248 Succeeded -kube-system elasticsearch-operator.4.4.0-202004222248 Elasticsearch Operator 4.4.0-202004222248 Succeeded -openshift-apiserver-operator elasticsearch-operator.4.4.0-202004222248 Elasticsearch Operator 4.4.0-202004222248 Succeeded -openshift-apiserver elasticsearch-operator.4.4.0-202004222248 Elasticsearch Operator 4.4.0-202004222248 Succeeded -openshift-authentication-operator elasticsearch-operator.4.4.0-202004222248 Elasticsearch Operator 4.4.0-202004222248 Succeeded -openshift-authentication elasticsearch-operator.4.4.0-202004222248 Elasticsearch Operator 4.4.0-202004222248 Succeeded +default elasticsearch-operator.4.5.0-202006160135 Elasticsearch Operator 4.5.0-202006160135 Succeeded +kube-node-lease elasticsearch-operator.4.5.0-202006160135 Elasticsearch Operator 4.5.0-202006160135 Succeeded +kube-public elasticsearch-operator.4.5.0-202006160135 Elasticsearch Operator 4.5.0-202006160135 Succeeded +kube-system elasticsearch-operator.4.5.0-202006160135 Elasticsearch Operator 4.5.0-202006160135 Succeeded +openshift-apiserver-operator elasticsearch-operator.4.5.0-202006160135 Elasticsearch Operator 4.5.0-202006160135 Succeeded +openshift-apiserver elasticsearch-operator.4.5.0-202006160135 Elasticsearch Operator 4.5.0-202006160135 Succeeded +openshift-authentication-operator elasticsearch-operator.4.5.0-202006160135 Elasticsearch Operator 4.5.0-202006160135 Succeeded +openshift-authentication elasticsearch-operator.4.5.0-202006160135 Elasticsearch Operator 4.5.0-202006160135 Succeeded ... ---- + @@ -208,13 +208,13 @@ metadata: name: cluster-logging namespace: openshift-logging <1> spec: - channel: "4.4" <2> + channel: "4.5" <2> name: cluster-logging source: redhat-operators <3> sourceNamespace: openshift-marketplace ---- <1> You must specify the `openshift-logging` Namespace. -<2> Specify `4.4` as the channel. +<2> Specify `4.5` as the channel. <3> Specify `redhat-operators`. If your OpenShift Container Platform cluster is installed on a restricted network, also known as a disconnected cluster, specify the name of the CatalogSource object you created when you configured the Operator Lifecycle Manager (OLM). .. Create the Subscription object: @@ -240,7 +240,7 @@ oc get csv -n openshift-logging NAMESPACE NAME DISPLAY VERSION REPLACES PHASE ... -openshift-logging clusterlogging.4.4.0-202004222248 Cluster Logging 4.4.0-202004222248 Succeeded +openshift-logging clusterlogging.4.5.0-202006160135 Cluster Logging 4.5.0-202006160135 Succeeded ... ---- diff --git a/modules/cluster-logging-updating-logging.adoc b/modules/cluster-logging-updating-logging.adoc index f77b2d94fb..94c8fa34ad 100644 --- a/modules/cluster-logging-updating-logging.adoc +++ b/modules/cluster-logging-updating-logging.adoc @@ -5,7 +5,7 @@ [id="cluster-logging-updating-logging_{context}"] = Updating cluster logging -After updating the {product-title} cluster, you can update cluster logging from 4.3 to 4.4 by updating the subscription for the Elasticsearch Operator and the Cluster Logging Operator. +After updating the {product-title} cluster, you can update cluster logging from 4.4 to 4.5 by updating the subscription for the Elasticsearch Operator and the Cluster Logging Operator. ifdef::openshift-enterprise,openshift-webscale[] [IMPORTANT] @@ -18,7 +18,7 @@ endif::[] .Prerequisites -* Update the cluster from 4.3 to 4.4. +* Update the cluster from 4.4 to 4.5. * Make sure the cluster logging status is healthy: + @@ -39,15 +39,15 @@ endif::[] .. Click *Subscription* -> *Channel*. -.. In the *Change Subscription Update Channel* window, select *4.4* and click *Save*. +.. In the *Change Subscription Update Channel* window, select *4.5* and click *Save*. .. Wait for a few seconds, then click *Operators* -> *Installed Operators*. + -The Elasticsearch Operator is shown as 4.4. For example: +The Elasticsearch Operator is shown as 4.5. For example: + ---- Elasticsearch Operator -4.4.0-201909201915 provided +4.5.0-202006160135 provided by Red Hat, Inc ---- @@ -61,21 +61,21 @@ by Red Hat, Inc .. Click *Subscription* -> *Channel*. -.. In the *Change Subscription Update Channel* window, select *4.4* and click *Save*. +.. In the *Change Subscription Update Channel* window, select *4.5* and click *Save*. .. Wait for a few seconds, then click *Operators* -> *Installed Operators*. + -The Cluster Logging Operator is shown as 4.4. For example: +The Cluster Logging Operator is shown as 4.5. For example: + ---- Cluster Logging -4.4.0-201909201915 provided +4.5.0-202006160135 provided by Red Hat, Inc ---- . Check the logging components: -.. Ensure that the Elasticsearch Pods are using a 4.4 image: +.. Ensure that the Elasticsearch Pods are using a 4.5 image: + ---- $ oc get pod -o yaml -n openshift-logging --selector component=elasticsearch |grep 'image:' @@ -120,7 +120,7 @@ oc exec -n openshift-logging -c elasticsearch elasticsearch-cdm-1pbrl44l-1-55b75 ---- -.. Ensure that the logging collector Pods are using a 4.4 image: +.. Ensure that the logging collector Pods are using a 4.5 image: + ---- $ oc get pod -n openshift-logging --selector logging-infra=fluentd -o yaml |grep 'image:' @@ -141,7 +141,7 @@ image: registry.redhat.io/openshift4/ose-logging-fluentd@sha256:20f92b37685bc100 image: registry.redhat.io/openshift4/ose-logging-fluentd@sha256:20f92b37685bc1003bb490002f7d8a1abee2dd2d157e8532afa3830ce8da3483 ---- -.. Ensure that the Kibana Pods are using a 4.4 image: +.. Ensure that the Kibana Pods are using a 4.5 image: + ---- $ oc get pod -n openshift-logging --selector logging-infra=kibana -o yaml |grep 'image:' @@ -154,7 +154,7 @@ image: registry.redhat.io/openshift4/ose-logging-kibana5@sha256:3d657e3b90fae604 image: registry.redhat.io/openshift4/ose-oauth-proxy@sha256:5fe478210770b21c1eb26c1570bcbda40bc5a79011580ff5ebd4c701a5b04eb2 ---- -.. Ensure that the Curator CronJob is using a 4.4 image: +.. Ensure that the Curator CronJob is using a 4.5 image: + ---- $ oc get CronJob curator -n openshift-logging -o yaml |grep 'image:' diff --git a/modules/cnf-installing-the-performance-addon-operator.adoc b/modules/cnf-installing-the-performance-addon-operator.adoc index 034817b10d..f8d7545aed 100644 --- a/modules/cnf-installing-the-performance-addon-operator.adoc +++ b/modules/cnf-installing-the-performance-addon-operator.adoc @@ -70,7 +70,7 @@ step. ---- $ oc get packagemanifest performance-addon-operator -n openshift-marketplace -o jsonpath='{.status.defaultChannel}' -4.4 +4.5 ---- .. Create the following Subscription CR and save the YAML in the `pao-sub.yaml` file: diff --git a/modules/cnf-understanding-low-latency.adoc b/modules/cnf-understanding-low-latency.adoc index c33916c213..5f8b59509b 100644 --- a/modules/cnf-understanding-low-latency.adoc +++ b/modules/cnf-understanding-low-latency.adoc @@ -41,7 +41,7 @@ set values, installing a kernel, and reconfiguring the machine. But this method requires setting up four different Operators and performing many configurations that, when done manually, is complex and could be prone to mistakes. -{product-title} 4.4 provides a Performance Addon Operator to implement automatic +{product-title} provides a Performance Addon Operator to implement automatic tuning in order to achieve low latency performance for OpenShift applications. The cluster administrator uses this performance profile configuration that makes it easier to make these changes in a more reliable way. The administrator can diff --git a/modules/exploring-cvo.adoc b/modules/exploring-cvo.adoc index 793f7f0952..a179fe88e0 100644 --- a/modules/exploring-cvo.adoc +++ b/modules/exploring-cvo.adoc @@ -11,7 +11,7 @@ To see the current version that your cluster is on, type: $ oc get clusterversion NAME    VERSION   AVAILABLE PROGRESSING SINCE STATUS -version 4.4.0-0.0 True      False       10h   Cluster version is 4.4.0-0.0 +version 4.5.0-0.0 True      False       10h   Cluster version is 4.5.0-0.0 ---- Each release version is represented by a set of images. To see basic release information and a list of those images, type: diff --git a/modules/installation-complete-user-infra.adoc b/modules/installation-complete-user-infra.adoc index 37dc8cb310..3c7dc2ca28 100644 --- a/modules/installation-complete-user-infra.adoc +++ b/modules/installation-complete-user-infra.adoc @@ -32,36 +32,36 @@ cluster on infrastructure that you provide. $ watch -n5 oc get clusteroperators NAME VERSION AVAILABLE PROGRESSING DEGRADED SINCE -authentication 4.4.3 True False False 7m56s -cloud-credential 4.4.3 True False False 31m -cluster-autoscaler 4.4.3 True False False 16m -console 4.4.3 True False False 10m -csi-snapshot-controller 4.4.3 True False False 16m -dns 4.4.3 True False False 22m -etcd 4.4.3 False False False 25s -image-registry 4.4.3 True False False 16m -ingress 4.4.3 True False False 16m -insights 4.4.3 True False False 17m -kube-apiserver 4.4.3 True False False 19m -kube-controller-manager 4.4.3 True False False 20m -kube-scheduler 4.4.3 True False False 20m -kube-storage-version-migrator 4.4.3 True False False 16m -machine-api 4.4.3 True False False 22m -machine-config 4.4.3 True False False 22m -marketplace 4.4.3 True False False 16m -monitoring 4.4.3 True False False 10m -network 4.4.3 True False False 23m -node-tuning 4.4.3 True False False 23m -openshift-apiserver 4.4.3 True False False 17m -openshift-controller-manager 4.4.3 True False False 15m -openshift-samples 4.4.3 True False False 16m -operator-lifecycle-manager 4.4.3 True False False 22m -operator-lifecycle-manager-catalog 4.4.3 True False False 22m -operator-lifecycle-manager-packageserver 4.4.3 True False False 18m -service-ca 4.4.3 True False False 23m -service-catalog-apiserver 4.4.3 True False False 23m -service-catalog-controller-manager 4.4.3 True False False 23m -storage 4.4.3 True False False 17m +authentication 4.5.0 True False False 7m56s +cloud-credential 4.5.0 True False False 31m +cluster-autoscaler 4.5.0 True False False 16m +console 4.5.0 True False False 10m +csi-snapshot-controller 4.5.0 True False False 16m +dns 4.5.0 True False False 22m +etcd 4.5.0 False False False 25s +image-registry 4.5.0 True False False 16m +ingress 4.5.0 True False False 16m +insights 4.5.0 True False False 17m +kube-apiserver 4.5.0 True False False 19m +kube-controller-manager 4.5.0 True False False 20m +kube-scheduler 4.5.0 True False False 20m +kube-storage-version-migrator 4.5.0 True False False 16m +machine-api 4.5.0 True False False 22m +machine-config 4.5.0 True False False 22m +marketplace 4.5.0 True False False 16m +monitoring 4.5.0 True False False 10m +network 4.5.0 True False False 23m +node-tuning 4.5.0 True False False 23m +openshift-apiserver 4.5.0 True False False 17m +openshift-controller-manager 4.5.0 True False False 15m +openshift-samples 4.5.0 True False False 16m +operator-lifecycle-manager 4.5.0 True False False 22m +operator-lifecycle-manager-catalog 4.5.0 True False False 22m +operator-lifecycle-manager-packageserver 4.5.0 True False False 18m +service-ca 4.5.0 True False False 23m +service-catalog-apiserver 4.5.0 True False False 23m +service-catalog-controller-manager 4.5.0 True False False 23m +storage 4.5.0 True False False 17m ---- + When all of the cluster Operators are `AVAILABLE`, you can complete the installation. diff --git a/modules/installation-gcp-user-infra-completing.adoc b/modules/installation-gcp-user-infra-completing.adoc index 256488717b..c0c026036f 100644 --- a/modules/installation-gcp-user-infra-completing.adoc +++ b/modules/installation-gcp-user-infra-completing.adoc @@ -40,7 +40,7 @@ The Ignition config files that the installation program generates contain certif ---- $ oc get clusterversion NAME VERSION AVAILABLE PROGRESSING SINCE STATUS -version False True 24m Working towards 4.4.3-0: 99% complete +version False True 24m Working towards 4.5.0-0: 99% complete ---- .. Run the following command to view the Operators managed on the control plane by @@ -49,36 +49,36 @@ the Cluster Version Operator (CVO): ---- $ oc get clusteroperators NAME VERSION AVAILABLE PROGRESSING DEGRADED SINCE -authentication 4.4.3 True False False 7m56s -cloud-credential 4.4.3 True False False 31m -cluster-autoscaler 4.4.3 True False False 16m -console 4.4.3 True False False 10m -csi-snapshot-controller 4.4.3 True False False 16m -dns 4.4.3 True False False 22m -etcd 4.4.3 False False False 25s -image-registry 4.4.3 True False False 16m -ingress 4.4.3 True False False 16m -insights 4.4.3 True False False 17m -kube-apiserver 4.4.3 True False False 19m -kube-controller-manager 4.4.3 True False False 20m -kube-scheduler 4.4.3 True False False 20m -kube-storage-version-migrator 4.4.3 True False False 16m -machine-api 4.4.3 True False False 22m -machine-config 4.4.3 True False False 22m -marketplace 4.4.3 True False False 16m -monitoring 4.4.3 True False False 10m -network 4.4.3 True False False 23m -node-tuning 4.4.3 True False False 23m -openshift-apiserver 4.4.3 True False False 17m -openshift-controller-manager 4.4.3 True False False 15m -openshift-samples 4.4.3 True False False 16m -operator-lifecycle-manager 4.4.3 True False False 22m -operator-lifecycle-manager-catalog 4.4.3 True False False 22m -operator-lifecycle-manager-packageserver 4.4.3 True False False 18m -service-ca 4.4.3 True False False 23m -service-catalog-apiserver 4.4.3 True False False 23m -service-catalog-controller-manager 4.4.3 True False False 23m -storage 4.4.3 True False False 17m +authentication 4.5.0 True False False 7m56s +cloud-credential 4.5.0 True False False 31m +cluster-autoscaler 4.5.0 True False False 16m +console 4.5.0 True False False 10m +csi-snapshot-controller 4.5.0 True False False 16m +dns 4.5.0 True False False 22m +etcd 4.5.0 False False False 25s +image-registry 4.5.0 True False False 16m +ingress 4.5.0 True False False 16m +insights 4.5.0 True False False 17m +kube-apiserver 4.5.0 True False False 19m +kube-controller-manager 4.5.0 True False False 20m +kube-scheduler 4.5.0 True False False 20m +kube-storage-version-migrator 4.5.0 True False False 16m +machine-api 4.5.0 True False False 22m +machine-config 4.5.0 True False False 22m +marketplace 4.5.0 True False False 16m +monitoring 4.5.0 True False False 10m +network 4.5.0 True False False 23m +node-tuning 4.5.0 True False False 23m +openshift-apiserver 4.5.0 True False False 17m +openshift-controller-manager 4.5.0 True False False 15m +openshift-samples 4.5.0 True False False 16m +operator-lifecycle-manager 4.5.0 True False False 22m +operator-lifecycle-manager-catalog 4.5.0 True False False 22m +operator-lifecycle-manager-packageserver 4.5.0 True False False 18m +service-ca 4.5.0 True False False 23m +service-catalog-apiserver 4.5.0 True False False 23m +service-catalog-controller-manager 4.5.0 True False False 23m +storage 4.5.0 True False False 17m ---- .. Run the following command to view your cluster Pods: diff --git a/modules/installation-operators-config.adoc b/modules/installation-operators-config.adoc index 49699976ea..07a6cd75f9 100644 --- a/modules/installation-operators-config.adoc +++ b/modules/installation-operators-config.adoc @@ -26,31 +26,31 @@ Operators so that they all become available. $ watch -n5 oc get clusteroperators NAME VERSION AVAILABLE PROGRESSING DEGRADED SINCE -authentication 4.4.0 True False False 69s -cloud-credential 4.4.0 True False False 12m -cluster-autoscaler 4.4.0 True False False 11m -console 4.4.0 True False False 46s -dns 4.4.0 True False False 11m -image-registry 4.4.0 True False False 5m26s -ingress 4.4.0 True False False 5m36s -kube-apiserver 4.4.0 True False False 8m53s -kube-controller-manager 4.4.0 True False False 7m24s -kube-scheduler 4.4.0 True False False 12m -machine-api 4.4.0 True False False 12m -machine-config 4.4.0 True False False 7m36s -marketplace 4.4.0 True False False 7m54m -monitoring 4.4.0 True False False 7h54s -network 4.4.0 True False False 5m9s -node-tuning 4.4.0 True False False 11m -openshift-apiserver 4.4.0 True False False 11m -openshift-controller-manager 4.4.0 True False False 5m943s -openshift-samples 4.4.0 True False False 3m55s -operator-lifecycle-manager 4.4.0 True False False 11m -operator-lifecycle-manager-catalog 4.4.0 True False False 11m -service-ca 4.4.0 True False False 11m -service-catalog-apiserver 4.4.0 True False False 5m26s -service-catalog-controller-manager 4.4.0 True False False 5m25s -storage 4.4.0 True False False 5m30s +authentication 4.5.0 True False False 69s +cloud-credential 4.5.0 True False False 12m +cluster-autoscaler 4.5.0 True False False 11m +console 4.5.0 True False False 46s +dns 4.5.0 True False False 11m +image-registry 4.5.0 True False False 5m26s +ingress 4.5.0 True False False 5m36s +kube-apiserver 4.5.0 True False False 8m53s +kube-controller-manager 4.5.0 True False False 7m24s +kube-scheduler 4.5.0 True False False 12m +machine-api 4.5.0 True False False 12m +machine-config 4.5.0 True False False 7m36s +marketplace 4.5.0 True False False 7m54m +monitoring 4.5.0 True False False 7h54s +network 4.5.0 True False False 5m9s +node-tuning 4.5.0 True False False 11m +openshift-apiserver 4.5.0 True False False 11m +openshift-controller-manager 4.5.0 True False False 5m943s +openshift-samples 4.5.0 True False False 3m55s +operator-lifecycle-manager 4.5.0 True False False 11m +operator-lifecycle-manager-catalog 4.5.0 True False False 11m +service-ca 4.5.0 True False False 11m +service-catalog-apiserver 4.5.0 True False False 5m26s +service-catalog-controller-manager 4.5.0 True False False 5m25s +storage 4.5.0 True False False 5m30s ---- . Configure the Operators that are not available. diff --git a/modules/installing-cluster-loader.adoc b/modules/installing-cluster-loader.adoc index f769d10328..fdf12f0869 100644 --- a/modules/installing-cluster-loader.adoc +++ b/modules/installing-cluster-loader.adoc @@ -10,5 +10,5 @@ . To pull the container image, run: + ---- -$ sudo podman pull registry.svc.ci.openshift.org/ocp/4.4:tests +$ sudo podman pull registry.svc.ci.openshift.org/ocp/4.5:tests ---- diff --git a/modules/ipi-install-retrieving-the-openshift-installer.adoc b/modules/ipi-install-retrieving-the-openshift-installer.adoc index b43384496e..a388c4e035 100644 --- a/modules/ipi-install-retrieving-the-openshift-installer.adoc +++ b/modules/ipi-install-retrieving-the-openshift-installer.adoc @@ -10,6 +10,6 @@ The latest-4.x can be used to deploy the latest Generally Available version of {product-title}: ---- -[kni@provisioner ~]$ export VERSION=latest-4.4 +[kni@provisioner ~]$ export VERSION=latest-4.5 export RELEASE_IMAGE=$(curl -s https://mirror.openshift.com/pub/openshift-v4/clients/ocp/$VERSION/release.txt | grep 'Pull From: quay.io' | awk -F ' ' '{print $3}') ---- diff --git a/modules/jaeger-install-elasticsearch.adoc b/modules/jaeger-install-elasticsearch.adoc index ac661515d2..e5c50a990c 100644 --- a/modules/jaeger-install-elasticsearch.adoc +++ b/modules/jaeger-install-elasticsearch.adoc @@ -32,7 +32,7 @@ Do not install Community versions of the Operators. Community Operators are not . On the *Create Operator Subscription* page, select *openshift-operators-redhat*. -. Select the Update Channel that matches your {product-title} installation. For example, if you are installing on {product-title} version 4.4, select the 4.4 update channel. +. Select the Update Channel that matches your {product-title} installation. For example, if you are installing on {product-title} version 4.5, select the 4.5 update channel. . Select the *Automatic* Approval Strategy. + diff --git a/modules/nodes-cluster-resource-override-deploy-cli.adoc b/modules/nodes-cluster-resource-override-deploy-cli.adoc index 66403e5b7e..f9fe21eb96 100644 --- a/modules/nodes-cluster-resource-override-deploy-cli.adoc +++ b/modules/nodes-cluster-resource-override-deploy-cli.adoc @@ -5,12 +5,12 @@ [id="nodes-cluster-resource-override-deploy-cli_{context}"] = Installing the Cluster Resource Override Operator using the CLI -You can use the {product-title} CLI to install the Cluster Resource Override Operator to help control overcommit in your cluster. +You can use the {product-title} CLI to install the Cluster Resource Override Operator to help control overcommit in your cluster. .Prerequisites * The Cluster Resource Override Operator has no effect if limits have not -been set on containers. You must specify default limits for a project using a LimitRange +been set on containers. You must specify default limits for a project using a LimitRange object or configure limits in Pod specs in order for the overrides to apply. .Procedure @@ -79,7 +79,7 @@ metadata: name: clusterresourceoverride namespace: clusterresourceoverride-operator spec: - channel: "4.4" + channel: "4.5" name: clusterresourceoverride source: redhat-operators sourceNamespace: openshift-marketplace @@ -136,7 +136,7 @@ For example: $ oc create -f cro-cr.yaml ---- -. Verify the current state of the admission webhook by checking the status of the cluster custom resource. +. Verify the current state of the admission webhook by checking the status of the cluster custom resource. + ---- $ oc get clusterresourceoverride cluster -n clusterresourceoverride-operator -o yaml @@ -195,6 +195,6 @@ metadata: labels: clusterresourceoverrides.admission.autoscaling.openshift.io: enabled <1> ----- +---- <1> Add the `clusterresourceoverrides.admission.autoscaling.openshift.io: enabled` label to the Namespace. //// diff --git a/modules/nodes-scheduler-node-selectors-pod.adoc b/modules/nodes-scheduler-node-selectors-pod.adoc index 64dd71f271..838511f24b 100644 --- a/modules/nodes-scheduler-node-selectors-pod.adoc +++ b/modules/nodes-scheduler-node-selectors-pod.adoc @@ -79,7 +79,7 @@ metadata: labels: beta.kubernetes.io/os: linux failure-domain.beta.kubernetes.io/zone: us-east-1a - node.openshift.io/os_version: '4.4' + node.openshift.io/os_version: '4.5' node-role.kubernetes.io/worker: '' failure-domain.beta.kubernetes.io/region: us-east-1 node.openshift.io/os_id: rhcos diff --git a/modules/nw-cluster-network-operator.adoc b/modules/nw-cluster-network-operator.adoc index 79cc211fe0..0657167a60 100644 --- a/modules/nw-cluster-network-operator.adoc +++ b/modules/nw-cluster-network-operator.adoc @@ -27,7 +27,7 @@ network-operator 1/1 1 1 56m $ oc get clusteroperator/network NAME VERSION AVAILABLE PROGRESSING DEGRADED SINCE -network 4.4.0 True False False 50m +network 4.5.0 True False False 50m ---- The following fields provide information about the status of the operator: `AVAILABLE`, `PROGRESSING`, and `DEGRADED`. The `AVAILABLE` field is `True` when diff --git a/modules/nw-sriov-installing-operator.adoc b/modules/nw-sriov-installing-operator.adoc index 144b0e19de..84fabe68a0 100644 --- a/modules/nw-sriov-installing-operator.adoc +++ b/modules/nw-sriov-installing-operator.adoc @@ -145,4 +145,3 @@ the *Operator Subscriptions* and *Install Plans* tabs for any failure or errors under *Status*. * Go to the *Workloads* -> *Pods* page and check the logs for Pods in the `openshift-sriov-network-operator` project. - diff --git a/modules/rhel-compute-updating.adoc b/modules/rhel-compute-updating.adoc index fa0caa4bfe..bf8a9a032a 100644 --- a/modules/rhel-compute-updating.adoc +++ b/modules/rhel-compute-updating.adoc @@ -40,10 +40,9 @@ You must not enable firewalld later. If you do, you cannot access {product-title .. On the machine that you run the Ansible playbooks, update the required repositories: + ---- -# subscription-manager repos --disable=rhel-7-server-ansible-2.7-rpms \ - --disable=rhel-7-server-ose-4.2-rpms \ - --enable=rhel-7-server-ansible-2.8-rpms \ - --enable=rhel-7-server-ose-4.4-rpms +# subscription-manager repos --disable=rhel-7-server-ose-4.4-rpms \ + --enable=rhel-7-server-ansible-2.9-rpms \ + --enable=rhel-7-server-ose-4.5-rpms ---- .. On the machine that you run the Ansible playbooks, update the required packages, including `openshift-ansible`: @@ -55,8 +54,8 @@ You must not enable firewalld later. If you do, you cannot access {product-title .. On each RHEL compute node, update the required repositories: + ---- -# subscription-manager repos --disable=rhel-7-server-ose-4.3-rpms \ - --enable=rhel-7-server-ose-4.4-rpms +# subscription-manager repos --disable=rhel-7-server-ose-4.4-rpms \ + --enable=rhel-7-server-ose-4.5-rpms ---- . Update a RHEL worker machine: diff --git a/modules/rhel-preparing-node.adoc b/modules/rhel-preparing-node.adoc index ba6ac0c803..0f3007b2ea 100644 --- a/modules/rhel-preparing-node.adoc +++ b/modules/rhel-preparing-node.adoc @@ -68,7 +68,7 @@ Note that this might take a few minutes if you have a large number of available # subscription-manager repos \ --enable="rhel-7-server-rpms" \ --enable="rhel-7-server-extras-rpms" \ - --enable="rhel-7-server-ose-4.4-rpms" + --enable="rhel-7-server-ose-4.5-rpms" ---- . Stop and disable firewalld on the host: diff --git a/modules/rhel-preparing-playbook-machine.adoc b/modules/rhel-preparing-playbook-machine.adoc index 1f224d362a..7e256d7e02 100644 --- a/modules/rhel-preparing-playbook-machine.adoc +++ b/modules/rhel-preparing-playbook-machine.adoc @@ -69,7 +69,7 @@ a pool with an `OpenShift` subscription to it: --enable="rhel-7-server-rpms" \ --enable="rhel-7-server-extras-rpms" \ --enable="rhel-7-server-ansible-2.8-rpms" \ - --enable="rhel-7-server-ose-4.4-rpms" + --enable="rhel-7-server-ose-4.5-rpms" ---- . Install the required packages, including `Openshift-Ansible`: diff --git a/modules/running-cluster-loader.adoc b/modules/running-cluster-loader.adoc index b0c9dc2436..1d2016d862 100644 --- a/modules/running-cluster-loader.adoc +++ b/modules/running-cluster-loader.adoc @@ -18,7 +18,7 @@ template builds and waits for them to complete: + ---- $ sudo podman run -v ${LOCAL_KUBECONFIG}:/root/.kube/config:z -i \ -registry.svc.ci.openshift.org/ocp/4.4:tests /bin/bash -c 'export KUBECONFIG=/root/.kube/config && \ +registry.svc.ci.openshift.org/ocp/4.5:tests /bin/bash -c 'export KUBECONFIG=/root/.kube/config && \ openshift-tests run-test "[Feature:Performance][Serial][Slow] Load cluster should load the \ cluster [Suite:openshift]"' ---- @@ -29,7 +29,7 @@ setting the environment variable for `VIPERCONFIG`: ---- $ sudo podman run -v ${LOCAL_KUBECONFIG}:/root/.kube/config:z \ -v ${LOCAL_CONFIG_FILE_PATH}:/root/configs/:z \ --i registry.svc.ci.openshift.org/ocp/4.4:tests \ +-i registry.svc.ci.openshift.org/ocp/4.5:tests \ /bin/bash -c 'KUBECONFIG=/root/.kube/config VIPERCONFIG=/root/configs/test.yaml \ openshift-tests run-test "[Feature:Performance][Serial][Slow] Load cluster should \ load the cluster [Suite:openshift]"' diff --git a/modules/update-upgrading-cli.adoc b/modules/update-upgrading-cli.adoc index 794c81c054..329f5641a8 100644 --- a/modules/update-upgrading-cli.adoc +++ b/modules/update-upgrading-cli.adoc @@ -28,17 +28,17 @@ known as `oc`, that matches the version for your updated version. $ oc get clusterversion NAME VERSION AVAILABLE PROGRESSING SINCE STATUS -version 4.4.0 True False 158m Cluster version is 4.4.0 +version 4.5.0 True False 158m Cluster version is 4.5.0 ---- . Review the current update channel information and confirm that your channel -is set to `stable-4.4`: +is set to `stable-4.5`: + ---- $ oc get clusterversion -o json|jq ".items[0].spec" { - "channel": "stable-4.4", + "channel": "stable-4.5", "clusterID": "990f7ab8-109b-4c95-8480-2bd1deec55ff", "upstream": "https://api.openshift.com/api/upgrades_info/v1/graph" } @@ -84,12 +84,12 @@ previous command. $ oc get clusterversion -o json|jq ".items[0].spec" { - "channel": "stable-4.4", + "channel": "stable-4.5", "clusterID": "990f7ab8-109b-4c95-8480-2bd1deec55ff", "desiredUpdate": { "force": false, "image": "quay.io/openshift-release-dev/ocp-release@sha256:9c5f0df8b192a0d7b46cd5f6a4da2289c155fd5302dec7954f8f06c878160b8b", - "version": "4.4.0" <1> + "version": "4.5.0" <1> }, "upstream": "https://api.openshift.com/api/upgrades_info/v1/graph" } @@ -143,5 +143,5 @@ updated to the new version: $ oc get clusterversion NAME VERSION AVAILABLE PROGRESSING SINCE STATUS -version 4.4.0 True False 2m Cluster version is 4.4.0 +version 4.5.0 True False 2m Cluster version is 4.5.0 ----