From 546fc22783de66e7dcd7b0d70e2488068d3ffb2d Mon Sep 17 00:00:00 2001 From: openshift-merge-robot <30189218+openshift-merge-robot@users.noreply.github.com> Date: Fri, 28 Jun 2024 00:28:23 +0000 Subject: [PATCH] Bump quay.io/containers/buildah from 1.35.4 to 1.36.0 --- docs/buildstrategies.md | 4 ++-- pkg/reconciler/buildrun/resources/taskrun_test.go | 2 +- .../buildstrategy_buildah_shipwright_managed_push_cr.yaml | 2 +- .../buildstrategy_buildah_strategy_managed_push_cr.yaml | 2 +- .../buildstrategy_source-to-image-redhat_cr.yaml | 2 +- .../buildstrategy_buildah_shipwright_managed_push_cr.yaml | 2 +- .../buildstrategy_buildah_strategy_managed_push_cr.yaml | 2 +- .../buildstrategy_source-to-image-redhat_cr.yaml | 2 +- test/v1alpha1_samples/buildstrategy_samples.go | 8 ++++---- test/v1alpha1_samples/clusterbuildstrategy_samples.go | 8 ++++---- test/v1beta1_samples/buildstrategy_samples.go | 8 ++++---- test/v1beta1_samples/clusterbuildstrategy_samples.go | 8 ++++---- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/buildstrategies.md b/docs/buildstrategies.md index 78baaf162d..31eaa8db86 100644 --- a/docs/buildstrategies.md +++ b/docs/buildstrategies.md @@ -819,7 +819,7 @@ If we will apply the following resources: ```yaml - name: buildah-bud - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 workingDir: $(params.shp-source-root) securityContext: privileged: true @@ -841,7 +841,7 @@ If we will apply the following resources: - name: buildah-images mountPath: /var/lib/containers/storage - name: buildah-push - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 securityContext: privileged: true command: diff --git a/pkg/reconciler/buildrun/resources/taskrun_test.go b/pkg/reconciler/buildrun/resources/taskrun_test.go index b7cf5bb9b4..b142d188d1 100644 --- a/pkg/reconciler/buildrun/resources/taskrun_test.go +++ b/pkg/reconciler/buildrun/resources/taskrun_test.go @@ -98,7 +98,7 @@ var _ = Describe("GenerateTaskrun", func() { }) It("should ensure IMAGE is replaced by builder image when needed.", func() { - Expect(got.Steps[1].Image).To(Equal("quay.io/containers/buildah:v1.35.4")) + Expect(got.Steps[1].Image).To(Equal("quay.io/containers/buildah:v1.36.0")) }) It("should ensure ImagePullPolicy can be set by the build strategy author.", func() { diff --git a/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml b/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml index 12bdc0cd64..342f283b2c 100644 --- a/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml +++ b/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml @@ -6,7 +6,7 @@ metadata: spec: buildSteps: - name: build - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 imagePullPolicy: Always workingDir: $(params.shp-source-root) securityContext: diff --git a/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml b/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml index a848f10659..e18751665e 100644 --- a/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml +++ b/samples/v1alpha1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml @@ -6,7 +6,7 @@ metadata: spec: buildSteps: - name: build-and-push - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 imagePullPolicy: Always workingDir: $(params.shp-source-root) securityContext: diff --git a/samples/v1alpha1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml b/samples/v1alpha1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml index 67cac9b7f3..189fae8510 100644 --- a/samples/v1alpha1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml +++ b/samples/v1alpha1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml @@ -21,7 +21,7 @@ spec: - name: s2i mountPath: /s2i - name: buildah - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 imagePullPolicy: Always workingDir: /s2i securityContext: diff --git a/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml b/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml index 6e31cf3b61..78b89e5ba6 100644 --- a/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml +++ b/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_shipwright_managed_push_cr.yaml @@ -6,7 +6,7 @@ metadata: spec: steps: - name: build - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 imagePullPolicy: Always workingDir: $(params.shp-source-root) securityContext: diff --git a/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml b/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml index 9d37fc3384..52c061aec1 100644 --- a/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml +++ b/samples/v1beta1/buildstrategy/buildah/buildstrategy_buildah_strategy_managed_push_cr.yaml @@ -6,7 +6,7 @@ metadata: spec: steps: - name: build-and-push - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 imagePullPolicy: Always workingDir: $(params.shp-source-root) securityContext: diff --git a/samples/v1beta1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml b/samples/v1beta1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml index 4631936c6c..0b50957734 100644 --- a/samples/v1beta1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml +++ b/samples/v1beta1/buildstrategy/source-to-image/buildstrategy_source-to-image-redhat_cr.yaml @@ -23,7 +23,7 @@ spec: - name: s2i mountPath: /s2i - name: buildah - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 imagePullPolicy: Always workingDir: /s2i securityContext: diff --git a/test/v1alpha1_samples/buildstrategy_samples.go b/test/v1alpha1_samples/buildstrategy_samples.go index 315a874dd5..1fd8943083 100644 --- a/test/v1alpha1_samples/buildstrategy_samples.go +++ b/test/v1alpha1_samples/buildstrategy_samples.go @@ -18,7 +18,7 @@ spec: emptyDir: {} buildSteps: - name: buildah-bud - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 workingDir: $(params.shp-source-root) securityContext: capabilities: @@ -41,7 +41,7 @@ spec: - name: buildah-images mountPath: /var/lib/containers/storage - name: buildah-push - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 securityContext: capabilities: add: ["SETFCAP"] @@ -83,7 +83,7 @@ spec: default: "vfs" buildSteps: - name: buildah-bud - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 workingDir: $(params.shp-source-root) securityContext: capabilities: @@ -114,7 +114,7 @@ spec: fieldRef: fieldPath: "my-fieldpath" - name: buildah-push - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 securityContext: capabilities: add: ["SETFCAP"] diff --git a/test/v1alpha1_samples/clusterbuildstrategy_samples.go b/test/v1alpha1_samples/clusterbuildstrategy_samples.go index ecb8e7bf6e..90bcb71932 100644 --- a/test/v1alpha1_samples/clusterbuildstrategy_samples.go +++ b/test/v1alpha1_samples/clusterbuildstrategy_samples.go @@ -24,7 +24,7 @@ spec: default: "vfs" buildSteps: - name: buildah-bud - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 workingDir: $(params.shp-source-root) securityContext: capabilities: @@ -48,7 +48,7 @@ spec: - name: buildah-images mountPath: /var/lib/containers/storage - name: buildah-push - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 securityContext: capabilities: add: ["SETFCAP"] @@ -91,7 +91,7 @@ spec: default: "vfs" buildSteps: - name: buildah-bud - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 workingDir: $(params.shp-source-root) securityContext: capabilities: @@ -115,7 +115,7 @@ spec: - name: buildah-images mountPath: /var/lib/containers/storage - name: buildah-push - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 securityContext: capabilities: add: ["SETFCAP"] diff --git a/test/v1beta1_samples/buildstrategy_samples.go b/test/v1beta1_samples/buildstrategy_samples.go index ae9ab080d8..a8c634ef11 100644 --- a/test/v1beta1_samples/buildstrategy_samples.go +++ b/test/v1beta1_samples/buildstrategy_samples.go @@ -18,7 +18,7 @@ spec: emptyDir: {} steps: - name: buildah-bud - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 workingDir: $(params.shp-source-root) securityContext: privileged: true @@ -40,7 +40,7 @@ spec: - name: buildah-images mountPath: /var/lib/containers/storage - name: buildah-push - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 securityContext: privileged: true command: @@ -81,7 +81,7 @@ spec: emptyDir: {} steps: - name: buildah-bud - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 workingDir: $(params.shp-source-root) securityContext: privileged: true @@ -110,7 +110,7 @@ spec: fieldRef: fieldPath: "my-fieldpath" - name: buildah-push - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 securityContext: privileged: true command: diff --git a/test/v1beta1_samples/clusterbuildstrategy_samples.go b/test/v1beta1_samples/clusterbuildstrategy_samples.go index 8a107d7d2a..b532153394 100644 --- a/test/v1beta1_samples/clusterbuildstrategy_samples.go +++ b/test/v1beta1_samples/clusterbuildstrategy_samples.go @@ -19,7 +19,7 @@ spec: emptyDir: {} steps: - name: buildah-bud - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 workingDir: $(params.shp-source-root) securityContext: privileged: true @@ -41,7 +41,7 @@ spec: - name: buildah-images mountPath: /var/lib/containers/storage - name: buildah-push - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 securityContext: privileged: true command: @@ -77,7 +77,7 @@ spec: emptyDir: {} steps: - name: buildah-bud - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 workingDir: $(params.shp-source-root) securityContext: privileged: true @@ -99,7 +99,7 @@ spec: - name: buildah-images mountPath: /var/lib/containers/storage - name: buildah-push - image: quay.io/containers/buildah:v1.35.4 + image: quay.io/containers/buildah:v1.36.0 securityContext: privileged: true command: