Updated api versions from default v1 to current fully qualified (#126)

redhat-cop · Apr 29, 2020 · b3a38b8 · b3a38b8
1 parent 2da9f73
commit b3a38b8
Show file tree

Hide file tree

Showing 28 changed files with 111 additions and 111 deletions.
diff --git a/basic-dotnet-core/.openshift/templates/build.yml b/basic-dotnet-core/.openshift/templates/build.yml
@@ -9,15 +9,15 @@ metadata:
     version: 1.2.0
   name: generic-dotnet-jenkins-pipeline
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:
       application: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
-- kind: "BuildConfig"
-  apiVersion: "v1"
+- apiVersion: build.openshift.io/v1
+  kind: BuildConfig
   metadata:
     labels:
       application: ${APPLICATION_NAME}
@@ -44,7 +44,7 @@ objects:
           value: "${APPLICATION_SOURCE_REPO}"
         - name: "APPLICATION_SOURCE_REF"
           value: "${APPLICATION_SOURCE_REF}"
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:

diff --git a/basic-dotnet-core/.openshift/templates/deployment.yml b/basic-dotnet-core/.openshift/templates/deployment.yml
@@ -24,7 +24,7 @@ objects:
       targetPort: 8080
     selector:
       deploymentConfig: ${APPLICATION_NAME}
-- apiVersion: v1
+- apiVersion: route.openshift.io/v1
   kind: Route
   metadata:
     annotations:
@@ -37,14 +37,14 @@ objects:
     host: ${HOSTNAME_HTTP}
     to:
       name: ${APPLICATION_NAME}
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:
       app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
-- apiVersion: v1
+- apiVersion: apps.openshift.io/v1
   kind: DeploymentConfig
   metadata:
     labels:
@@ -98,15 +98,15 @@ objects:
           name: ${APPLICATION_NAME}:latest
       type: ImageChange
     - type: ConfigChange
-- apiVersion: v1
-  groupNames: null
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: RoleBinding
   metadata:
     creationTimestamp: null
     labels:
       template: basic-tomcat-template
     name: jenkins_edit
     namespace: ${NAMESPACE}
+  groupNames: null
   roleRef:
     name: edit
   subjects:

diff --git a/basic-nginx/.openshift/builds/template.yml b/basic-nginx/.openshift/builds/template.yml
@@ -10,8 +10,8 @@ metadata:
     version: 1.2.0
   name: generic-nginx-jenkins-pipeline
 objects:
-- kind: "BuildConfig"
-  apiVersion: "v1"
+- apiVersion: build.openshift.io/v1
+  kind: BuildConfig
   metadata:
     labels:
       application: ${APPLICATION_NAME}
@@ -40,7 +40,7 @@ objects:
           value: "${SOURCE_REPOSITORY_REF}"
         - name: "CONTEXT_DIR"
           value: "${CONTEXT_DIR}"
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:
@@ -64,7 +64,7 @@ objects:
           namespace: ${IMAGE_STREAM_NAMESPACE}
       type: Source
     successfulBuildHistoryLimit: 3
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:

diff --git a/basic-nginx/.openshift/deployment/template.yml b/basic-nginx/.openshift/deployment/template.yml
@@ -7,7 +7,7 @@ metadata:
     description: Application template for applications built using a Jenkins Pipeline
   name: deployment-template
 objects:
-- apiVersion: v1
+- apiVersion: apps.openshift.io/v1
   kind: DeploymentConfig
   metadata:
     labels:
@@ -54,14 +54,14 @@ objects:
           name: ${APPLICATION_NAME}:latest
       type: ImageChange
     - type: ConfigChange
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:
       app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${APPLICATION_NAME}${ENV}
-- apiVersion: v1
+- apiVersion: route.openshift.io/v1
   kind: Route
   metadata:
     annotations:
@@ -92,15 +92,15 @@ objects:
     selector:
       app: ${APPLICATION_NAME}
       deploymentConfig: ${APPLICATION_NAME}
-- apiVersion: v1
-  groupNames: null
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: RoleBinding
   metadata:
     creationTimestamp: null
     labels:
       template: basic-nginx-template
     name: jenkins_edit
     namespace: ${APPLICATION_NAME}${ENV}
+  groupNames: null
   roleRef:
     name: edit
   subjects:

diff --git a/basic-spring-boot-tekton/.openshift/templates/build.yml b/basic-spring-boot-tekton/.openshift/templates/build.yml
@@ -27,7 +27,7 @@ objects:
   subjects:
   - kind: ServiceAccount
     name: ${SA_NAME}
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:
@@ -194,7 +194,7 @@ objects:
         value: ${APPLICATION_NAME} 
       - name: deployment
         value: ${APPLICATION_NAME}                                           
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:

diff --git a/basic-spring-boot-tekton/.openshift/templates/deployment.yml b/basic-spring-boot-tekton/.openshift/templates/deployment.yml
@@ -25,7 +25,7 @@ objects:
       targetPort: 8080
     selector:
       deploymentConfig: ${APPLICATION_NAME}
-- apiVersion: v1
+- apiVersion: route.openshift.io/v1
   kind: Route
   metadata:
     annotations:
@@ -38,14 +38,14 @@ objects:
     host: ${HOSTNAME_HTTP}
     to:
       name: ${APPLICATION_NAME}
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:
       app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
-- apiVersion: v1
+- apiVersion: apps.openshift.io/v1
   kind: DeploymentConfig
   metadata:
     labels:
@@ -99,15 +99,15 @@ objects:
           name: ${APPLICATION_NAME}:latest
       type: ImageChange
     - type: ConfigChange
-- apiVersion: v1
-  groupNames: null
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: RoleBinding
   metadata:
     creationTimestamp: null
     labels:
       template: basic-tomcat-template
     name: ${SA_NAME}_edit
     namespace: ${NAMESPACE}
+  groupNames: null
   roleRef:
     name: edit
   subjects:

diff --git a/basic-spring-boot/.openshift/templates/build.yml b/basic-spring-boot/.openshift/templates/build.yml
@@ -10,7 +10,7 @@ metadata:
     version: 1.2.0
   name: generic-java-jenkins-pipeline
 objects:
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:
@@ -21,8 +21,8 @@ objects:
       app.kubernetes.io/managed-by: applier
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
-- kind: "BuildConfig"
-  apiVersion: "v1"
+- apiVersion: build.openshift.io/v1
+  kind: BuildConfig
   metadata:
     labels:
       app.kubernetes.io/name: ${APPLICATION_NAME}
@@ -53,7 +53,7 @@ objects:
           value: "${APPLICATION_SOURCE_REPO}"
         - name: "APPLICATION_SOURCE_REF"
           value: "${APPLICATION_SOURCE_REF}"
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:

diff --git a/basic-spring-boot/.openshift/templates/deployment.yml b/basic-spring-boot/.openshift/templates/deployment.yml
@@ -29,7 +29,7 @@ objects:
       targetPort: 8080
     selector:
       deploymentConfig: ${APPLICATION_NAME}
-- apiVersion: v1
+- apiVersion: route.openshift.io/v1
   kind: Route
   metadata:
     annotations:
@@ -46,7 +46,7 @@ objects:
     host: ${HOSTNAME_HTTP}
     to:
       name: ${APPLICATION_NAME}
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:
@@ -57,7 +57,7 @@ objects:
       app.kubernetes.io/managed-by: applier
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
-- apiVersion: v1
+- apiVersion: apps.openshift.io/v1
   kind: DeploymentConfig
   metadata:
     labels:
@@ -119,8 +119,7 @@ objects:
           name: ${APPLICATION_NAME}:latest
       type: ImageChange
     - type: ConfigChange
-- apiVersion: v1
-  groupNames: null
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: RoleBinding
   metadata:
     creationTimestamp: null
@@ -133,6 +132,7 @@ objects:
       template: basic-tomcat-template
     name: jenkins_edit
     namespace: ${NAMESPACE}
+  groupNames: null
   roleRef:
     name: edit
   subjects:

diff --git a/basic-tomcat/.openshift/builds/template.yml b/basic-tomcat/.openshift/builds/template.yml
@@ -10,8 +10,8 @@ metadata:
     version: 1.2.0
   name: generic-java-jenkins-pipeline
 objects:
-- kind: "BuildConfig"
-  apiVersion: "v1"
+- apiVersion: build.openshift.io/v1
+  kind: BuildConfig
   metadata:
     labels:
       application: ${APPLICATION_NAME}
@@ -40,7 +40,7 @@ objects:
           value: "${APPLICATION_SOURCE_REF}"
         - name: "BUILD_CONTEXT_DIR"
           value: "${APPLICATION_CONTEXT_DIR}"
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:
@@ -64,7 +64,7 @@ objects:
           namespace: ${IMAGE_STREAM_NAMESPACE}
       type: Source
     successfulBuildHistoryLimit: 3
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:

diff --git a/basic-tomcat/.openshift/deployment/template.yml b/basic-tomcat/.openshift/deployment/template.yml
@@ -7,7 +7,7 @@ metadata:
     description: Application template for applications built using a Jenkins Pipeline
   name: deployment-template
 objects:
-- apiVersion: v1
+- apiVersion: apps.openshift.io/v1
   kind: DeploymentConfig
   metadata:
     labels:
@@ -61,14 +61,14 @@ objects:
           name: ${APPLICATION_NAME}:latest
       type: ImageChange
     - type: ConfigChange
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels:
       app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${APPLICATION_NAME}${ENV}
-- apiVersion: v1
+- apiVersion: route.openshift.io/v1
   kind: Route
   metadata:
     annotations:
@@ -118,15 +118,15 @@ objects:
     selector:
       app: ${APPLICATION_NAME}
       deploymentConfig: ${APPLICATION_NAME}
-- apiVersion: v1
-  groupNames: null
+- apiVersion: rbac.authorization.k8s.io/v1
   kind: RoleBinding
   metadata:
     creationTimestamp: null
     labels:
       template: basic-tomcat-template
     name: jenkins_edit
     namespace: ${APPLICATION_NAME}${ENV}
+  groupNames: null
   roleRef:
     name: edit
   subjects:

diff --git a/blue-green-spring/.openshift/builds/template.yml b/blue-green-spring/.openshift/builds/template.yml
@@ -10,8 +10,8 @@ metadata:
     version: 1.2.0
   name: generic-java-jenkins-pipeline
 objects:
-- kind: "BuildConfig"
-  apiVersion: "v1"
+- apiVersion: build.openshift.io/v1
+  kind: BuildConfig
   metadata:
     labels:
       application: ${APPLICATION_NAME}
@@ -38,7 +38,7 @@ objects:
           value: "${APPLICATION_SOURCE_REPO}"
         - name: "APPLICATION_SOURCE_REF"
           value: "${APPLICATION_SOURCE_REF}"
-- apiVersion: v1
+- apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
     labels:
@@ -60,7 +60,7 @@ objects:
           name: ${IMAGE_STREAM_TAG_NAME}
           namespace: ${IMAGE_STREAM_NAMESPACE}
       type: Source
-- apiVersion: v1
+- apiVersion: image.openshift.io/v1
   kind: ImageStream
   metadata:
     labels: