From 04343be1777087992fbbd87f81313db0cb369684 Mon Sep 17 00:00:00 2001 From: Gareth Healy Date: Wed, 29 Apr 2020 17:00:45 +0100 Subject: [PATCH] Updated template kinds to use fully qualified apiVersion (#128) --- .../.openshift/projects/projects.yml | 16 ++++++++-------- .../.openshift/templates/build.yml | 2 +- .../.openshift/templates/deployment.yml | 2 +- basic-nginx/.openshift/builds/template.yml | 2 +- basic-nginx/.openshift/deployment/template.yml | 2 +- basic-nginx/.openshift/projects/projects.yml | 16 ++++++++-------- .../.openshift/projects/projects.yml | 16 ++++++++-------- .../.openshift/templates/build.yml | 2 +- .../.openshift/templates/deployment.yml | 2 +- .../.openshift/projects/projects.yml | 16 ++++++++-------- .../.openshift/templates/build.yml | 2 +- .../.openshift/templates/deployment.yml | 2 +- basic-tomcat/.openshift/builds/template.yml | 2 +- .../.openshift/deployment/template.yml | 2 +- basic-tomcat/.openshift/projects/projects.yml | 16 ++++++++-------- .../.openshift/builds/template.yml | 2 +- .../.openshift/deployment/template-bg.yml | 2 +- .../.openshift/deployment/template.yml | 2 +- .../.openshift/projects/projects.yml | 16 ++++++++-------- .../applier/projects/projects.yml | 18 +++++++++--------- .../applier/templates/build.yml | 2 +- .../applier/templates/deployment.yml | 2 +- .../templates/jenkins-slave-node-8.yaml | 2 +- .../applier/templates/selenium-grid.yaml | 2 +- jenkins-s2i/jenkins-s2i.yml | 2 +- .../.openshift/app-deploy-jboss-eap.yml | 2 +- .../.applier/projects/projects-prod.yml | 4 ++-- .../.applier/projects/projects.yml | 8 ++++---- .../.applier/templates/build.yml | 2 +- .../.applier/templates/cluster-secret.yml | 2 +- .../.applier/templates/deployment.yml | 2 +- .../.applier/templates/image-mirror-sa.yml | 2 +- .../.applier/templates/image-mirror-secret.yml | 2 +- .../.applier/projects/projects-prod.yml | 4 ++-- .../.applier/projects/projects.yml | 8 ++++---- .../.applier/templates/build.yml | 2 +- .../.applier/templates/cluster-secret.yml | 2 +- .../.applier/templates/deployment.yml | 2 +- .../.openshift-applier/templates/build.yml | 2 +- .../templates/deployment.yml | 2 +- 40 files changed, 98 insertions(+), 98 deletions(-) diff --git a/basic-dotnet-core/.openshift/projects/projects.yml b/basic-dotnet-core/.openshift/projects/projects.yml index 89c554fe..619ca8d0 100644 --- 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 index 778ef2e5..d2eb3f7a 100644 --- 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 index e1170888..c79165e7 100644 --- 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 index 1f0099e2..8e43d567 100644 --- 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 index 82782808..f36647ea 100644 --- 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 index 2db169c2..204e4a4e 100644 --- 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 index e22e0c60..dfed84f0 100644 --- 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 index c39b699b..13c0f07c 100644 --- 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 index 6a1e152a..6df09932 100644 --- 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 index 500f3be9..756d8436 100644 --- 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 index a017400e..73f84fdf 100644 --- 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 index d54e20fd..00054542 100644 --- 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 index 42cf98fc..a4778178 100644 --- 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 index b0bcc63a..b1158d23 100644 --- 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 index 0afe573a..970cf030 100644 --- 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 index 69c98061..ddd424b9 100644 --- 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 index 41b0d77e..f9694485 100644 --- 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 index c192d29a..debc30ce 100644 --- 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 index cc23e111..6fd3fb89 100644 --- 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 index 4abc7306..79159d61 100644 --- 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 index ac69be96..21a46432 100644 --- 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 index ee7427a5..566343f4 100644 --- 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 index 1a8ca24b..ad49f97d 100644 --- 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 index c5fb81f6..e717abca 100644 --- 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 index cbd5055b..eff47646 100644 --- 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 index 26d76332..bf179909 100644 --- 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 index 2cd0a889..1d8bb608 100644 --- 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 index 9c3b81e8..7604669d 100644 --- 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 diff --git a/multi-cluster-spring-boot/image-mirror-example/.applier/templates/build.yml b/multi-cluster-spring-boot/image-mirror-example/.applier/templates/build.yml index b6b567e4..48d681af 100644 --- a/multi-cluster-spring-boot/image-mirror-example/.applier/templates/build.yml +++ b/multi-cluster-spring-boot/image-mirror-example/.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/multi-cluster-spring-boot/image-mirror-example/.applier/templates/cluster-secret.yml b/multi-cluster-spring-boot/image-mirror-example/.applier/templates/cluster-secret.yml index ed9ddbdc..3aaa1734 100644 --- a/multi-cluster-spring-boot/image-mirror-example/.applier/templates/cluster-secret.yml +++ b/multi-cluster-spring-boot/image-mirror-example/.applier/templates/cluster-secret.yml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: template.openshift.io/v1 kind: Template labels: template: cluster-credentials-secret diff --git a/multi-cluster-spring-boot/image-mirror-example/.applier/templates/deployment.yml b/multi-cluster-spring-boot/image-mirror-example/.applier/templates/deployment.yml index 49dd3b5e..1ffd5734 100644 --- a/multi-cluster-spring-boot/image-mirror-example/.applier/templates/deployment.yml +++ b/multi-cluster-spring-boot/image-mirror-example/.applier/templates/deployment.yml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: template.openshift.io/v1 kind: Template labels: template: basic-spring-boot diff --git a/multi-cluster-spring-boot/image-mirror-example/.applier/templates/image-mirror-sa.yml b/multi-cluster-spring-boot/image-mirror-example/.applier/templates/image-mirror-sa.yml index c8a321d5..19a33c08 100644 --- a/multi-cluster-spring-boot/image-mirror-example/.applier/templates/image-mirror-sa.yml +++ b/multi-cluster-spring-boot/image-mirror-example/.applier/templates/image-mirror-sa.yml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: template.openshift.io/v1 kind: Template metadata: annotations: diff --git a/multi-cluster-spring-boot/image-mirror-example/.applier/templates/image-mirror-secret.yml b/multi-cluster-spring-boot/image-mirror-example/.applier/templates/image-mirror-secret.yml index 065af067..a615f65b 100644 --- a/multi-cluster-spring-boot/image-mirror-example/.applier/templates/image-mirror-secret.yml +++ b/multi-cluster-spring-boot/image-mirror-example/.applier/templates/image-mirror-secret.yml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: template.openshift.io/v1 kind: Template labels: template: image-mirror-secret diff --git a/multi-cluster-spring-boot/skopeo-example/.applier/projects/projects-prod.yml b/multi-cluster-spring-boot/skopeo-example/.applier/projects/projects-prod.yml index 2cd0a889..1d8bb608 100644 --- a/multi-cluster-spring-boot/skopeo-example/.applier/projects/projects-prod.yml +++ b/multi-cluster-spring-boot/skopeo-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/skopeo-example/.applier/projects/projects.yml b/multi-cluster-spring-boot/skopeo-example/.applier/projects/projects.yml index 9c3b81e8..7604669d 100644 --- a/multi-cluster-spring-boot/skopeo-example/.applier/projects/projects.yml +++ b/multi-cluster-spring-boot/skopeo-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 diff --git a/multi-cluster-spring-boot/skopeo-example/.applier/templates/build.yml b/multi-cluster-spring-boot/skopeo-example/.applier/templates/build.yml index 1cf660e6..b06dc4ac 100644 --- a/multi-cluster-spring-boot/skopeo-example/.applier/templates/build.yml +++ b/multi-cluster-spring-boot/skopeo-example/.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/multi-cluster-spring-boot/skopeo-example/.applier/templates/cluster-secret.yml b/multi-cluster-spring-boot/skopeo-example/.applier/templates/cluster-secret.yml index ed9ddbdc..3aaa1734 100644 --- a/multi-cluster-spring-boot/skopeo-example/.applier/templates/cluster-secret.yml +++ b/multi-cluster-spring-boot/skopeo-example/.applier/templates/cluster-secret.yml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: template.openshift.io/v1 kind: Template labels: template: cluster-credentials-secret diff --git a/multi-cluster-spring-boot/skopeo-example/.applier/templates/deployment.yml b/multi-cluster-spring-boot/skopeo-example/.applier/templates/deployment.yml index 49dd3b5e..1ffd5734 100644 --- a/multi-cluster-spring-boot/skopeo-example/.applier/templates/deployment.yml +++ b/multi-cluster-spring-boot/skopeo-example/.applier/templates/deployment.yml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: template.openshift.io/v1 kind: Template labels: template: basic-spring-boot diff --git a/secure-spring-boot/.openshift-applier/templates/build.yml b/secure-spring-boot/.openshift-applier/templates/build.yml index 5a470e5c..f9f8fc90 100644 --- a/secure-spring-boot/.openshift-applier/templates/build.yml +++ b/secure-spring-boot/.openshift-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/secure-spring-boot/.openshift-applier/templates/deployment.yml b/secure-spring-boot/.openshift-applier/templates/deployment.yml index 6e2c0ca9..e58a4004 100644 --- a/secure-spring-boot/.openshift-applier/templates/deployment.yml +++ b/secure-spring-boot/.openshift-applier/templates/deployment.yml @@ -1,4 +1,4 @@ -apiVersion: v1 +apiVersion: template.openshift.io/v1 kind: Template labels: template: secure-spring-boot