Merge pull request #39200 from multi-arch/osdocs-3006

Author: Bob Furu

modules/builds-chaining-builds.adoc

@@ -23,7 +23,7 @@ The first build takes the application source and produces an image containing a
 
 [source,yaml]
 ----
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: artifact-build
@@ -47,7 +47,7 @@ The second build uses image source with a path to the WAR file inside the output
 
 [source,yaml]
 ----
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: image-build

modules/builds-use-custom-builder-image.adoc

@@ -21,7 +21,7 @@ You can define a `BuildConfig` object that uses the custom strategy in conjuncti
 [source,yaml]
 ----
 kind: BuildConfig
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 metadata:
   name: sample-custom-build
   labels:
@@ -56,7 +56,7 @@ $ oc create -f buildconfig.yaml
 [source,yaml]
 ----
 kind: ImageStream
-apiVersion: v1
+apiVersion: image.openshift.io/v1
 metadata:
   name: sample-custom
 spec: {}

modules/builds-using-secrets-as-environment-variables.adoc

@@ -19,7 +19,7 @@ This method shows the secrets as plain text in the output of the build pod conso
 +
 [source,yaml]
 ----
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: secret-example-bc

modules/builds-using-secrets.adoc

@@ -105,7 +105,7 @@ spec:
 .YAML of a Build Config Populating Environment Variables with Secret Data
 [source,yaml]
 ----
-apiVersion: v1
+apiVersion: build.openshift.io/v1
 kind: BuildConfig
 metadata:
   name: secret-example-bc

modules/cluster-logging-eventrouter-deploy.adoc

@@ -23,7 +23,7 @@ The following Template object creates the service account, cluster role, and clu
 [source,yaml]
 ----
 kind: Template
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 metadata:
   name: eventrouter-template
   annotations:
@@ -36,15 +36,15 @@ objects:
       name: eventrouter
       namespace: ${NAMESPACE}
   - kind: ClusterRole <2>
-    apiVersion: v1
+    apiVersion: rbac.authorization.k8s.io/v1
     metadata:
       name: event-reader
     rules:
     - apiGroups: [""]
       resources: ["events"]
       verbs: ["get", "watch", "list"]
   - kind: ClusterRoleBinding  <3>
-    apiVersion: v1
+    apiVersion: rbac.authorization.k8s.io/v1
     metadata:
       name: event-reader-binding
     subjects:

modules/deployments-deploymentconfigs.adoc

@@ -35,7 +35,7 @@ replication controller, scaling up the new one, and running hooks). The deployme
 .Example `DeploymentConfig` definition
 [source,yaml]
 ----
-apiVersion: v1
+apiVersion: apps.openshift.io/v1
 kind: DeploymentConfig
 metadata:
   name: frontend

modules/deployments-lifecycle-hooks.adoc

@@ -44,7 +44,7 @@ The following simplified example deployment uses the rolling strategy. Triggers
 [source,yaml]
 ----
 kind: DeploymentConfig
-apiVersion: v1
+apiVersion: apps.openshift.io/v1
 metadata:
   name: frontend
 spec:

modules/how-to-plan-your-environment-according-to-application-requirements.adoc

@@ -83,7 +83,7 @@ links in the deployment's service specification file to overcome this:
 [source,yaml]
 ----
 ---
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 metadata:
   name: deployment-config-template
@@ -92,7 +92,7 @@ metadata:
     description: This template will create a deploymentConfig with 1 replica, 4 env vars and a service.
     tags: ''
 objects:
-- apiVersion: v1
+- apiVersion: apps.openshift.io/v1
   kind: DeploymentConfig
   metadata:
     name: deploymentconfig${IDENTIFIER}

modules/images-imagestream-configure.adoc

@@ -11,7 +11,7 @@ An `ImageStream` object file contains the following elements.
 
 [source,yaml]
 ----
-apiVersion: v1
+apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
   annotations:

modules/images-imagestream-mapping.adoc

@@ -19,7 +19,7 @@ The following image stream mapping example results in an image being tagged as `
 
 [source,yaml]
 ----
-apiVersion: v1
+apiVersion: image.openshift.io/v1
 kind: ImageStreamMapping
 metadata:
   creationTimestamp: null