Parameterize jenkins-proxy namespace

tools/jenkins-proxy/openshift/build.yaml

@@ -1,10 +1,9 @@
 apiVersion: v1
 kind: Template
-metadata:
-  name: jenkins-proxy
-  labels:
-    app: prow
 parameters:
+- description: The namespace to instantiate jenkins-proxy under.
+  name: NAMESPACE
+  value: ci
 - name: NAME
   displayName: Application Name
   description: The name to use for the objects created by this template
@@ -20,13 +19,12 @@ objects:
   apiVersion: v1
   metadata:
     name: "${NAME}"
-    labels:
-      app: prow
-      component: "${NAME}"
+    namespace: "${NAMESPACE}"
 - kind: BuildConfig
   apiVersion: v1
   metadata:
     name: "${NAME}-binary"
+    namespace: "${NAMESPACE}"
     labels:
       app: prow
       component: "${NAME}-binary"
@@ -37,6 +35,7 @@ objects:
       to:
         kind: ImageStreamTag
         name: "${NAME}:binaries"
+        namespace: "${NAMESPACE}"
     source:
       git:
         uri: "${SOURCE_URL}"
@@ -61,6 +60,7 @@ objects:
   kind: BuildConfig
   metadata:
     name: "${NAME}"
+    namespace: "${NAMESPACE}"
     labels:
       app: prow
       component: "${NAME}"
@@ -71,13 +71,15 @@ objects:
       to:
         kind: ImageStreamTag
         name: "${NAME}:latest"
+        namespace: "${NAMESPACE}"
     source:
       git:
         uri: "${SOURCE_URL}"
       images:
       - from:
           kind: ImageStreamTag
           name: "${NAME}:binaries"
+          namespace: "${NAMESPACE}"
         paths:
         - destinationDir: .
           sourcePath: /go/bin/jenkins-proxy
@@ -91,4 +93,5 @@ objects:
         from:
           kind: ImageStreamTag
           name: "${NAME}:binaries"
+          namespace: "${NAMESPACE}"
       type: ImageChange

tools/jenkins-proxy/openshift/deploy.yaml

@@ -1,10 +1,12 @@
 apiVersion: v1
 kind: Template
-metadata:
-  name: jenkins-proxy
-  labels:
-    app: prow
 parameters:
+- description: The namespace to get the image from.
+  name: IMAGE_NAMESPACE
+  value: ci
+- description: The namespace to instantiate jenkins-proxy under.
+  name: NAMESPACE
+  value: ci
 - name: NAME
   displayName: Application Name
   description: The name to use for the objects created by this template
@@ -15,9 +17,7 @@ objects:
   kind: Service
   metadata:
     name: "${NAME}"
-    labels:
-      app: prow
-      component: "${NAME}"
+    namespace: "${NAMESPACE}"
   spec:
     ports:
     - name: proxy
@@ -32,9 +32,7 @@ objects:
   kind: DeploymentConfig
   metadata:
     name: "${NAME}"
-    labels:
-      app: prow
-      component: "${NAME}"
+    namespace: "${NAMESPACE}"
   spec:
     replicas: 1
     revisionHistoryLimit: 2
@@ -71,4 +69,5 @@ objects:
         from:
           kind: ImageStreamTag
           name: "${NAME}:latest"
+          namespace: "${IMAGE_NAMESPACE}"
       type: ImageChange