Skip to content

Commit

Permalink
Version number bumps for 4.8 GA
Browse files Browse the repository at this point in the history
  • Loading branch information
@ahardin-rh
ahardin-rh committed Jun 22, 2021
1 parent c6d4032 commit e5d7da4
Show file tree
Hide file tree
Showing 26 changed files with 109 additions and 110 deletions.
2 changes: 1 addition & 1 deletion cli_reference/osdk/cli-osdk-install.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ See xref:../../operators/operator_sdk/osdk-about.adoc#osdk-about[Developing Oper

[NOTE]
====
{product-title} 4.7 supports Operator SDK v1.3.0.
{product-title} 4.7 and later supports Operator SDK v1.3.0.
====

include::modules/osdk-installing-cli-linux-macos.adoc[leveloffset=+1]
8 changes: 4 additions & 4 deletions modules/cnf-upgrading-performance-addon-operator.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ You can manually upgrade Performance Addon Operator to the next minor version by

. In the *Channel* pane, click the pencil icon on the right side of the version number to open the *Change Subscription Update Channel* window.

. Select the next minor version. For example, if you want to upgrade to Performance Addon Operator 4.7, select *4.7*.
. Select the next minor version. For example, if you want to upgrade to Performance Addon Operator 4.8, select *4.8*.

. Click *Save*.

Expand Down Expand Up @@ -115,8 +115,8 @@ $ oc get csv
[source,terminal]
----
VERSION REPLACES PHASE
4.7.0 performance-addon-operator.v4.6.0 Installing
4.6.0 Replacing
4.8.0 performance-addon-operator.v4.8.0 Installing
4.7.0 Replacing
----

. Run `get csv` again to verify the output:
Expand All @@ -130,5 +130,5 @@ VERSION REPLACES PHASE
[source,terminal]
----
NAME DISPLAY VERSION REPLACES PHASE
performance-addon-operator.v4.7.0 Performance Addon Operator 4.7.0 performance-addon-operator.v4.6.0 Succeeded
performance-addon-operator.v4.8.0 Performance Addon Operator 4.8.0 performance-addon-operator.v4.7.0 Succeeded
----
2 changes: 1 addition & 1 deletion modules/developer-cli-odo-installing-odo-on-linux.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
+
[source,terminal]
----
# subscription-manager repos --enable="ocp-tools-4.7-for-rhel-8-x86_64-rpms"
# subscription-manager repos --enable="ocp-tools-4.8-for-rhel-8-x86_64-rpms"
----

. Install the `{odo-title}` package:
Expand Down
2 changes: 1 addition & 1 deletion modules/gathering-data-specific-features.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ ifndef::openshift-origin[]
|`registry.redhat.io/rhmtc/openshift-migration-must-gather-rhel8:v{mtc-version}`
|Data collection for the {mtc-full}.

|`registry.redhat.io/ocs4/ocs-must-gather-rhel8:v4.7`
|`registry.redhat.io/ocs4/ocs-must-gather-rhel8:v4.8`
|Data collection for Red Hat OpenShift Container Storage.

|`registry.redhat.io/openshift4/ose-cluster-logging-operator`
Expand Down
16 changes: 8 additions & 8 deletions modules/graceful-restart.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@ Check that there are no cluster Operators with the `DEGRADED` condition set to `
[source,terminal]
----
NAME VERSION AVAILABLE PROGRESSING DEGRADED SINCE
authentication 4.7.0 True False False 59m
cloud-credential 4.7.0 True False False 85m
cluster-autoscaler 4.7.0 True False False 73m
config-operator 4.7.0 True False False 73m
console 4.7.0 True False False 62m
csi-snapshot-controller 4.7.0 True False False 66m
dns 4.7.0 True False False 76m
etcd 4.7.0 True False False 76m
authentication 4.8.0 True False False 59m
cloud-credential 4.8.0 True False False 85m
cluster-autoscaler 4.8.0 True False False 73m
config-operator 4.8.0 True False False 73m
console 4.8.0 True False False 62m
csi-snapshot-controller 4.8.0 True False False 66m
dns 4.8.0 True False False 76m
etcd 4.8.0 True False False 76m
...
----

Expand Down
4 changes: 2 additions & 2 deletions modules/installation-aws-upload-custom-rhcos-ami.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ that region.
* You configured an AWS account.
* You created an Amazon S3 bucket with the required IAM
link:https://docs.aws.amazon.com/vm-import/latest/userguide/vmie_prereqs.html#vmimport-role[service role].
* You uploaded your {op-system} VMDK file to Amazon S3.
* You uploaded your {op-system} VMDK file to Amazon S3.
ifdef::openshift-enterprise,openshift-webscale[]
The {op-system} VMDK file must be the highest version that is less than or equal to the {product-title} version you are installing.
endif::[]
Expand Down Expand Up @@ -47,7 +47,7 @@ variable:
----
$ export RHCOS_VERSION=<version> <1>
----
<1> The {op-system} VMDK version, like `4.7.0`.
<1> The {op-system} VMDK version, like `4.8.0`.

. Export the Amazon S3 bucket name as an environment variable:
+
Expand Down
62 changes: 31 additions & 31 deletions modules/installation-complete-user-infra.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,37 +57,37 @@ $ watch -n5 oc get clusteroperators
[source,terminal]
----
NAME VERSION AVAILABLE PROGRESSING DEGRADED SINCE
authentication 4.7.0 True False False 3h56m
baremetal 4.7.0 True False False 29h
cloud-credential 4.7.0 True False False 29h
cluster-autoscaler 4.7.0 True False False 29h
config-operator 4.7.0 True False False 6h39m
console 4.7.0 True False False 3h59m
csi-snapshot-controller 4.7.0 True False False 4h12m
dns 4.7.0 True False False 4h15m
etcd 4.7.0 True False False 29h
image-registry 4.7.0 True False False 3h59m
ingress 4.7.0 True False False 4h30m
insights 4.7.0 True False False 29h
kube-apiserver 4.7.0 True False False 29h
kube-controller-manager 4.7.0 True False False 29h
kube-scheduler 4.7.0 True False False 29h
kube-storage-version-migrator 4.7.0 True False False 4h2m
machine-api 4.7.0 True False False 29h
machine-approver 4.7.0 True False False 6h34m
machine-config 4.7.0 True False False 3h56m
marketplace 4.7.0 True False False 4h2m
monitoring 4.7.0 True False False 6h31m
network 4.7.0 True False False 29h
node-tuning 4.7.0 True False False 4h30m
openshift-apiserver 4.7.0 True False False 3h56m
openshift-controller-manager 4.7.0 True False False 4h36m
openshift-samples 4.7.0 True False False 4h30m
operator-lifecycle-manager 4.7.0 True False False 29h
operator-lifecycle-manager-catalog 4.7.0 True False False 29h
operator-lifecycle-manager-packageserver 4.7.0 True False False 3h59m
service-ca 4.7.0 True False False 29h
storage 4.7.0 True False False 4h30m
authentication 4.8.0 True False False 3h56m
baremetal 4.8.0 True False False 29h
cloud-credential 4.8.0 True False False 29h
cluster-autoscaler 4.8.0 True False False 29h
config-operator 4.8.0 True False False 6h39m
console 4.8.0 True False False 3h59m
csi-snapshot-controller 4.8.0 True False False 4h12m
dns 4.8.0 True False False 4h15m
etcd 4.8.0 True False False 29h
image-registry 4.8.0 True False False 3h59m
ingress 4.8.0 True False False 4h30m
insights 4.8.0 True False False 29h
kube-apiserver 4.8.0 True False False 29h
kube-controller-manager 4.8.0 True False False 29h
kube-scheduler 4.8.0 True False False 29h
kube-storage-version-migrator 4.8.0 True False False 4h2m
machine-api 4.8.0 True False False 29h
machine-approver 4.8.0 True False False 6h34m
machine-config 4.8.0 True False False 3h56m
marketplace 4.8.0 True False False 4h2m
monitoring 4.8.0 True False False 6h31m
network 4.8.0 True False False 29h
node-tuning 4.8.0 True False False 4h30m
openshift-apiserver 4.8.0 True False False 3h56m
openshift-controller-manager 4.8.0 True False False 4h36m
openshift-samples 4.8.0 True False False 4h30m
operator-lifecycle-manager 4.8.0 True False False 29h
operator-lifecycle-manager-catalog 4.8.0 True False False 29h
operator-lifecycle-manager-packageserver 4.8.0 True False False 3h59m
service-ca 4.8.0 True False False 29h
storage 4.8.0 True False False 4h30m
----
+
When all of the cluster Operators are `AVAILABLE`, you can complete the installation.
Expand Down
62 changes: 31 additions & 31 deletions modules/installation-operators-config.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,36 +36,36 @@ $ watch -n5 oc get clusteroperators
[source,terminal]
----
NAME VERSION AVAILABLE PROGRESSING DEGRADED SINCE
authentication 4.7.0 True False False 3h56m
baremetal 4.7.0 True False False 29h
cloud-credential 4.7.0 True False False 29h
cluster-autoscaler 4.7.0 True False False 29h
config-operator 4.7.0 True False False 6h39m
console 4.7.0 True False False 3h59m
csi-snapshot-controller 4.7.0 True False False 4h12m
dns 4.7.0 True False False 4h15m
etcd 4.7.0 True False False 29h
image-registry 4.7.0 True False False 3h59m
ingress 4.7.0 True False False 4h30m
insights 4.7.0 True False False 29h
kube-apiserver 4.7.0 True False False 29h
kube-controller-manager 4.7.0 True False False 29h
kube-scheduler 4.7.0 True False False 29h
kube-storage-version-migrator 4.7.0 True False False 4h2m
machine-api 4.7.0 True False False 29h
machine-approver 4.7.0 True False False 6h34m
machine-config 4.7.0 True False False 3h56m
marketplace 4.7.0 True False False 4h2m
monitoring 4.7.0 True False False 6h31m
network 4.7.0 True False False 29h
node-tuning 4.7.0 True False False 4h30m
openshift-apiserver 4.7.0 True False False 3h56m
openshift-controller-manager 4.7.0 True False False 4h36m
openshift-samples 4.7.0 True False False 4h30m
operator-lifecycle-manager 4.7.0 True False False 29h
operator-lifecycle-manager-catalog 4.7.0 True False False 29h
operator-lifecycle-manager-packageserver 4.7.0 True False False 3h59m
service-ca 4.7.0 True False False 29h
storage 4.7.0 True False False 4h30m
authentication 4.8.0 True False False 3h56m
baremetal 4.8.0 True False False 29h
cloud-credential 4.8.0 True False False 29h
cluster-autoscaler 4.8.0 True False False 29h
config-operator 4.8.0 True False False 6h39m
console 4.8.0 True False False 3h59m
csi-snapshot-controller 4.8.0 True False False 4h12m
dns 4.8.0 True False False 4h15m
etcd 4.8.0 True False False 29h
image-registry 4.8.0 True False False 3h59m
ingress 4.8.0 True False False 4h30m
insights 4.8.0 True False False 29h
kube-apiserver 4.8.0 True False False 29h
kube-controller-manager 4.8.0 True False False 29h
kube-scheduler 4.8.0 True False False 29h
kube-storage-version-migrator 4.8.0 True False False 4h2m
machine-api 4.8.0 True False False 29h
machine-approver 4.8.0 True False False 6h34m
machine-config 4.8.0 True False False 3h56m
marketplace 4.8.0 True False False 4h2m
monitoring 4.8.0 True False False 6h31m
network 4.8.0 True False False 29h
node-tuning 4.8.0 True False False 4h30m
openshift-apiserver 4.8.0 True False False 3h56m
openshift-controller-manager 4.8.0 True False False 4h36m
openshift-samples 4.8.0 True False False 4h30m
operator-lifecycle-manager 4.8.0 True False False 29h
operator-lifecycle-manager-catalog 4.8.0 True False False 29h
operator-lifecycle-manager-packageserver 4.8.0 True False False 3h59m
service-ca 4.8.0 True False False 29h
storage 4.8.0 True False False 4h30m
----
. Configure the Operators that are not available.
2 changes: 1 addition & 1 deletion modules/installation-user-infra-machines-pxe.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ ifndef::openshift-origin[]
`initramfs` and `rootfs` files from the
link:https://access.redhat.com/downloads/content/290[Product Downloads] page on the Red
Hat customer portal or the
link:https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.7/[{op-system} image mirror]
link:https://mirror.openshift.com/pub/openshift-v4/dependencies/rhcos/4.8/[{op-system} image mirror]
page.
+
[IMPORTANT]
Expand Down
2 changes: 1 addition & 1 deletion modules/installing-cluster-loader.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
+
[source,terminal]
----
$ podman pull quay.io/openshift/origin-tests:4.7
$ podman pull quay.io/openshift/origin-tests:4.8
----
2 changes: 1 addition & 1 deletion modules/ipi-install-retrieving-the-openshift-installer.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ available version of {product-title}:

[source,terminal]
----
$ export VERSION=latest-4.7
$ export VERSION=latest-4.8
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}')
----
3 changes: 1 addition & 2 deletions modules/jaeger-install-elasticsearch.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,12 @@ If you have already installed the OpenShift Elasticsearch Operator as part of Op
The Elasticsearch installation requires the *openshift-operators-redhat* namespace for the OpenShift Elasticsearch Operator. The other {ProductName} operators are installed in the `openshift-operators` namespace.
====
+
. Select the *Update Channel* that matches your {product-title} installation. For example, if you are installing on {product-title} version 4.6, select the 4.6 update channel.
. Select the *Update Channel* that matches your {product-title} installation. For example, if you are installing on {product-title} version 4.8, select the 4.8 update channel.
+
[NOTE]
====
For {product-title} version 4.7 select the 4.6 update channel.
====
+

. Select the *Automatic* Approval Strategy.
+
Expand Down
2 changes: 1 addition & 1 deletion modules/manually-maintained-credentials-upgrade.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
[id="manually-maintained-credentials-upgrade_{context}"]
= Upgrading clusters with manually maintained credentials

If credentials are added in a future release, the Cloud Credential Operator (CCO) `upgradable` status for a cluster with manually maintained credentials changes to `false`. For minor release, for example, from 4.6 to 4.7, this status prevents you from upgrading until you have addressed any updated permissions. For z-stream releases, for example, from 4.6.10 to 4.6.11, the upgrade is not blocked, but the credentials must still be updated for the new release.
If credentials are added in a future release, the Cloud Credential Operator (CCO) `upgradable` status for a cluster with manually maintained credentials changes to `false`. For minor release, for example, from 4.7 to 4.8, this status prevents you from upgrading until you have addressed any updated permissions. For z-stream releases, for example, from 4.7.12 to 4.7.13, the upgrade is not blocked, but the credentials must still be updated for the new release.

Use the *Administrator* perspective of the web console to determine if the CCO is upgradeable.

Expand Down
2 changes: 1 addition & 1 deletion modules/nodes-cluster-resource-override-deploy-cli.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ metadata:
name: clusterresourceoverride
namespace: clusterresourceoverride-operator
spec:
channel: "4.7"
channel: "4.8"
name: clusterresourceoverride
source: redhat-operators
sourceNamespace: openshift-marketplace
Expand Down
Loading

0 comments on commit e5d7da4

Please sign in to comment.