Merge pull request #30702 from adellape/osdk_rbac

Author: adellape

modules/osdk-prepare-supported-images.adoc

@@ -12,10 +12,12 @@ endif::[]
 ifeval::["{context}" == "osdk-ansible-tutorial"]
 :ansible:
 :type: Ansible
+:type_lc: ansible
 endif::[]
 ifeval::["{context}" == "osdk-helm-tutorial"]
 :helm:
 :type: Helm
+:type_lc: helm
 endif::[]
 
 [id="osdk-prepare-supported-images_{context}"]
@@ -41,35 +43,21 @@ FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 ----
 
 . Depending on the Go project version, your Dockerfile might contain a `USER 65532:65532` or `USER nonroot:nonroot` directive. In either case, remove the line, as it is not required by the supported runner image.
-
-. In the `config/default/manager_auth_proxy_patch.yaml` file, change the `image` value from:
-+
-[source,terminal]
-----
-gcr.io/kubebuilder/kube-rbac-proxy:<tag>
-----
-+
-to use the supported image:
-+
-[source,terminal,subs="attributes+"]
-----
-registry.redhat.io/openshift4/ose-kube-rbac-proxy:v{product-version}
-----
 endif::[]
 
-ifdef::ansible[]
-* Update the project root-level Dockerfile to use supported images. Change the default builder image reference from:
+ifdef::ansible,helm[]
+. Update the project root-level Dockerfile to use supported images. Change the default builder image reference from:
 +
 [source,terminal,subs="attributes+"]
 ----
-FROM quay.io/operator-framework/ansible-operator:{osdk_ver}
+FROM quay.io/operator-framework/{type_lc}-operator:{osdk_ver}
 ----
 +
 to:
 +
 [source,terminal,subs="attributes+"]
 ----
-FROM registry.redhat.io/openshift4/ose-ansible-operator:v{product-version}
+FROM registry.redhat.io/openshift4/ose-{type_lc}-operator:v{product-version}
 ----
 +
 [IMPORTANT]
@@ -78,26 +66,19 @@ Use the builder image version that matches your Operator SDK version. Failure to
 ====
 endif::[]
 
-ifdef::helm[]
-* Update the project root-level Dockerfile to use supported images. Change the default builder image reference from:
+. In the `config/default/manager_auth_proxy_patch.yaml` file, change the `image` value from:
 +
-[source,terminal,subs="attributes+"]
+[source,terminal]
 ----
-FROM quay.io/operator-framework/helm-operator:{osdk_ver}
+gcr.io/kubebuilder/kube-rbac-proxy:<tag>
 ----
 +
-to:
+to use the supported image:
 +
 [source,terminal,subs="attributes+"]
 ----
-FROM registry.redhat.io/openshift4/ose-helm-operator:v{product-version}
+registry.redhat.io/openshift4/ose-kube-rbac-proxy:v{product-version}
 ----
-+
-[IMPORTANT]
-====
-Use the builder image version that matches your Operator SDK version. Failure to do so can result in problems due to project layout, or _scaffolding_, differences, particularly when mixing newer upstream versions of the Operator SDK with downstream {product-title} builder images.
-====
-endif::[]
 
 :!osdk_ver:
 ifeval::["{context}" == "osdk-golang-tutorial"]
@@ -107,8 +88,10 @@ endif::[]
 ifeval::["{context}" == "osdk-ansible-tutorial"]
 :!ansible:
 :!type:
+:!type_lc:
 endif::[]
 ifeval::["{context}" == "osdk-helm-tutorial"]
 :!helm:
 :!type:
+:!type_lc:
 endif::[]