diff --git a/modules/osdk-updating-128-to-131.adoc b/modules/osdk-updating-128-to-131.adoc index b6d0f3769e3c..ffcb00f70d74 100644 --- a/modules/osdk-updating-128-to-131.adoc +++ b/modules/osdk-updating-128-to-131.adoc @@ -41,16 +41,15 @@ The following procedure updates an existing {type}-based Operator project for co .Procedure ifdef::golang,hybrid,java[] -* Edit your Operator project's makefile to update the Operator SDK version to {osdk_ver}, as shown in the following example: +* Edit your Operator project's Makefile to add the `OPERATOR_SDK_VERSION` field and set it to `v{osdk_ver}-ocp`, as shown in the following example: + -.Example makefile +.Example Makefile [source,make,subs="attributes+"] ---- # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v{osdk_ver} <1> +OPERATOR_SDK_VERSION ?= v{osdk_ver}-ocp ---- -<1> Change the version from `{osdk_ver_n1}` to `{osdk_ver}`. endif::[] ifdef::helm[] @@ -63,16 +62,15 @@ FROM quay.io/operator-framework/helm-operator:v{osdk_ver} <1> ---- <1> Update the Helm Operator version from `{osdk_ver_n1}` to `{osdk_ver}` -. Edit your Operator project's makefile to update the Operator SDK to {osdk_ver}, as shown in the following example: +. Edit your Operator project's Makefile to add the `OPERATOR_SDK_VERSION` field and set it to `v{osdk_ver}-ocp`, as shown in the following example: + -.Example makefile +.Example Makefile [source,make,subs="attributes+"] ---- # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v{osdk_ver} <1> +OPERATOR_SDK_VERSION ?= v{osdk_ver}-ocp ---- -<1> Change the version from `{osdk_ver_n1}` to `{osdk_ver}`. . If you use a custom service account for deployment, define the following role to require a watch operation on your secrets resource, as shown in the following example: + @@ -126,16 +124,15 @@ FROM quay.io/operator-framework/ansible-operator:v{osdk_ver} + If your Operator depends on one of these removed Python modules, update your Dockerfile to install the required modules using the `pip install` command. -. Edit your Operator project's makefile to update the Operator SDK version to {osdk_ver}, as shown in the following example: +. Edit your Operator project's Makefile to add the `OPERATOR_SDK_VERSION` field and set it to `v{osdk_ver}-ocp`, as shown in the following example: + -.Example makefile +.Example Makefile [source,make,subs="attributes+"] ---- # Set the Operator SDK version to use. By default, what is installed on the system is used. # This is useful for CI or a project to utilize a specific version of the operator-sdk toolkit. -OPERATOR_SDK_VERSION ?= v{osdk_ver} <1> +OPERATOR_SDK_VERSION ?= v{osdk_ver}-ocp ---- -<1> Change the version from `{osdk_ver_n1}` to `{osdk_ver}`. . Update your `requirements.yaml` and `requirements.go` files to remove the `community.kubernetes` collection and update the `operator_sdk.util` collection to version `0.5.0`, as shown in the following example: +