Skip to content

Commit 53fb43d

Browse files
authored
feat: upgrade to prow v20200427-baaf248ed (#84)
* fix: remove not needed prowjobNamespace var * fix: make crier rbac namespaced * fix: update hook rbac * fix: add github cache to hook * fix: add github cache to crier * fix: add secondary github endpoint
1 parent 5454f25 commit 53fb43d

File tree

10 files changed

+50
-28
lines changed

10 files changed

+50
-28
lines changed

prow/templates/config-configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ metadata:
1010
"helm.sh/hook-delete-policy": "before-hook-creation"
1111
data:
1212
config.yaml: |-
13-
prowjob_namespace: {{ .Values.prowjobNamespace }}
13+
prowjob_namespace: {{ .Release.Namespace }}
1414
pod_namespace: {{ .Values.podNamespace }}

prow/templates/crier-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
- --config-path=/etc/config/config.yaml
3131
- --job-config-path=/etc/job-config
3232
- --github-endpoint=http://ghproxy
33-
# - --github-endpoint=https://api.github.com
33+
- --github-endpoint=https://api.github.com
3434
volumeMounts:
3535
- name: config
3636
mountPath: /etc/config

prow/templates/crier-rbac.yaml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ apiVersion: v1
33
metadata:
44
name: "crier"
55
---
6-
kind: ClusterRole
6+
kind: Role
77
apiVersion: rbac.authorization.k8s.io/v1
88
metadata:
9-
# "namespace" omitted since ClusterRoles are not namespaced
109
name: crier
1110
rules:
1211
- apiGroups:
@@ -18,6 +17,13 @@ rules:
1817
- "watch"
1918
- "list"
2019
- "patch"
20+
---
21+
kind: Role
22+
apiVersion: rbac.authorization.k8s.io/v1
23+
metadata:
24+
name: crier
25+
namespace: {{ .Values.podNamespace }}
26+
rules:
2127
- apiGroups:
2228
- ""
2329
resources:
@@ -27,13 +33,26 @@ rules:
2733
- "get"
2834
- "list"
2935
---
30-
kind: ClusterRoleBinding
36+
kind: RoleBinding
3137
apiVersion: rbac.authorization.k8s.io/v1beta1
3238
metadata:
39+
name: crier-namespaced
40+
roleRef:
41+
apiGroup: rbac.authorization.k8s.io
42+
kind: Role
3343
name: "crier"
44+
subjects:
45+
- kind: ServiceAccount
46+
name: "crier"
47+
---
48+
kind: RoleBinding
49+
apiVersion: rbac.authorization.k8s.io/v1beta1
50+
metadata:
51+
name: crier-namespaced
52+
namespace: {{ .Values.podNamespace }}
3453
roleRef:
3554
apiGroup: rbac.authorization.k8s.io
36-
kind: ClusterRole
55+
kind: Role
3756
name: "crier"
3857
subjects:
3958
- kind: ServiceAccount

prow/templates/deck-deployment.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,20 @@ spec:
2727
- name: deck
2828
image: {{ quote .Values.deck.image }}
2929
args:
30-
- --rerun-creates-job
3130
- --config-path=/etc/config/config.yaml
3231
- --tide-url=http://tide/
3332
- --hook-url=http://hook:8888/plugin-help
3433
- --redirect-http-to={{ quote .Values.deck.host }}
34+
- --oauth-url=/github-login
3535
- --config-path=/etc/config/config.yaml
36-
- --cookie-secret=/etc/cookie/secret
3736
- --job-config-path=/etc/job-config
38-
- --oauth-url=/github-login
3937
- --spyglass=true
38+
- --rerun-creates-job
4039
- --github-token-path=/etc/github/oauth
40+
- --github-endpoint=http://ghproxy
41+
- --github-endpoint=https://api.github.com
4142
- --github-oauth-config-file=/etc/githuboauth/secret
43+
- --cookie-secret=/etc/cookie/secret
4244
- --plugin-config=/etc/plugins/plugins.yaml
4345
- --gcs-credentials-file=/etc/gcscredentials/service-account.json
4446
ports:

prow/templates/hook-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
- --dry-run=false
3535
- --config-path=/etc/config/config.yaml
3636
- --github-endpoint=http://ghproxy
37-
# - --github-endpoint=https://api.github.com
37+
- --github-endpoint=https://api.github.com
3838
- --job-config-path=/etc/job-config
3939
ports:
4040
- name: http

prow/templates/hook-rbac.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ rules:
1515
verbs:
1616
- create
1717
- get
18+
- list
19+
- update
1820
- apiGroups:
1921
- ""
2022
resources:

prow/templates/needsrebase-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
args:
2424
- --dry-run=false
2525
- --github-endpoint=http://ghproxy
26-
# - --github-endpoint=https://api.github.com
26+
- --github-endpoint=https://api.github.com
2727
ports:
2828
- name: http
2929
containerPort: 8888

prow/templates/plank-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
- --config-path=/etc/config/config.yaml
2828
- --skip-report=true
2929
- --github-endpoint=http://ghproxy
30-
# - --github-endpoint=https://api.github.com
30+
- --github-endpoint=https://api.github.com
3131
- --job-config-path=/etc/job-config
3232
ports:
3333
- name: metrics

prow/templates/tide-deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ spec:
2525
- --dry-run=false
2626
- --config-path=/etc/config/config.yaml
2727
- --github-endpoint=http://ghproxy
28-
# - --github-endpoint=https://api.github.com
28+
- --github-endpoint=https://api.github.com
2929
- --gcs-credentials-file=/etc/service-account/service-account.json
3030
- --history-uri=gs://{{ .Values.prowbucketname }}/tide-history.json
3131
- --status-path=gs://{{ .Values.prowbucketname }}/tide-status-checkpoint.yaml

prow/values.yaml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
prowjobNamespace: prow
21
podNamespace: prow-test-pods
32

43
prowbucketname: ouzidev-testinfra-252513-prow-artefacts
@@ -15,7 +14,7 @@ github:
1514
username: ouzibot
1615

1716
hook:
18-
image: gcr.io/k8s-prow/hook:v20200203-cae3cccf8
17+
image: gcr.io/k8s-prow/hook:v20200427-baaf248ed
1918
replicas: 1
2019
ingress:
2120
host: prow.test-infra.ouzi.io
@@ -30,15 +29,15 @@ hook:
3029
effect: NoSchedule
3130

3231
plank:
33-
image: gcr.io/k8s-prow/plank:v20200203-cae3cccf8
32+
image: gcr.io/k8s-prow/plank:v20200427-baaf248ed
3433
tolerations:
3534
- key: cloud.google.com/gke-preemptible
3635
operator: Equal
3736
value: "true"
3837
effect: NoSchedule
3938

4039
sinker:
41-
image: gcr.io/k8s-prow/sinker:v20200203-cae3cccf8
40+
image: gcr.io/k8s-prow/sinker:v20200427-baaf248ed
4241
replicas: 1
4342
tolerations:
4443
- key: cloud.google.com/gke-preemptible
@@ -47,7 +46,7 @@ sinker:
4746
effect: NoSchedule
4847

4948
deck:
50-
image: gcr.io/k8s-prow/deck:v20200203-cae3cccf8
49+
image: gcr.io/k8s-prow/deck:v20200427-baaf248ed
5150
replicas: 1
5251
ingress:
5352
host: prow.test-infra.ouzi.io
@@ -64,23 +63,23 @@ deck:
6463
effect: NoSchedule
6564

6665
horologium:
67-
image: gcr.io/k8s-prow/horologium:v20200203-cae3cccf8
66+
image: gcr.io/k8s-prow/horologium:v20200427-baaf248ed
6867
tolerations:
6968
- key: cloud.google.com/gke-preemptible
7069
operator: Equal
7170
value: "true"
7271
effect: NoSchedule
7372

7473
tide:
75-
image: gcr.io/k8s-prow/tide:v20200203-cae3cccf8
74+
image: gcr.io/k8s-prow/tide:v20200427-baaf248ed
7675
tolerations:
7776
- key: cloud.google.com/gke-preemptible
7877
operator: Equal
7978
value: "true"
8079
effect: NoSchedule
8180

8281
statusreconciler:
83-
image: gcr.io/k8s-prow/status-reconciler:v20200203-cae3cccf8
82+
image: gcr.io/k8s-prow/status-reconciler:v20200427-baaf248ed
8483
replicas: 1
8584
tolerations:
8685
- key: cloud.google.com/gke-preemptible
@@ -89,15 +88,15 @@ statusreconciler:
8988
effect: NoSchedule
9089

9190
needsrebase:
92-
image: gcr.io/k8s-prow/needs-rebase:v20200203-cae3cccf8
91+
image: gcr.io/k8s-prow/needs-rebase:v20200427-baaf248ed
9392
tolerations:
9493
- key: cloud.google.com/gke-preemptible
9594
operator: Equal
9695
value: "true"
9796
effect: NoSchedule
9897

9998
branchprotector:
100-
image: gcr.io/k8s-prow/branchprotector:v20200203-cae3cccf8
99+
image: gcr.io/k8s-prow/branchprotector:v20200427-baaf248ed
101100
schedule: 12 * * * * # Every hour at 12 minutes past the hour
102101
tolerations:
103102
- key: cloud.google.com/gke-preemptible
@@ -106,7 +105,7 @@ branchprotector:
106105
effect: NoSchedule
107106

108107
crier:
109-
image: gcr.io/k8s-prow/crier:v20200203-cae3cccf8
108+
image: gcr.io/k8s-prow/crier:v20200427-baaf248ed
110109
replicas: 1
111110
tolerations:
112111
- key: cloud.google.com/gke-preemptible
@@ -115,7 +114,7 @@ crier:
115114
effect: NoSchedule
116115

117116
labelsync:
118-
image: gcr.io/k8s-prow/label_sync:v20200203-cae3cccf8
117+
image: gcr.io/k8s-prow/label_sync:v20200427-baaf248ed
119118
schedule: 0 5 * * * # Every day at 5AM
120119
tolerations:
121120
- key: cloud.google.com/gke-preemptible
@@ -126,8 +125,8 @@ labelsync:
126125
# requires tekton to work -
127126
# we will install it part of the chart in a later revision
128127
pipeline:
129-
# image: gcr.io/k8s-prow/pipeline:v20200203-cae3cccf8
130-
image: gcr.io/k8s-prow/pipeline:v20200203-cae3cccf8
128+
# image: gcr.io/k8s-prow/pipeline:v20200427-baaf248ed
129+
image: gcr.io/k8s-prow/pipeline:v20200427-baaf248ed
131130
tolerations:
132131
- key: cloud.google.com/gke-preemptible
133132
operator: Equal
@@ -152,7 +151,7 @@ pushgateway:
152151
effect: NoSchedule
153152

154153
ghproxy:
155-
image: gcr.io/k8s-prow/ghproxy:v20200203-cae3cccf8
154+
image: gcr.io/k8s-prow/ghproxy:v20200427-baaf248ed
156155
replicas: 1
157156
cache:
158157
sizeGB: 19

0 commit comments

Comments
 (0)