Updated template kinds to use fully qualified apiVersion

redhat-cop · pabrahamsson · Apr 29, 2020 · Apr 29, 2020 · Apr 29, 2020 · 437a11ad806c5fc61b5ad62c3c98a6d8e971ba28
commit 437a11ad806c5fc61b5ad62c3c98a6d8e971ba28
diff --git a/basic-dotnet-core/.openshift/projects/projects.yml b/basic-dotnet-core/.openshift/projects/projects.yml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: List
 items:
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-dotnet-core-build
     creationTimestam: null
   displayName: .NET Core App - Build
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-dotnet-core-dev
     creationTimestam: null
   displayName: .NET Core App - Dev
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-dotnet-core-stage
     creationTimestam: null
   displayName: .NET Core Appp - Stage
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-dotnet-core-prod
     creationTimestam: null

diff --git a/basic-dotnet-core/.openshift/templates/build.yml b/basic-dotnet-core/.openshift/templates/build.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: generic-dotnet-jenkins-pipeline

diff --git a/basic-dotnet-core/.openshift/templates/deployment.yml b/basic-dotnet-core/.openshift/templates/deployment.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: basic-dotnet-core

diff --git a/basic-nginx/.openshift/builds/template.yml b/basic-nginx/.openshift/builds/template.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: generic-nginx-jenkins-pipeline

diff --git a/basic-nginx/.openshift/deployment/template.yml b/basic-nginx/.openshift/deployment/template.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: deployment-template

diff --git a/basic-nginx/.openshift/projects/projects.yml b/basic-nginx/.openshift/projects/projects.yml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: List
 items:
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-nginx-dev
     creationTimestam: null
   displayName: Basic Nginx App - Dev
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-nginx-stage
     creationTimestam: null
   displayName: Basic Nginx App - Stage
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-nginx-prod
     creationTimestam: null
   displayName: Basic Tomcat App - Prod
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-nginx-build
     creationTimestam: null

diff --git a/basic-spring-boot-tekton/.openshift/projects/projects.yml b/basic-spring-boot-tekton/.openshift/projects/projects.yml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: List
 items:
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-spring-boot-build
     creationTimestam: null
   displayName: Spring Rest App - Build
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-spring-boot-dev
     creationTimestam: null
   displayName: Spring Rest App - Dev
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-spring-boot-stage
     creationTimestam: null
   displayName: Spring Rest App - Stage
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-spring-boot-prod
     creationTimestam: null

diff --git a/basic-spring-boot-tekton/.openshift/templates/build.yml b/basic-spring-boot-tekton/.openshift/templates/build.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: generic-java-jenkins-pipeline

diff --git a/basic-spring-boot-tekton/.openshift/templates/deployment.yml b/basic-spring-boot-tekton/.openshift/templates/deployment.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: basic-spring-boot

diff --git a/basic-spring-boot/.openshift/projects/projects.yml b/basic-spring-boot/.openshift/projects/projects.yml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: List
 items:
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-spring-boot-build
     creationTimestam: null
   displayName: Spring Rest App - Build
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-spring-boot-dev
     creationTimestam: null
   displayName: Spring Rest App - Dev
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-spring-boot-stage
     creationTimestam: null
   displayName: Spring Rest App - Stage
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-spring-boot-prod
     labels:

diff --git a/basic-spring-boot/.openshift/templates/build.yml b/basic-spring-boot/.openshift/templates/build.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: generic-java-jenkins-pipeline

diff --git a/basic-spring-boot/.openshift/templates/deployment.yml b/basic-spring-boot/.openshift/templates/deployment.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: basic-spring-boot

diff --git a/basic-tomcat/.openshift/builds/template.yml b/basic-tomcat/.openshift/builds/template.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: generic-java-jenkins-pipeline

diff --git a/basic-tomcat/.openshift/deployment/template.yml b/basic-tomcat/.openshift/deployment/template.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: deployment-template

diff --git a/basic-tomcat/.openshift/projects/projects.yml b/basic-tomcat/.openshift/projects/projects.yml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: List
 items:
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-tomcat-dev
     creationTimestam: null
   displayName: Basic Tomcat App - Dev
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-tomcat-stage
     creationTimestam: null
   displayName: Basic Tomcat App - Stage
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-tomcat-prod
     creationTimestam: null
   displayName: Basic Tomcat App - Prod
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: basic-tomcat-build
     creationTimestam: null

diff --git a/blue-green-spring/.openshift/builds/template.yml b/blue-green-spring/.openshift/builds/template.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: generic-java-jenkins-pipeline

diff --git a/blue-green-spring/.openshift/deployment/template-bg.yml b/blue-green-spring/.openshift/deployment/template-bg.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: openjdk-deployment

diff --git a/blue-green-spring/.openshift/deployment/template.yml b/blue-green-spring/.openshift/deployment/template.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: openjdk-deployment

diff --git a/blue-green-spring/.openshift/projects/projects.yml b/blue-green-spring/.openshift/projects/projects.yml
@@ -1,26 +1,26 @@
 apiVersion: v1
 kind: List
 items:
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: spring-boot-web-dev
     creationTimestam: null
   displayName: Spring Boot Blue Green - Dev
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: spring-boot-web-stage
     creationTimestam: null
   displayName: Spring Boot Blue Green - Staging
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: spring-boot-web-prod
     creationTimestam: null
   displayName: Spring Boot Blue Green - Prod
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: spring-boot-web-build
     creationTimestam: null

diff --git a/cucumber-selenium-grid/applier/projects/projects.yml b/cucumber-selenium-grid/applier/projects/projects.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: todomvc-projects
@@ -7,26 +7,26 @@ metadata:
     description: Template for creating todomvc projects
   name: todomvc-projects
 objects:
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: ${APPLICATION_NAME}-build
     creationTimestam: null
   displayName: "${APPLICATION_NAME} - Build"
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: "${APPLICATION_NAME}-dev"
     creationTimestam: null
   displayName: "${APPLICATION_NAME} - Dev"
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: "${APPLICATION_NAME}-stage"
     creationTimestam: null
   displayName: "${APPLICATION_NAME} - Stage"
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: "${APPLICATION_NAME}-prod"
     creationTimestam: null

diff --git a/cucumber-selenium-grid/applier/templates/build.yml b/cucumber-selenium-grid/applier/templates/build.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: generic-java-jenkins-pipeline

diff --git a/cucumber-selenium-grid/applier/templates/deployment.yml b/cucumber-selenium-grid/applier/templates/deployment.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: basic-nodejs

diff --git a/cucumber-selenium-grid/applier/templates/jenkins-slave-node-8.yaml b/cucumber-selenium-grid/applier/templates/jenkins-slave-node-8.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: jenkins-slave-node-8

diff --git a/cucumber-selenium-grid/applier/templates/selenium-grid.yaml b/cucumber-selenium-grid/applier/templates/selenium-grid.yaml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: zalenium

diff --git a/jenkins-s2i/jenkins-s2i.yml b/jenkins-s2i/jenkins-s2i.yml
@@ -1,4 +1,4 @@
-apiVersion: v1
+apiVersion: template.openshift.io/v1
 kind: Template
 labels:
   template: jenkins2-s2i

diff --git a/multi-cluster-multi-branch-jee/.openshift/app-deploy-jboss-eap.yml b/multi-cluster-multi-branch-jee/.openshift/app-deploy-jboss-eap.yml
@@ -1,6 +1,6 @@
 ---
+apiVersion: template.openshift.io/v1
 kind: Template
-apiVersion: v1
 metadata:
   name: ${NAME}-deploy-jboss-eap
   annotations:

diff --git a/multi-cluster-spring-boot/image-mirror-example/.applier/projects/projects-prod.yml b/multi-cluster-spring-boot/image-mirror-example/.applier/projects/projects-prod.yml
@@ -1,8 +1,8 @@
 apiVersion: v1
 kind: List
 items:
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: multicluster-spring-boot-prod
     creationTimestam: null

diff --git a/multi-cluster-spring-boot/image-mirror-example/.applier/projects/projects.yml b/multi-cluster-spring-boot/image-mirror-example/.applier/projects/projects.yml
@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: List
 items:
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: multicluster-spring-boot-dev
     creationTimestam: null
   displayName: MultiCluster Pipeline - Dev
-- kind: ProjectRequest
-  apiVersion: v1
+- apiVersion: project.openshift.io/v1
+  kind: ProjectRequest
   metadata:
     name: multicluster-spring-boot-stage
     creationTimestam: null