Change application label to app to show router link in web console, f…

…ixes #45 (#47) * Use OpenShift Applier * Add python example w/ python-slave builder + coverage plugin * Add jenkins slave-python & sonarqube * Add NodeJS Express REST application pipeline * Move off nodejs & python pipelines * Change application label to app to show router link in web console, fixes #45
redhat-cop · Oct 25, 2018 · a20bd2c · a20bd2c
1 parent 071d1ea
commit a20bd2c
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 44 deletions.
diff --git a/basic-spring-boot/.openshift/templates/deployment.yml b/basic-spring-boot/.openshift/templates/deployment.yml
@@ -16,7 +16,7 @@ objects:
     annotations:
       description: The web server's http port.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -32,7 +32,7 @@ objects:
     annotations:
       description: Route for application's http service.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -43,14 +43,14 @@ objects:
   kind: ImageStream
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
 - apiVersion: v1
   kind: DeploymentConfig
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -62,7 +62,7 @@ objects:
     template:
       metadata:
         labels:
-          application: ${APPLICATION_NAME}
+          app: ${APPLICATION_NAME}
           deploymentConfig: ${APPLICATION_NAME}
         name: ${APPLICATION_NAME}
       spec:

diff --git a/basic-tomcat/.openshift/deployment/template.yml b/basic-tomcat/.openshift/deployment/template.yml
@@ -11,7 +11,7 @@ objects:
   kind: DeploymentConfig
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${APPLICATION_NAME}${ENV}
   spec:
@@ -23,7 +23,7 @@ objects:
     template:
       metadata:
         labels:
-          application: ${APPLICATION_NAME}
+          app: ${APPLICATION_NAME}
           deploymentConfig: ${APPLICATION_NAME}
         name: ${APPLICATION_NAME}
       spec:
@@ -65,7 +65,7 @@ objects:
   kind: ImageStream
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${APPLICATION_NAME}${ENV}
 - apiVersion: v1
@@ -75,7 +75,7 @@ objects:
     annotations:
       description: Route for application's service.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${APPLICATION_NAME}${ENV}
   spec:
@@ -89,7 +89,7 @@ objects:
     annotations:
       description: Service for application.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${APPLICATION_NAME}${ENV}
   spec:
@@ -99,15 +99,15 @@ objects:
       protocol: TCP
       targetPort: 8080
     selector:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
       deploymentConfig: ${APPLICATION_NAME}
 - apiVersion: v1
   kind: Service
   metadata:
     annotations:
       description: Service for application.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${APPLICATION_NAME}${ENV}
   spec:
@@ -117,7 +117,7 @@ objects:
       protocol: TCP
       targetPort: 8080
     selector:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
       deploymentConfig: ${APPLICATION_NAME}
 - apiVersion: v1
   groupNames: null

diff --git a/blue-green-spring/.openshift/deployment/template-bg.yml b/blue-green-spring/.openshift/deployment/template-bg.yml
@@ -16,7 +16,7 @@ objects:
     annotations:
       description: The web server's http port.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}-green
     namespace: ${NAMESPACE}
   spec:
@@ -31,7 +31,7 @@ objects:
     annotations:
       description: The web server's http port.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}-blue
     namespace: ${NAMESPACE}
   spec:
@@ -47,7 +47,7 @@ objects:
     annotations:
       description: Current live route for application's http service.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -61,7 +61,7 @@ objects:
     annotations:
       description: Route for the blue deployment.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}-blue
     namespace: ${NAMESPACE}
   spec:
@@ -75,7 +75,7 @@ objects:
     annotations:
       description: Route for green deployment.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}-green
     namespace: ${NAMESPACE}
   spec:
@@ -86,21 +86,21 @@ objects:
   kind: ImageStream
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}-green
     namespace: ${NAMESPACE}
 - apiVersion: v1
   kind: ImageStream
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}-green
     namespace: ${NAMESPACE}
 - apiVersion: v1
   kind: DeploymentConfig
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}-blue
     namespace: ${NAMESPACE}
   spec:
@@ -112,7 +112,7 @@ objects:
     template:
       metadata:
         labels:
-          application: ${APPLICATION_NAME}
+          app: ${APPLICATION_NAME}
           deploymentConfig: ${APPLICATION_NAME}-blue
         name: ${APPLICATION_NAME}-blue
       spec:
@@ -151,7 +151,7 @@ objects:
   kind: DeploymentConfig
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}-green
     namespace: ${NAMESPACE}
   spec:
@@ -163,7 +163,7 @@ objects:
     template:
       metadata:
         labels:
-          application: ${APPLICATION_NAME}
+          app: ${APPLICATION_NAME}
           deploymentConfig: ${APPLICATION_NAME}-green
         name: ${APPLICATION_NAME}-green
       spec:

diff --git a/blue-green-spring/.openshift/deployment/template.yml b/blue-green-spring/.openshift/deployment/template.yml
@@ -16,7 +16,7 @@ objects:
     annotations:
       description: The web server's http port.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -32,7 +32,7 @@ objects:
     annotations:
       description: Route for application's http service.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -43,14 +43,14 @@ objects:
   kind: ImageStream
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
 - apiVersion: v1
   kind: DeploymentConfig
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -62,7 +62,7 @@ objects:
     template:
       metadata:
         labels:
-          application: ${APPLICATION_NAME}
+          app: ${APPLICATION_NAME}
           deploymentConfig: ${APPLICATION_NAME}
         name: ${APPLICATION_NAME}
       spec:

diff --git a/cucumber-selenium-grid/applier/templates/deployment.yml b/cucumber-selenium-grid/applier/templates/deployment.yml
@@ -16,7 +16,7 @@ objects:
     annotations:
       description: The web server's http port.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -32,7 +32,7 @@ objects:
     annotations:
       description: Route for application's http service.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -43,14 +43,14 @@ objects:
   kind: ImageStream
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
 - apiVersion: v1
   kind: DeploymentConfig
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -62,7 +62,7 @@ objects:
     template:
       metadata:
         labels:
-          application: ${APPLICATION_NAME}
+          app: ${APPLICATION_NAME}
           deploymentConfig: ${APPLICATION_NAME}
         name: ${APPLICATION_NAME}
       spec:

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
@@ -16,7 +16,7 @@ objects:
     annotations:
       description: The web server's http port.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -32,7 +32,7 @@ objects:
     annotations:
       description: Route for application's http service.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -43,14 +43,14 @@ objects:
   kind: ImageStream
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
 - apiVersion: v1
   kind: DeploymentConfig
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -62,7 +62,7 @@ objects:
     template:
       metadata:
         labels:
-          application: ${APPLICATION_NAME}
+          app: ${APPLICATION_NAME}
           deploymentConfig: ${APPLICATION_NAME}
         name: ${APPLICATION_NAME}
       spec:

diff --git a/multi-cluster-spring-boot/skopeo-example/.applier/templates/deployment.yml b/multi-cluster-spring-boot/skopeo-example/.applier/templates/deployment.yml
@@ -16,7 +16,7 @@ objects:
     annotations:
       description: The web server's http port.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -32,7 +32,7 @@ objects:
     annotations:
       description: Route for application's http service.
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -43,14 +43,14 @@ objects:
   kind: ImageStream
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
 - apiVersion: v1
   kind: DeploymentConfig
   metadata:
     labels:
-      application: ${APPLICATION_NAME}
+      app: ${APPLICATION_NAME}
     name: ${APPLICATION_NAME}
     namespace: ${NAMESPACE}
   spec:
@@ -62,7 +62,7 @@ objects:
     template:
       metadata:
         labels:
-          application: ${APPLICATION_NAME}
+          app: ${APPLICATION_NAME}
           deploymentConfig: ${APPLICATION_NAME}
         name: ${APPLICATION_NAME}
       spec: