From d685d36976693ea890752c1558af54b8fc5c8c1c Mon Sep 17 00:00:00 2001 From: Michalis Kargakis Date: Sun, 17 Sep 2017 11:17:21 +0200 Subject: [PATCH] Fix prow README and image namespace refs Signed-off-by: Michalis Kargakis --- cluster/ci/config/prow/README.md | 28 ++++++------------- cluster/ci/config/prow/openshift/deck.yaml | 2 +- cluster/ci/config/prow/openshift/hook.yaml | 2 +- .../ci/config/prow/openshift/horologium.yaml | 2 +- .../prow/openshift/jenkins-operator.yaml | 2 +- cluster/ci/config/prow/openshift/plank.yaml | 2 +- cluster/ci/config/prow/openshift/sinker.yaml | 2 +- cluster/ci/config/prow/openshift/splice.yaml | 2 +- cluster/ci/config/prow/prow_images.yaml | 2 +- 9 files changed, 17 insertions(+), 27 deletions(-) diff --git a/cluster/ci/config/prow/README.md b/cluster/ci/config/prow/README.md index 3b1f38d280bc0..3797cad6a9060 100644 --- a/cluster/ci/config/prow/README.md +++ b/cluster/ci/config/prow/README.md @@ -11,11 +11,9 @@ oc create ns ci oc create -f config.yaml -f plugins.yaml -n ci ``` -Ensure that the prow-images namespace exists and create all the -build configurations for prow: +Create all the build configurations for prow: ``` -oc create ns prow-images -oc policy add-role-to-user system:image-puller system:unauthenticated -n prow-images +oc policy add-role-to-user system:image-puller system:unauthenticated -n ci oc process -f prow_images.yaml | oc create -f - ``` @@ -56,9 +54,15 @@ oc process -f openshift/plank.yaml | oc create -f - ### jenkins-operator -`plank` is responsible for the lifecycle of ProwJobs that run Jenkins jobs. +`jenkins-operator` is responsible for the lifecycle of ProwJobs that run Jenkins jobs. It starts the tests for new ProwJobs, and moves them to completion accordingly. +We run a proxy in front of the Jenkins operator. Build and deploy it with the following templates: +``` +oc process -f https://raw.githubusercontent.com/openshift/release/master/tools/jenkins-proxy/openshift/build.yaml | oc create -f - +oc process -f https://raw.githubusercontent.com/openshift/release/master/tools/jenkins-proxy/openshift/deploy.yaml | oc create -f - +``` + `jenkins-operator` needs a jenkins token to start jobs in Jenkins and the oauth token created in the hook template. ``` @@ -98,20 +102,6 @@ oc process -f openshift/splice.yaml | oc create -f - oc process -f openshift/sinker.yaml | oc create -f - ``` -## Prow builds - -Allow prow to download images from the namespace where the prow builds run. - -``` -oc policy add-role-to-user system:image-puller system:unauthenticated -n ci -oc policy add-role-to-user system:image-puller system:serviceaccount:ci:hook -n prow-images -oc policy add-role-to-user system:image-puller system:serviceaccount:ci:plank -n prow-images -oc policy add-role-to-user system:image-puller system:serviceaccount:ci:jenkins-operator -n prow-images -oc policy add-role-to-user system:image-puller system:serviceaccount:ci:deck -n prow-images -oc policy add-role-to-user system:image-puller system:serviceaccount:ci:splice -n prow-images -oc policy add-role-to-user system:image-puller system:serviceaccount:ci:sinker -n prow-images -oc policy add-role-to-user system:image-puller system:serviceaccount:ci:horologium -n prow-images -``` ## Prow jobs diff --git a/cluster/ci/config/prow/openshift/deck.yaml b/cluster/ci/config/prow/openshift/deck.yaml index 42180b62c5b85..ff722dc175ab7 100644 --- a/cluster/ci/config/prow/openshift/deck.yaml +++ b/cluster/ci/config/prow/openshift/deck.yaml @@ -9,7 +9,7 @@ metadata: parameters: - description: The namespace to get the image from. name: IMAGE_NAMESPACE - value: prow-images + value: ci - description: The namespace to instantiate deck under. name: NAMESPACE value: ci diff --git a/cluster/ci/config/prow/openshift/hook.yaml b/cluster/ci/config/prow/openshift/hook.yaml index 0455c50f6a5d4..2e0458910a7d0 100644 --- a/cluster/ci/config/prow/openshift/hook.yaml +++ b/cluster/ci/config/prow/openshift/hook.yaml @@ -10,7 +10,7 @@ metadata: parameters: - description: The namespace to get the image from. name: IMAGE_NAMESPACE - value: prow-images + value: ci - description: The namespace to instantiate hook under. name: NAMESPACE value: ci diff --git a/cluster/ci/config/prow/openshift/horologium.yaml b/cluster/ci/config/prow/openshift/horologium.yaml index cac857b3e5fa8..a94171fdbd591 100644 --- a/cluster/ci/config/prow/openshift/horologium.yaml +++ b/cluster/ci/config/prow/openshift/horologium.yaml @@ -10,7 +10,7 @@ metadata: parameters: - description: The namespace to get the image from. name: IMAGE_NAMESPACE - value: prow-images + value: ci - description: The namespace to instantiate horologium under. name: NAMESPACE value: ci diff --git a/cluster/ci/config/prow/openshift/jenkins-operator.yaml b/cluster/ci/config/prow/openshift/jenkins-operator.yaml index bf49ad4069ed6..74895d71f7861 100644 --- a/cluster/ci/config/prow/openshift/jenkins-operator.yaml +++ b/cluster/ci/config/prow/openshift/jenkins-operator.yaml @@ -11,7 +11,7 @@ metadata: parameters: - description: The namespace to get the image from. name: IMAGE_NAMESPACE - value: prow-images + value: ci - description: The namespace to instantiate jenkins-operator under. name: NAMESPACE value: ci diff --git a/cluster/ci/config/prow/openshift/plank.yaml b/cluster/ci/config/prow/openshift/plank.yaml index 150d43ff9643e..7f9da61e28b38 100644 --- a/cluster/ci/config/prow/openshift/plank.yaml +++ b/cluster/ci/config/prow/openshift/plank.yaml @@ -11,7 +11,7 @@ metadata: parameters: - description: The namespace to get the image from. name: IMAGE_NAMESPACE - value: prow-images + value: ci - description: The namespace to instantiate plank under. name: NAMESPACE value: ci diff --git a/cluster/ci/config/prow/openshift/sinker.yaml b/cluster/ci/config/prow/openshift/sinker.yaml index 1ad4ee575aa67..8a289744be1c6 100644 --- a/cluster/ci/config/prow/openshift/sinker.yaml +++ b/cluster/ci/config/prow/openshift/sinker.yaml @@ -10,7 +10,7 @@ metadata: parameters: - description: The namespace to get the image from. name: IMAGE_NAMESPACE - value: prow-images + value: ci - description: The namespace to instantiate sinker under. name: NAMESPACE value: ci diff --git a/cluster/ci/config/prow/openshift/splice.yaml b/cluster/ci/config/prow/openshift/splice.yaml index be8036821ffc0..08880781d7750 100644 --- a/cluster/ci/config/prow/openshift/splice.yaml +++ b/cluster/ci/config/prow/openshift/splice.yaml @@ -10,7 +10,7 @@ metadata: parameters: - description: The namespace to get the image from. name: IMAGE_NAMESPACE - value: prow-images + value: ci - description: The namespace to instantiate splice under. name: NAMESPACE value: ci diff --git a/cluster/ci/config/prow/prow_images.yaml b/cluster/ci/config/prow/prow_images.yaml index 178ab9a2f0200..8d074ab88ca40 100644 --- a/cluster/ci/config/prow/prow_images.yaml +++ b/cluster/ci/config/prow/prow_images.yaml @@ -5,7 +5,7 @@ metadata: parameters: - description: The namespace to instantiate prow builds under. name: NAMESPACE - value: prow-images + value: ci objects: - kind: ImageStream apiVersion: v1