Upgrade prow to v20190628-eb4a10930 (kubernetes#1399)

ostromart · Jul 1, 2019 · fac1f07 · fac1f07
1 parent 306cb34
commit fac1f07
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 15 deletions.
diff --git a/prow/cluster/deck_deployment.yaml b/prow/cluster/deck_deployment.yaml
@@ -19,14 +19,15 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
       - name: deck
-        image: gcr.io/istio-testing/deck:v20181127-b0ca57e86
+        image: gcr.io/k8s-prow/deck:v20190628-eb4a10930
         ports:
           - name: http
             containerPort: 8080
         args:
-        - --tide-url=http://tide/
+        - --config-path=/etc/config/config.yaml
         - --hook-url=http://hook:8888/plugin-help
         - --job-config-path=/etc/job-config
+        - --tide-url=http://tide/
         volumeMounts:
         - name: config
           mountPath: /etc/config

diff --git a/prow/cluster/hook_deployment.yaml b/prow/cluster/hook_deployment.yaml
@@ -16,14 +16,18 @@ spec:
       labels:
         app: hook
     spec:
+      # TODO(fejta): enable this?
+      # serviceAccountName: "hook" # Uncomment for use with RBAC
       terminationGracePeriodSeconds: 180
       containers:
       - name: hook
-        image: gcr.io/istio-testing/hook:v20181127-b0ca57e86
+        image: gcr.io/k8s-prow/hook:v20190628-eb4a10930
         args:
+        - --config-path=/etc/config/config.yaml
         - --dry-run=false
-        - --slack-token-file=/etc/slack/token
         - --job-config-path=/etc/job-config
+        - --slack-token-file=/etc/slack/token
+        # TODO(fejta): ghproxy
         ports:
           - name: http
             containerPort: 8888
@@ -46,6 +50,7 @@ spec:
         - name: job-config
           mountPath: /etc/job-config
           readOnly: true
+        # TODO(fejta): catapi token
       volumes:
       - name: slack
         secret:

diff --git a/prow/cluster/hook_rbac.yaml b/prow/cluster/hook_rbac.yaml
@@ -0,0 +1,40 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  namespace: default
+  name: "hook"
+---
+kind: Role
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  namespace: default
+  name: "hook"
+rules:
+  - apiGroups:
+      - "prow.k8s.io"
+    resources:
+      - prowjobs
+    verbs:
+      - create
+      - get
+  - apiGroups:
+      - ""
+    resources:
+      - configmaps
+    verbs:
+      - create
+      - get
+      - update
+---
+kind: RoleBinding
+apiVersion: rbac.authorization.k8s.io/v1beta1
+metadata:
+  namespace: default
+  name: "hook"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: "hook"
+subjects:
+- kind: ServiceAccount
+  name: "hook"
diff --git a/prow/cluster/horologium_deployment.yaml b/prow/cluster/horologium_deployment.yaml
@@ -14,9 +14,12 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
       - name: horologium
-        image: gcr.io/istio-testing/horologium:v20181127-b0ca57e86
+        image: gcr.io/k8s-prow/horologium:v20190628-eb4a10930
         args:
+        - --config-path=/etc/config/config.yaml
+        - --dry-run=false
         - --job-config-path=/etc/job-config
+        # TODO(fejta): ghproxy
         volumeMounts:
         - name: config
           mountPath: /etc/config

diff --git a/prow/cluster/needs-rebase_deployment.yaml b/prow/cluster/needs-rebase_deployment.yaml
@@ -28,7 +28,7 @@ spec:
       terminationGracePeriodSeconds: 180
       containers:
       - name: needs-rebase
-        image: gcr.io/istio-testing/needs-rebase:v20181127-b0ca57e86
+        image: gcr.io/k8s-prow/needs-rebase:v20190628-eb4a10930
         args:
         - --dry-run=false
         ports:

diff --git a/prow/cluster/plank_deployment.yaml b/prow/cluster/plank_deployment.yaml
@@ -13,11 +13,12 @@ spec:
     spec:
       containers:
       - name: plank
-        image: gcr.io/istio-testing/plank:v20181127-b0ca57e86
+        image: gcr.io/k8s-prow/plank:v20190628-eb4a10930
         args:
-        - --tot-url=http://tot
+        - --config-path=/etc/config/config.yaml
         - --dry-run=false
         - --job-config-path=/etc/job-config
+        - --tot-url=http://tot
         volumeMounts:
         - name: oauth
           mountPath: /etc/github

diff --git a/prow/cluster/sinker_deployment.yaml b/prow/cluster/sinker_deployment.yaml
@@ -13,8 +13,10 @@ spec:
     spec:
       containers:
       - name: sinker
-        image: gcr.io/istio-testing/sinker:v20181127-b0ca57e86
+        image: gcr.io/k8s-prow/sinker:v20190628-eb4a10930
         args:
+        - --config-path=/etc/config/config.yaml
+        - --dry-run=false
         - --job-config-path=/etc/job-config
         volumeMounts:
         - name: config

diff --git a/prow/cluster/tide_deployment.yaml b/prow/cluster/tide_deployment.yaml
@@ -13,10 +13,11 @@ spec:
     spec:
       containers:
       - name: tide
-        image: gcr.io/istio-testing/tide:v20181127-b0ca57e86
+        image: gcr.io/k8s-prow/tide:v20190628-eb4a10930
         args:
-        - --job-config-path=/etc/job-config
+        - --config-path=/etc/config/config.yaml
         - --dry-run=false
+        - --job-config-path=/etc/job-config
         ports:
           - name: http
             containerPort: 8888

diff --git a/prow/cluster/tot_deployment.yaml b/prow/cluster/tot_deployment.yaml
@@ -43,7 +43,7 @@ spec:
       terminationGracePeriodSeconds: 30
       containers:
       - name: tot
-        image: gcr.io/istio-testing/tot:v20181127-b0ca57e86
+        image: gcr.io/k8s-prow/tot:v20190628-eb4a10930
         args:
         - -storage=/store/tot.json
         - -fallback

diff --git a/prow/config.yaml b/prow/config.yaml
@@ -1,7 +1,10 @@
 ---
 plank:
-  job_url_template: 'https://k8s-gubernator.appspot.com/build/istio-prow/{{if eq .Spec.Type "presubmit"}}pull/{{.Spec.Refs.Org}}_{{.Spec.Refs.Repo}}/{{with index .Spec.Refs.Pulls 0}}{{.Number}}{{end}}{{else}}.{{end}}/{{.Spec.Job}}/{{.Status.BuildID}}/'
-  job_url_prefix: https://k8s-gubernator.appspot.com/build/
+  # TODO(fejta): switch to spyglass
+  #ob_url_template: 'https://prow.istio.io/view/gcs/istio-prow/{{if eq .Spec.Type "presubmit"}}pull/{{.Spec.Refs.Org}}_{{.Spec.Refs.Repo}}/{{with index .Spec.Refs.Pulls 0}}{{.Number}}{{end}}{{else}}.{{end}}/{{.Spec.Job}}/{{.Status.BuildID}}/'
+  #ob_url_prefix: https://prow.istio.io/view/gcs
+  job_url_template: 'https://gubernator.k8s.io/build/istio-prow/{{if eq .Spec.Type "presubmit"}}pull/{{.Spec.Refs.Org}}_{{.Spec.Refs.Repo}}/{{with index .Spec.Refs.Pulls 0}}{{.Number}}{{end}}{{else}}.{{end}}/{{.Spec.Job}}/{{.Status.BuildID}}/'
+  job_url_prefix: https://gubernator.k8s.io/build/
   pod_pending_timeout: 60m
   default_decoration_config:
     timeout: 7200000000000 # 2h
@@ -92,7 +95,7 @@ branch-protection:
               restrictions:
                 teams:
                 - istio-hackers
-            collab-gce-identity:  
+            collab-gce-identity:
               protect: true
             prow-staging:
               protect: true