From 7a3a7252343afd1692bcf33398ecf6bab0d1f8f7 Mon Sep 17 00:00:00 2001 From: Chi Zhang Date: Tue, 18 Feb 2020 12:27:56 -0800 Subject: [PATCH 1/2] update images to latest and fix boskos --- .../prow/cluster/400-boskos-deployment.yaml | 2 +- config/prow/cluster/400-boskos-janitor.yaml | 2 +- config/prow/cluster/400-boskos-metrics.yaml | 2 +- config/prow/cluster/400-boskos-reaper.yaml | 2 +- config/prow/cluster/400-boskos.yaml | 36 +++++++++++++++++++ config/prow/cluster/400-crier.yaml | 2 +- config/prow/cluster/400-deck.yaml | 2 +- config/prow/cluster/400-hook.yaml | 2 +- config/prow/cluster/400-horologium.yaml | 2 +- config/prow/cluster/400-plank.yaml | 2 +- config/prow/cluster/400-sinker.yaml | 2 +- config/prow/cluster/400-tide.yaml | 2 +- config/prow/core/config.yaml | 8 ++--- config/prow/staging/config.yaml | 8 ++--- guides/{REAME.md => README.md} | 0 .../templates/prow_config.yaml | 8 ++--- 16 files changed, 59 insertions(+), 23 deletions(-) rename guides/{REAME.md => README.md} (100%) diff --git a/config/prow/cluster/400-boskos-deployment.yaml b/config/prow/cluster/400-boskos-deployment.yaml index 8550d4f6fc6..3e60ff5cce0 100644 --- a/config/prow/cluster/400-boskos-deployment.yaml +++ b/config/prow/cluster/400-boskos-deployment.yaml @@ -33,7 +33,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: boskos - image: gcr.io/k8s-prow/boskos/boskos:v20200203-a909b961a + image: gcr.io/k8s-prow/boskos/boskos:v20200212-1f7b8ac1d args: - --config=/etc/config/config - --namespace=test-pods diff --git a/config/prow/cluster/400-boskos-janitor.yaml b/config/prow/cluster/400-boskos-janitor.yaml index 7811bb42ca2..4e96be099a3 100644 --- a/config/prow/cluster/400-boskos-janitor.yaml +++ b/config/prow/cluster/400-boskos-janitor.yaml @@ -31,7 +31,7 @@ spec: terminationGracePeriodSeconds: 300 containers: - name: boskos-janitor - image: gcr.io/k8s-prow/boskos/janitor:v20200203-a909b961a + image: gcr.io/k8s-prow/boskos/janitor:v20200212-1f7b8ac1d args: - --resource-type=gke-project - -- diff --git a/config/prow/cluster/400-boskos-metrics.yaml b/config/prow/cluster/400-boskos-metrics.yaml index c31fe589855..7b3fbf02ae9 100644 --- a/config/prow/cluster/400-boskos-metrics.yaml +++ b/config/prow/cluster/400-boskos-metrics.yaml @@ -32,7 +32,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: metrics - image: gcr.io/k8s-prow/boskos/metrics:v20200121-9a9eed662 + image: gcr.io/k8s-prow/boskos/metrics:v20200212-1f7b8ac1d args: - --resource-type=gke-project ports: diff --git a/config/prow/cluster/400-boskos-reaper.yaml b/config/prow/cluster/400-boskos-reaper.yaml index 7d5a56bc171..55062d84265 100644 --- a/config/prow/cluster/400-boskos-reaper.yaml +++ b/config/prow/cluster/400-boskos-reaper.yaml @@ -31,6 +31,6 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: boskos-reaper - image: gcr.io/k8s-prow/boskos/reaper:v20200203-a909b961a + image: gcr.io/k8s-prow/boskos/reaper:v20200212-1f7b8ac1d args: - --resource-type=gke-project diff --git a/config/prow/cluster/400-boskos.yaml b/config/prow/cluster/400-boskos.yaml index 1fd4f82e735..526b9c0241e 100644 --- a/config/prow/cluster/400-boskos.yaml +++ b/config/prow/cluster/400-boskos.yaml @@ -12,6 +12,42 @@ # See the License for the specific language governing permissions and # limitations under the License. +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: dynamicresourcelifecycles.boskos.k8s.io +spec: + group: boskos.k8s.io + names: + kind: DRLCObject + listKind: DRLCObjectList + plural: dynamicresourcelifecycles + singular: dynamicresourcelifecycle + scope: Namespaced + version: v1 + versions: + - name: v1 + served: true + storage: true +--- +apiVersion: apiextensions.k8s.io/v1beta1 +kind: CustomResourceDefinition +metadata: + name: resources.boskos.k8s.io +spec: + group: boskos.k8s.io + names: + kind: ResourceObject + listKind: ResourceObjectList + plural: resources + singular: resource + scope: Namespaced + version: v1 + versions: + - name: v1 + served: true + storage: true +--- apiVersion: v1 kind: Service metadata: diff --git a/config/prow/cluster/400-crier.yaml b/config/prow/cluster/400-crier.yaml index 59c081cf477..b560fa267a8 100644 --- a/config/prow/cluster/400-crier.yaml +++ b/config/prow/cluster/400-crier.yaml @@ -29,7 +29,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: crier - image: gcr.io/k8s-prow/crier:v20200204-7e8cd997a + image: gcr.io/k8s-prow/crier:v20200212-1f7b8ac1d args: - --pubsub-workers=5 # Arbitrary number of multiplier - --report-agent=knative-build diff --git a/config/prow/cluster/400-deck.yaml b/config/prow/cluster/400-deck.yaml index bd437a11faf..491cead597e 100644 --- a/config/prow/cluster/400-deck.yaml +++ b/config/prow/cluster/400-deck.yaml @@ -37,7 +37,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: deck - image: gcr.io/k8s-prow/deck:v20200204-7e8cd997a + image: gcr.io/k8s-prow/deck:v20200212-1f7b8ac1d args: - --hook-url=http://hook:8888/plugin-help - --tide-url=http://tide/ diff --git a/config/prow/cluster/400-hook.yaml b/config/prow/cluster/400-hook.yaml index 720a7199388..67354f0b4e8 100644 --- a/config/prow/cluster/400-hook.yaml +++ b/config/prow/cluster/400-hook.yaml @@ -38,7 +38,7 @@ spec: terminationGracePeriodSeconds: 180 containers: - name: hook - image: gcr.io/k8s-prow/hook:v20200204-7e8cd997a + image: gcr.io/k8s-prow/hook:v20200212-1f7b8ac1d imagePullPolicy: Always args: - --dry-run=false diff --git a/config/prow/cluster/400-horologium.yaml b/config/prow/cluster/400-horologium.yaml index 5ffa79a7742..e350198fa2d 100644 --- a/config/prow/cluster/400-horologium.yaml +++ b/config/prow/cluster/400-horologium.yaml @@ -29,7 +29,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: horologium - image: gcr.io/k8s-prow/horologium:v20200204-7e8cd997a + image: gcr.io/k8s-prow/horologium:v20200212-1f7b8ac1d args: - --config-path=/etc/config/config.yaml - --job-config-path=/etc/job-config diff --git a/config/prow/cluster/400-plank.yaml b/config/prow/cluster/400-plank.yaml index e4b952bf585..a86f5ebb376 100644 --- a/config/prow/cluster/400-plank.yaml +++ b/config/prow/cluster/400-plank.yaml @@ -29,7 +29,7 @@ spec: containers: - name: plank # Update plank utility_images versions in config.yaml when updating this version - image: gcr.io/k8s-prow/plank:v20200204-7e8cd997a + image: gcr.io/k8s-prow/plank:v20200212-1f7b8ac1d args: - --config-path=/etc/config/config.yaml - --job-config-path=/etc/job-config diff --git a/config/prow/cluster/400-sinker.yaml b/config/prow/cluster/400-sinker.yaml index bc14f61ab6d..cccead83654 100644 --- a/config/prow/cluster/400-sinker.yaml +++ b/config/prow/cluster/400-sinker.yaml @@ -28,7 +28,7 @@ spec: serviceAccountName: "sinker" containers: - name: sinker - image: gcr.io/k8s-prow/sinker:v20200204-7e8cd997a + image: gcr.io/k8s-prow/sinker:v20200212-1f7b8ac1d args: - --config-path=/etc/config/config.yaml - --job-config-path=/etc/job-config diff --git a/config/prow/cluster/400-tide.yaml b/config/prow/cluster/400-tide.yaml index 6ed2c7502cc..9eee2c156fc 100644 --- a/config/prow/cluster/400-tide.yaml +++ b/config/prow/cluster/400-tide.yaml @@ -41,7 +41,7 @@ spec: serviceAccountName: "tide" containers: - name: tide - image: gcr.io/k8s-prow/tide:v20200204-7e8cd997a + image: gcr.io/k8s-prow/tide:v20200212-1f7b8ac1d args: - --config-path=/etc/config/config.yaml - --job-config-path=/etc/job-config diff --git a/config/prow/core/config.yaml b/config/prow/core/config.yaml index 06a21385850..d7f8b6a021c 100644 --- a/config/prow/core/config.yaml +++ b/config/prow/core/config.yaml @@ -29,10 +29,10 @@ plank: grace_period: 15000000000 # 15s utility_images: # Update these versions when updating plank version in cluster.yaml - clonerefs: "gcr.io/k8s-prow/clonerefs:v20200204-7e8cd997a" - initupload: "gcr.io/k8s-prow/initupload:v20200204-7e8cd997a" - entrypoint: "gcr.io/k8s-prow/entrypoint:v20200204-7e8cd997a" - sidecar: "gcr.io/k8s-prow/sidecar:v20200204-7e8cd997a" + clonerefs: "gcr.io/k8s-prow/clonerefs:v20200212-1f7b8ac1d" + initupload: "gcr.io/k8s-prow/initupload:v20200212-1f7b8ac1d" + entrypoint: "gcr.io/k8s-prow/entrypoint:v20200212-1f7b8ac1d" + sidecar: "gcr.io/k8s-prow/sidecar:v20200212-1f7b8ac1d" gcs_configuration: bucket: "knative-prow" path_strategy: "explicit" diff --git a/config/prow/staging/config.yaml b/config/prow/staging/config.yaml index 2d627ff36b7..193fa1e18a8 100644 --- a/config/prow/staging/config.yaml +++ b/config/prow/staging/config.yaml @@ -29,10 +29,10 @@ plank: grace_period: 15000000000 # 15s utility_images: # Update these versions when updating plank version in cluster.yaml - clonerefs: "gcr.io/k8s-prow/clonerefs:v20200204-7e8cd997a" - initupload: "gcr.io/k8s-prow/initupload:v20200204-7e8cd997a" - entrypoint: "gcr.io/k8s-prow/entrypoint:v20200204-7e8cd997a" - sidecar: "gcr.io/k8s-prow/sidecar:v20200204-7e8cd997a" + clonerefs: "gcr.io/k8s-prow/clonerefs:v20200212-1f7b8ac1d" + initupload: "gcr.io/k8s-prow/initupload:v20200212-1f7b8ac1d" + entrypoint: "gcr.io/k8s-prow/entrypoint:v20200212-1f7b8ac1d" + sidecar: "gcr.io/k8s-prow/sidecar:v20200212-1f7b8ac1d" gcs_configuration: bucket: "knative-prow-staging" path_strategy: "explicit" diff --git a/guides/REAME.md b/guides/README.md similarity index 100% rename from guides/REAME.md rename to guides/README.md diff --git a/tools/config-generator/templates/prow_config.yaml b/tools/config-generator/templates/prow_config.yaml index 1ed959d6685..c2bbcc0703c 100644 --- a/tools/config-generator/templates/prow_config.yaml +++ b/tools/config-generator/templates/prow_config.yaml @@ -9,10 +9,10 @@ plank: grace_period: 15000000000 # 15s utility_images: # Update these versions when updating plank version in cluster.yaml - clonerefs: "gcr.io/k8s-prow/clonerefs:v20200204-7e8cd997a" - initupload: "gcr.io/k8s-prow/initupload:v20200204-7e8cd997a" - entrypoint: "gcr.io/k8s-prow/entrypoint:v20200204-7e8cd997a" - sidecar: "gcr.io/k8s-prow/sidecar:v20200204-7e8cd997a" + clonerefs: "gcr.io/k8s-prow/clonerefs:v20200212-1f7b8ac1d" + initupload: "gcr.io/k8s-prow/initupload:v20200212-1f7b8ac1d" + entrypoint: "gcr.io/k8s-prow/entrypoint:v20200212-1f7b8ac1d" + sidecar: "gcr.io/k8s-prow/sidecar:v20200212-1f7b8ac1d" gcs_configuration: bucket: "[[.GcsBucket]]" path_strategy: "explicit" From c59c8860ea84530429b10ab6c474f9e913222ba6 Mon Sep 17 00:00:00 2001 From: Chi Zhang Date: Tue, 18 Feb 2020 14:00:47 -0800 Subject: [PATCH 2/2] use the latest boskos image --- config/prow/cluster/400-boskos-deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/prow/cluster/400-boskos-deployment.yaml b/config/prow/cluster/400-boskos-deployment.yaml index 3e60ff5cce0..93ecacc8cbc 100644 --- a/config/prow/cluster/400-boskos-deployment.yaml +++ b/config/prow/cluster/400-boskos-deployment.yaml @@ -33,7 +33,7 @@ spec: terminationGracePeriodSeconds: 30 containers: - name: boskos - image: gcr.io/k8s-prow/boskos/boskos:v20200212-1f7b8ac1d + image: gcr.io/k8s-prow/boskos/boskos:v20200217-8ab6e0b2c args: - --config=/etc/config/config - --namespace=test-pods