From 50057316ea9062ad028ca128f1c679bea8518288 Mon Sep 17 00:00:00 2001 From: Michael Ryan Peter Date: Mon, 31 Oct 2022 15:00:55 -0400 Subject: [PATCH] OSDOCS-4457 Bump OSDK version and dependencies --- modules/osdk-common-prereqs.adoc | 2 +- modules/osdk-installing-cli-linux-macos.adoc | 8 +++----- modules/osdk-scorecard-config.adoc | 2 +- modules/osdk-scorecard-output.adoc | 2 +- modules/osdk-scorecard-parallel.adoc | 2 +- modules/osdk-updating-projects.adoc | 4 ++-- .../ansible/osdk-ansible-updating-projects.adoc | 6 ++---- .../golang/osdk-golang-updating-projects.adoc | 6 ++---- .../operator_sdk/helm/osdk-helm-updating-projects.adoc | 6 ++---- .../helm/osdk-hybrid-helm-updating-projects.adoc | 6 ++---- operators/operator_sdk/osdk-installing-cli.adoc | 2 +- 11 files changed, 18 insertions(+), 28 deletions(-) diff --git a/modules/osdk-common-prereqs.adoc b/modules/osdk-common-prereqs.adoc index 9363ed54a2..f2fce28f7e 100644 --- a/modules/osdk-common-prereqs.adoc +++ b/modules/osdk-common-prereqs.adoc @@ -36,7 +36,7 @@ endif::[] * Operator SDK CLI installed * OpenShift CLI (`oc`) v{product-version}+ installed ifdef::golang[] -* link:https://golang.org/dl/[Go] v1.18+ +* link:https://golang.org/dl/[Go] v1.19+ endif::[] ifdef::ansible[] * link:https://docs.ansible.com/ansible/2.9/index.html[Ansible] v2.9.0 diff --git a/modules/osdk-installing-cli-linux-macos.adoc b/modules/osdk-installing-cli-linux-macos.adoc index d6fc08f2f6..1be8da6306 100644 --- a/modules/osdk-installing-cli-linux-macos.adoc +++ b/modules/osdk-installing-cli-linux-macos.adoc @@ -3,8 +3,7 @@ // * cli_reference/osdk/cli-osdk-install.adoc // * operators/operator_sdk/osdk-installing-cli.adoc -:ocp_ver: 4.11 -:osdk_ver: v1.22.0 +:osdk_ver: v1.25.1 :_content-type: PROCEDURE [id="osdk-installing-cli-linux-macos_{context}"] @@ -14,7 +13,7 @@ You can install the OpenShift SDK CLI tool on Linux. .Prerequisites -* link:https://golang.org/dl/[Go] v1.18+ +* link:https://golang.org/dl/[Go] v1.19+ ifdef::openshift-origin[] * link:https://docs.docker.com/install/[`docker`] v17.03+, link:https://github.com/containers/libpod/blob/master/install.md[`podman`] v1.2.0+, or link:https://github.com/containers/buildah/blob/master/install.md[`buildah`] v1.7+ endif::[] @@ -26,7 +25,7 @@ endif::[] . Navigate to the link:https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/operator-sdk/[OpenShift mirror site]. -. From the latest {ocp_ver} directory, download the latest version of the tarball for Linux. +. From the latest {product-version} directory, download the latest version of the tarball for Linux. . Unpack the archive: + @@ -74,5 +73,4 @@ $ operator-sdk version operator-sdk version: "{osdk_ver}-ocp", ... ---- -:!ocp_ver: :!osdk_ver: diff --git a/modules/osdk-scorecard-config.adoc b/modules/osdk-scorecard-config.adoc index 491ff1163a..c0d5ead2d3 100644 --- a/modules/osdk-scorecard-config.adoc +++ b/modules/osdk-scorecard-config.adoc @@ -2,7 +2,7 @@ // // * operators/operator_sdk/osdk-scorecard.adoc -:osdk_ver: v1.16.0 +:osdk_ver: v1.25.1 [id="osdk-scorecard-config_{context}"] = Scorecard configuration diff --git a/modules/osdk-scorecard-output.adoc b/modules/osdk-scorecard-output.adoc index d71c2e1eeb..2a62ca4a6f 100644 --- a/modules/osdk-scorecard-output.adoc +++ b/modules/osdk-scorecard-output.adoc @@ -2,7 +2,7 @@ // // * operators/operator_sdk/osdk-scorecard.adoc -:osdk_ver: v1.16.0 +:osdk_ver: v1.25.1 [id="osdk-scorecard-output_{context}"] = Scorecard output diff --git a/modules/osdk-scorecard-parallel.adoc b/modules/osdk-scorecard-parallel.adoc index 104c7e3360..6203a35d1b 100644 --- a/modules/osdk-scorecard-parallel.adoc +++ b/modules/osdk-scorecard-parallel.adoc @@ -2,7 +2,7 @@ // // * operators/operator_sdk/osdk-scorecard.adoc -:osdk_ver: v1.16.0 +:osdk_ver: v1.25.1 :_content-type: PROCEDURE [id="osdk-scorecard-parallel_{context}"] diff --git a/modules/osdk-updating-projects.adoc b/modules/osdk-updating-projects.adoc index 9c1c5eb9b7..a3c2b40cf4 100644 --- a/modules/osdk-updating-projects.adoc +++ b/modules/osdk-updating-projects.adoc @@ -22,8 +22,8 @@ ifeval::["{context}" == "osdk-hybrid-helm-updating-projects"] :type: Hybrid Helm endif::[] -:osdk_ver: 1.22.0 -:osdk_ver_n1: 1.16.0 +:osdk_ver: v1.25.1 +:osdk_ver_n1: v1.22.0 :_content-type: PROCEDURE [id="osdk-upgrading-projects_{context}"] diff --git a/operators/operator_sdk/ansible/osdk-ansible-updating-projects.adoc b/operators/operator_sdk/ansible/osdk-ansible-updating-projects.adoc index 5257939b0b..72bd1ac408 100644 --- a/operators/operator_sdk/ansible/osdk-ansible-updating-projects.adoc +++ b/operators/operator_sdk/ansible/osdk-ansible-updating-projects.adoc @@ -4,9 +4,8 @@ include::_attributes/common-attributes.adoc[] :context: osdk-ansible-updating-projects -:osdk_ver: 1.22.0 -:osdk_ver_n1: 1.16.0 -:product-version-n1: 4.10 +:osdk_ver: v1.25.1 +:osdk_ver_n1: v1.22.0 toc::[] @@ -28,4 +27,3 @@ include::modules/osdk-updating-projects.adoc[leveloffset=+1] :!osdk_ver: :!osdk_ver_n1: -:!product-version-n1: diff --git a/operators/operator_sdk/golang/osdk-golang-updating-projects.adoc b/operators/operator_sdk/golang/osdk-golang-updating-projects.adoc index 16f2d1f806..2919346da4 100644 --- a/operators/operator_sdk/golang/osdk-golang-updating-projects.adoc +++ b/operators/operator_sdk/golang/osdk-golang-updating-projects.adoc @@ -4,9 +4,8 @@ include::_attributes/common-attributes.adoc[] :context: osdk-golang-updating-projects -:osdk_ver: 1.22.0 -:osdk_ver_n1: 1.16.0 -:product-version-n1: 4.10 +:osdk_ver: v1.25.1 +:osdk_ver_n1: v1.22.0 toc::[] @@ -28,4 +27,3 @@ include::modules/osdk-updating-projects.adoc[leveloffset=+1] :!osdk_ver: :!osdk_ver_n1: -:!product-version-n1: diff --git a/operators/operator_sdk/helm/osdk-helm-updating-projects.adoc b/operators/operator_sdk/helm/osdk-helm-updating-projects.adoc index a2e0b6fde9..4c30a46ccd 100644 --- a/operators/operator_sdk/helm/osdk-helm-updating-projects.adoc +++ b/operators/operator_sdk/helm/osdk-helm-updating-projects.adoc @@ -4,9 +4,8 @@ include::_attributes/common-attributes.adoc[] :context: osdk-helm-updating-projects -:osdk_ver: 1.22.0 -:osdk_ver_n1: 1.16.0 -:product-version-n1: 4.10 +:osdk_ver: v1.25.1 +:osdk_ver_n1: v1.22.0 toc::[] @@ -28,4 +27,3 @@ include::modules/osdk-updating-projects.adoc[leveloffset=+1] :!osdk_ver: :!osdk_ver_n1: -:!product-version-n1: diff --git a/operators/operator_sdk/helm/osdk-hybrid-helm-updating-projects.adoc b/operators/operator_sdk/helm/osdk-hybrid-helm-updating-projects.adoc index ce31cfc9f2..268a086198 100644 --- a/operators/operator_sdk/helm/osdk-hybrid-helm-updating-projects.adoc +++ b/operators/operator_sdk/helm/osdk-hybrid-helm-updating-projects.adoc @@ -4,9 +4,8 @@ include::_attributes/common-attributes.adoc[] :context: osdk-hybrid-helm-updating-projects -:osdk_ver: 1.22.0 -:osdk_ver_n1: 1.16.0 -:product-version-n1: 4.10 +:osdk_ver: v1.25.1 +:osdk_ver_n1: v1.22.0 toc::[] @@ -28,4 +27,3 @@ include::modules/osdk-updating-projects.adoc[leveloffset=+1] :!osdk_ver: :!osdk_ver_n1: -:!product-version-n1: diff --git a/operators/operator_sdk/osdk-installing-cli.adoc b/operators/operator_sdk/osdk-installing-cli.adoc index dab089654b..eb55c9fdc3 100644 --- a/operators/operator_sdk/osdk-installing-cli.adoc +++ b/operators/operator_sdk/osdk-installing-cli.adoc @@ -4,7 +4,7 @@ include::_attributes/common-attributes.adoc[] :context: osdk-installing-cli -:osdk_ver: v1.22.0 +:osdk_ver: v1.25.1 toc::[]