Skip to content

Add back in note about support for OCP nextVersion #259

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 19, 2021
Merged

Add back in note about support for OCP nextVersion #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions ...emetry-Framework/assemblies/assembly_installing-the-core-components-of-stf.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,13 @@ You can use Operators to load the various application components and objects. Ea

.Prerequisites

* {OpenShift} ({OpenShiftShort}) version {SupportedOpenShiftVersion}
// TODO: add back to previous line when NextSupportedOpenShiftVersion has been tested
// or {NextSupportedOpenShiftVersion} is running.
* {OpenShift} ({OpenShiftShort}) version {SupportedOpenShiftVersion} or {NextSupportedOpenShiftVersion} is running.
* You have prepared your {OpenShift} ({OpenShiftShort}) environment and ensured that there is persistent storage and enough resources to run the {ProjectShort} components on top of the {OpenShiftShort} environment.


ifeval::["{build}" == "downstream"]
[IMPORTANT]
{Project} ({ProjectShort}) is compatible with {OpenShift} version {SupportedOpenShiftVersion}.
// TODO: add back to previous line when OCP 4.7 has been tested and is supported
// and {NextSupportedOpenShiftVersion}.
{Project} ({ProjectShort}) is compatible with {OpenShift} version {SupportedOpenShiftVersion} and {NextSupportedOpenShiftVersion}.
endif::[]

.Additional resources
Expand Down
4 changes: 1 addition & 3 deletions doc-Service-Telemetry-Framework/assemblies/assembly_introduction-to-stf.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ ifdef::context[:parent-context: {context}]

ifeval::["{build}" == "downstream"]
[IMPORTANT]
{Project} ({ProjectShort}) is compatible with {OpenShift} versions {SupportedOpenShiftVersion}
// TODO: add back to previous line when next version is supported
// and {NextSupportedOpenShiftVersion}.
{Project} ({ProjectShort}) is compatible with {OpenShift} versions {SupportedOpenShiftVersion} and {NextSupportedOpenShiftVersion}.

//For more information about migrating, see https://access.redhat.com/articles/5477371[Migrating Service Telemetry Framework v1.0 from OperatorSource to CatalogSource].
endif::[]
Expand Down
4 changes: 1 addition & 3 deletions doc-Service-Telemetry-Framework/modules/con_stf-architecture.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,7 @@ If you plan to collect and store events, collectd or Ceilometer delivers event d
Server-side {ProjectShort} monitoring infrastructure consists of the following layers:

* {Project} {ProductVersion} ({ProjectShort})
* {OpenShift} {SupportedOpenShiftVersion} ({OpenShiftShort})
// TODO: add back to previous line when next version is supported
// or {NextSupportedOpenShiftVersion}
* {OpenShift} {SupportedOpenShiftVersion} ({OpenShiftShort}) or {NextSupportedOpenShiftVersion}
* Infrastructure platform

[[osp-stf-server-side-monitoring]]
Expand Down