Updated apiVersions to fully qualified 4.x compatible (#344)

* Updated apiVersions to fully qualified 4.x compatible * Updated order of version/kind as requested
redhat-cop · May 18, 2020 · 49c82b0 · 49c82b0
1 parent e5079ad
commit 49c82b0
Show file tree

Hide file tree

Showing 56 changed files with 199 additions and 191 deletions.
diff --git a/.openshift/templates/jenkins-slave-ansible-stacks-template.yml b/.openshift/templates/jenkins-slave-ansible-stacks-template.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: jenkins-slave-ansible-stacks
@@ -10,21 +10,21 @@ metadata:
   name: jenkins-slave-ansible-stacks
   namespace: myproject
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     name: jenkins-slave-base-rhel7
   spec:
     dockerImageRepository: registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     annotations:
       slave-label: ${JENKINS_SLAVE_NAME}
     labels:
       role: jenkins-slave
     name: ${JENKINS_SLAVE_NAME}
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:

diff --git a/.openshift/templates/jenkins-slave-generic-template.j2 b/.openshift/templates/jenkins-slave-generic-template.j2
@@ -1,6 +1,6 @@
 ---
+apiVersion: template.openshift.io/v1
 kind: Template
-apiVersion: v1
 metadata:
   name: Generic Jenkins Agent Template
   annotations:
@@ -10,14 +10,14 @@ metadata:
 objects:
 {% if jenkins_slaves is defined %}
 {% for agent, params in jenkins_slaves.build.items() %}
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:
       build: {{ params.NAME | d('jenkins-slave-' + agent) }}
       role: jenkins-slave
     name: {{ params.NAME | d('jenkins-slave-' + agent) }}
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:

diff --git a/.openshift/templates/jenkins-slave-generic-template.yml b/.openshift/templates/jenkins-slave-generic-template.yml
@@ -1,21 +1,21 @@
 ---
+apiVersion: template.openshift.io/v1
 kind: Template
-apiVersion: v1
 metadata:
   name: "${NAME}"
   annotations:
     openshift.io/display-name: Generic Build Pod
     description: "${NAME} build pod template pre-configured to use a jenkins slave in the
       same project/namespace"
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:
       build: "${NAME}"
       role: jenkins-slave
     name: "${NAME}"
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:

diff --git a/.openshift/templates/jenkins-slave-image-mgmt-template.yml b/.openshift/templates/jenkins-slave-image-mgmt-template.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: jenkins-slave-image-mgmt
@@ -9,21 +9,21 @@ metadata:
     tags: jenkins,slave
   name: jenkins-slave-image-mgmt
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     name: jenkins-slave-base-rhel7
   spec:
     dockerImageRepository: registry.access.redhat.com/openshift3/jenkins-slave-base-rhel7
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     annotations:
       slave-label: ${JENKINS_SLAVE_NAME}
     labels:
       role: jenkins-slave
     name: ${JENKINS_SLAVE_NAME}
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:

diff --git a/.openshift/templates/jenkins-slave-ruby-template.yml b/.openshift/templates/jenkins-slave-ruby-template.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: jenkins-slave-ruby
@@ -10,7 +10,7 @@ metadata:
     version: 1.0.0
   name: jenkins-slave-ruby
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: BuildConfig
   metadata:
     creationTimestamp: null
@@ -41,7 +41,7 @@ objects:
     triggers:
     - imageChange: {}
       type: ImageChange
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     creationTimestamp: null
@@ -51,7 +51,7 @@ objects:
     name: jenkins-slave-base-centos7
   spec:
     dockerImageRepository: docker.io/openshift/jenkins-slave-base-centos7
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     creationTimestamp: null

diff --git a/...ric/.openshift/templates/docker-build-template-binary-to-dockerimage-with-push-secret.yml b/...ric/.openshift/templates/docker-build-template-binary-to-dockerimage-with-push-secret.yml
@@ -1,13 +1,13 @@
 ---
+apiVersion: template.openshift.io/v1
 kind: Template
-apiVersion: v1
 metadata:
   name: "${NAME}"
   annotations:
     openshift.io/display-name: Generic Dockerfile Build
 objects:
-- kind: BuildConfig
-  apiVersion: build.openshift.io/v1
+- apiVersion: build.openshift.io/v1
+  kind: BuildConfig
   metadata:
     labels:
       build: "${NAME}"

diff --git a/build-docker-generic/.openshift/templates/docker-build-template-override-FROM.yml b/build-docker-generic/.openshift/templates/docker-build-template-override-FROM.yml
@@ -1,20 +1,20 @@
 ---
+apiVersion: template.openshift.io/v1
 kind: Template
-apiVersion: v1
 metadata:
   name: "${NAME}"
   annotations:
     openshift.io/display-name: Generic Dockerfile Build
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:
       build: "${NAME}"
       app: "${NAME}"
     name: "${NAME}"
-- kind: ImageStream
-  apiVersion: image.openshift.io/v1
+- apiVersion: image.openshift.io/v1
+  kind: ImageStream
   metadata:
     name: ${FROM_DOCKER_IMAGE}
   spec:
@@ -25,7 +25,7 @@ objects:
         name: ${FROM_DOCKER_IMAGE_REGISTRY_URL}:${FROM_DOCKER_TAG}
       importPolicy: {}
       name: ${FROM_DOCKER_TAG}
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:

diff --git a/build-docker-generic/.openshift/templates/docker-build-template-with-secret.yml b/build-docker-generic/.openshift/templates/docker-build-template-with-secret.yml
@@ -1,19 +1,19 @@
 ---
+apiVersion: template.openshift.io/v1
 kind: Template
-apiVersion: v1
 metadata:
   name: "${NAME}"
   annotations:
     openshift.io/display-name: Generic Dockerfile Build
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:
       build: "${NAME}"
       app: "${NAME}"
     name: "${NAME}"
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:

diff --git a/build-docker-generic/.openshift/templates/docker-build-template.yml b/build-docker-generic/.openshift/templates/docker-build-template.yml
@@ -1,19 +1,19 @@
 ---
+apiVersion: template.openshift.io/v1
 kind: Template
-apiVersion: v1
 metadata:
   name: "${NAME}"
   annotations:
     openshift.io/display-name: Generic Dockerfile Build
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:
       build: "${NAME}"
       app: "${NAME}"
     name: "${NAME}"
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:

diff --git a/build-s2i-executable/.openshift/templates/build-s2i-executable.yml b/build-s2i-executable/.openshift/templates/build-s2i-executable.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: build-s2i-executable
@@ -7,17 +7,17 @@ metadata:
     description: S2I Executable Image Template.
   name: build-s2i-executable
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     name: ubi-minimal
   spec:
     dockerImageRepository: ${BASE_IMAGE_REGISTRY}
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     name: ${NAME}
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     name: ${NAME}

diff --git a/build-s2i-gows/.openshift/templates/builds/template.yml b/build-s2i-gows/.openshift/templates/builds/template.yml
@@ -1,11 +1,11 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: gows-builder
 metadata:
   name: gows
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:
@@ -16,7 +16,7 @@ objects:
       local: false
   status:
     dockerImageRepository: ""
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:
@@ -50,7 +50,7 @@ objects:
           kind: ImageStreamTag
           name: golang:1.9.2
       type: ImageChange
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:
@@ -92,7 +92,7 @@ objects:
           kind: ImageStreamTag
           name: gows:build
       type: ImageChange
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:
@@ -122,7 +122,7 @@ objects:
           kind: ImageStreamTag
           name: gows:busybox
       type: ImageChange
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:

diff --git a/build-s2i-gows/.openshift/templates/deployments/template.yml b/build-s2i-gows/.openshift/templates/deployments/template.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: s2i-gows
@@ -9,7 +9,7 @@ metadata:
     tags: go,s2i
   name: "${APPLICATION_NAME}"
 objects:
-- apiVersion: v1
+- apiVersion: apps.openshift.io/v1
   kind: DeploymentConfig
   metadata:
     labels:
@@ -63,7 +63,7 @@ objects:
       deploymentconfig: "${APPLICATION_NAME}"
   status:
     loadBalancer: {}
-- apiVersion: v1
+- apiVersion: route.openshift.io/v1
   kind: Route
   metadata:
     labels:

diff --git a/build-s2i-gows/.openshift/templates/imagestreams/template.yml b/build-s2i-gows/.openshift/templates/imagestreams/template.yml
@@ -1,11 +1,11 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: imagestreams
 metadata:
   name: "${IS_NAME}"
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     name: "${IS_NAME}"

diff --git a/build-s2i-jekyll/.openshift/templates/builds/docker-template.yml b/build-s2i-jekyll/.openshift/templates/builds/docker-template.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: jekyll-builder
@@ -9,7 +9,7 @@ metadata:
     tags: ruby, jekyll
   name: "${APPLICATION_NAME}"
 objects:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:

diff --git a/build-s2i-jekyll/.openshift/templates/builds/source-template.yml b/build-s2i-jekyll/.openshift/templates/builds/source-template.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: openshift-playbooks-builder
@@ -9,7 +9,7 @@ metadata:
     tags: ruby, jekyll
   name: "${APPLICATION_NAME}"
 objects:
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels: