feat: update prow to latest version (#197)

* feat: update prow to latest version Signed-off-by: Georgi Ivanov <[email protected]> * feat: update cronjob api version and fix hook ingress Signed-off-by: Georgi Ivanov <[email protected]> Signed-off-by: Georgi Ivanov <[email protected]>
ouzi-dev · Aug 15, 2022 · ff24643 · ff24643
1 parent 5a9542a
commit ff24643
Show file tree

Hide file tree

Showing 21 changed files with 847 additions and 467 deletions.
diff --git a/prow/Chart.yaml b/prow/Chart.yaml
@@ -17,4 +17,4 @@ type: application
 version: 0.0.0
 
 # Uses the Prow version
-appVersion: v20200610-6c96a0a6ed
+appVersion: v20220810-4ab15cddef
diff --git a/prow/crds/00-coreos.servicemonitor.yaml b/prow/crds/00-coreos.servicemonitor.yaml
diff --git a/prow/crds/00-prowjob.yaml b/prow/crds/00-prowjob.yaml
@@ -1,87 +1,96 @@
 ---
-apiVersion: apiextensions.k8s.io/v1beta1
+apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: prowjobs.prow.k8s.io
+  annotations:
+    "api-approved.kubernetes.io": "https://github.com/kubernetes/test-infra/pull/8669"
 spec:
   group: prow.k8s.io
-  version: v1
   names:
     kind: ProwJob
     singular: prowjob
     plural: prowjobs
   scope: Namespaced
-  validation:
-    openAPIV3Schema:
-      properties:
-        spec:
+  versions:
+    - name: v1
+      served: true
+      storage: true
+      schema:
+        openAPIV3Schema:
+          type: object
           properties:
-            max_concurrency:
-              type: integer
-              minimum: 0
-            type:
-              type: string
-              enum:
-              - "presubmit"
-              - "postsubmit"
-              - "periodic"
-              - "batch"
-        status:
-          properties:
-            state:
-              type: string
-              enum:
-              - "triggered"
-              - "pending"
-              - "success"
-              - "failure"
-              - "aborted"
-              - "error"
-          anyOf:
-          - not:
+            spec:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
+              properties:
+                max_concurrency:
+                  type: integer
+                  minimum: 0
+                type:
+                  type: string
+                  enum:
+                    - "presubmit"
+                    - "postsubmit"
+                    - "periodic"
+                    - "batch"
+            status:
+              type: object
+              x-kubernetes-preserve-unknown-fields: true
               properties:
                 state:
                   type: string
                   enum:
-                  - "success"
-                  - "failure"
-                  - "error"
-          - required:
-            - completionTime
-  additionalPrinterColumns:
-  - name: Job
-    type: string
-    description: The name of the job being run.
-    JSONPath: .spec.job
-  - name: BuildId
-    type: string
-    description: The ID of the job being run.
-    JSONPath: .status.build_id
-  - name: Type
-    type: string
-    description: The type of job being run.
-    JSONPath: .spec.type
-  - name: Org
-    type: string
-    description: The org for which the job is running.
-    JSONPath: .spec.refs.org
-  - name: Repo
-    type: string
-    description: The repo for which the job is running.
-    JSONPath: .spec.refs.repo
-  - name: Pulls
-    type: string
-    description: The pulls for which the job is running.
-    JSONPath: ".spec.refs.pulls[*].number"
-  - name: StartTime
-    type: date
-    description: When the job started running.
-    JSONPath: .status.startTime
-  - name: CompletionTime
-    type: date
-    description: When the job finished running.
-    JSONPath: .status.completionTime
-  - name: State
-    description: The state of the job.
-    type: string
-    JSONPath: .status.state
+                    - "triggered"
+                    - "pending"
+                    - "success"
+                    - "failure"
+                    - "aborted"
+                    - "error"
+              anyOf:
+                - not:
+                    properties:
+                      state:
+                        enum:
+                          - "success"
+                          - "failure"
+                          - "error"
+                - required:
+                    - completionTime
+      additionalPrinterColumns:
+        - name: Job
+          type: string
+          description: The name of the job being run.
+          jsonPath: .spec.job
+        - name: BuildId
+          type: string
+          description: The ID of the job being run.
+          jsonPath: .status.build_id
+        - name: Type
+          type: string
+          description: The type of job being run.
+          jsonPath: .spec.type
+        - name: Org
+          type: string
+          description: The org for which the job is running.
+          jsonPath: .spec.refs.org
+        - name: Repo
+          type: string
+          description: The repo for which the job is running.
+          jsonPath: .spec.refs.repo
+        - name: Pulls
+          type: string
+          description: The pulls for which the job is running.
+          jsonPath: ".spec.refs.pulls[*].number"
+        - name: StartTime
+          type: date
+          description: When the job started running.
+          jsonPath: .status.startTime
+        - name: CompletionTime
+          type: date
+          description: When the job finished running.
+          jsonPath: .status.completionTime
+        - name: State
+          description: The state of the job.
+          type: string
+          jsonPath: .status.state
diff --git a/prow/templates/branchprotector-cronjob.yaml b/prow/templates/branchprotector-cronjob.yaml
@@ -1,4 +1,4 @@
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: branchprotector
@@ -25,8 +25,7 @@ spec:
             - --github-endpoint=http://ghproxy
             - --github-endpoint=https://api.github.com
             - --github-token-path=/etc/github/oauth
-            - --confirm=true
-            - --github-endpoint=http://ghproxy
+            - --confirm
             volumeMounts:
             - name: oauth
               mountPath: /etc/github

diff --git a/prow/templates/config-configmap.yaml b/prow/templates/config-configmap.yaml
@@ -1,6 +1,5 @@
 ---
 apiVersion: v1
-data:
 kind: ConfigMap
 metadata:
   name: config

diff --git a/prow/templates/crier-rbac.yaml b/prow/templates/crier-rbac.yaml
@@ -34,7 +34,7 @@ rules:
     - "list"
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: crier-namespaced
 roleRef:
@@ -46,7 +46,7 @@ subjects:
   name: "crier"
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: crier-namespaced
   namespace: {{ .Values.podNamespace }}

diff --git a/prow/templates/deck-ingress.yaml b/prow/templates/deck-ingress.yaml
diff --git a/prow/templates/deck-rbac.yaml b/prow/templates/deck-rbac.yaml
@@ -4,7 +4,7 @@ metadata:
   name: "deck"
 ---
 kind: Role
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: "deck"
 rules:
@@ -20,7 +20,7 @@ rules:
       - create
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: "deck"
 roleRef:
@@ -32,7 +32,7 @@ subjects:
   name: "deck"
 ---
 kind: Role
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   namespace: {{ .Values.podNamespace }}
   name: "deck"
@@ -45,7 +45,7 @@ rules:
       - get
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   namespace: {{ .Values.podNamespace }}
   name: "deck"

diff --git a/prow/templates/hook-ingress.yaml b/prow/templates/hook-ingress.yaml
diff --git a/prow/templates/hook-rbac.yaml b/prow/templates/hook-rbac.yaml
@@ -4,7 +4,7 @@ metadata:
   name: "hook"
 ---
 kind: Role
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: "hook"
 rules:
@@ -27,7 +27,7 @@ rules:
       - update
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: "hook"
 roleRef:

diff --git a/prow/templates/horologium-rbac.yaml b/prow/templates/horologium-rbac.yaml
@@ -4,7 +4,7 @@ metadata:
   name: "horologium"
 ---
 kind: Role
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: "horologium"
 rules:
@@ -15,9 +15,10 @@ rules:
     verbs:
       - create
       - list
+      - watch
 ---
 kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: "horologium"
 roleRef:

diff --git a/prow/templates/ing_ingress.yaml b/prow/templates/ing_ingress.yaml
@@ -0,0 +1,58 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: deck
+spec:
+  ingressClassName: {{ .Values.ingress.ingressClass }}
+  rules:
+    - host: {{ quote .Values.ingress.host }}
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: deck
+                port:
+                  number: 80
+          - path: /metrics
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: pushgateway-external
+                port:
+                  number: 80
+  tls:
+    - hosts:
+        - {{ quote .Values.ingress.host }}
+      secretName: {{ quote .Values.ingress.host }}
+---
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  {{- with .Values.ingress.hookAnnotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  name: hook
+spec:
+  ingressClassName: {{ .Values.ingress.ingressClass }}
+  rules:
+    - host: {{ quote .Values.ingress.host }}
+      http:
+        paths:
+          - path: /hook
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: hook
+                port:
+                  number: 8888
+  tls:
+    - hosts:
+        - {{ quote .Values.ingress.host }}
+      secretName: {{ quote .Values.ingress.host }}