From 34635ab02c466612d32332b82ccc9e0da2915d25 Mon Sep 17 00:00:00 2001 From: openshift-merge-robot <30189218+openshift-merge-robot@users.noreply.github.com> Date: Thu, 17 Oct 2024 00:00:46 +0000 Subject: [PATCH] Bump quay.io/containers/buildah from 1.37.1 to 1.37.3 --- 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_multiarch_native_buildah_cr.yaml | 4 ++-- .../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 ++++---- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/docs/buildstrategies.md b/docs/buildstrategies.md index a5dea4803..f2125773a 100644 --- a/docs/buildstrategies.md +++ b/docs/buildstrategies.md @@ -927,7 +927,7 @@ If we apply the following resources: ```yaml - name: buildah-bud - image: quay.io/containers/buildah:v1.37.1 + image: quay.io/containers/buildah:v1.37.3 workingDir: $(params.shp-source-root) securityContext: privileged: true @@ -949,7 +949,7 @@ If we apply the following resources: - name: buildah-images mountPath: /var/lib/containers/storage - name: buildah-push - image: quay.io/containers/buildah:v1.37.1 + image: quay.io/containers/buildah:v1.37.3 securityContext: privileged: true command: diff --git a/pkg/reconciler/buildrun/resources/taskrun_test.go b/pkg/reconciler/buildrun/resources/taskrun_test.go index bf0709377..e832ab594 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.37.1")) + Expect(got.Steps[1].Image).To(Equal("quay.io/containers/buildah:v1.37.3")) }) 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 58cd07d53..414be9368 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.37.1 + image: quay.io/containers/buildah:v1.37.3 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 c6685d683..4e710899c 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.37.1 + image: quay.io/containers/buildah:v1.37.3 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 534f3a12c..4181e252b 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.37.1 + image: quay.io/containers/buildah:v1.37.3 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 decb000df..af11dad83 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.37.1 + image: quay.io/containers/buildah:v1.37.3 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 6dfcc2c5c..ef7a37d82 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.37.1 + image: quay.io/containers/buildah:v1.37.3 imagePullPolicy: Always workingDir: $(params.shp-source-root) securityContext: diff --git a/samples/v1beta1/buildstrategy/multiarch-native-buildah/buildstrategy_multiarch_native_buildah_cr.yaml b/samples/v1beta1/buildstrategy/multiarch-native-buildah/buildstrategy_multiarch_native_buildah_cr.yaml index c1c19afa9..df8bd2bef 100644 --- a/samples/v1beta1/buildstrategy/multiarch-native-buildah/buildstrategy_multiarch_native_buildah_cr.yaml +++ b/samples/v1beta1/buildstrategy/multiarch-native-buildah/buildstrategy_multiarch_native_buildah_cr.yaml @@ -194,7 +194,7 @@ spec: restartPolicy: Never containers: - name: build - image: quay.io/containers/buildah:v1.37.1 + image: quay.io/containers/buildah:v1.37.3 volumeMounts: - mountPath: /var/workdir name: workdir @@ -412,7 +412,7 @@ spec: - --architectures - $(params.architectures[*]) - name: package-manifest-list-and-push - image: quay.io/containers/buildah:v1.37.1 + image: quay.io/containers/buildah:v1.37.3 securityContext: privileged: true workingDir: /var/oci-archive-storage 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 880ac72fc..43ae7b8c0 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.37.1 + image: quay.io/containers/buildah:v1.37.3 imagePullPolicy: Always workingDir: /s2i securityContext: diff --git a/test/v1alpha1_samples/buildstrategy_samples.go b/test/v1alpha1_samples/buildstrategy_samples.go index 1da8b8406..3c73f18a9 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.37.1 + image: quay.io/containers/buildah:v1.37.3 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.37.1 + image: quay.io/containers/buildah:v1.37.3 securityContext: capabilities: add: ["SETFCAP"] @@ -83,7 +83,7 @@ spec: default: "vfs" buildSteps: - name: buildah-bud - image: quay.io/containers/buildah:v1.37.1 + image: quay.io/containers/buildah:v1.37.3 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.37.1 + image: quay.io/containers/buildah:v1.37.3 securityContext: capabilities: add: ["SETFCAP"] diff --git a/test/v1alpha1_samples/clusterbuildstrategy_samples.go b/test/v1alpha1_samples/clusterbuildstrategy_samples.go index d4ae6015c..b9071c383 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.37.1 + image: quay.io/containers/buildah:v1.37.3 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.37.1 + image: quay.io/containers/buildah:v1.37.3 securityContext: capabilities: add: ["SETFCAP"] @@ -91,7 +91,7 @@ spec: default: "vfs" buildSteps: - name: buildah-bud - image: quay.io/containers/buildah:v1.37.1 + image: quay.io/containers/buildah:v1.37.3 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.37.1 + image: quay.io/containers/buildah:v1.37.3 securityContext: capabilities: add: ["SETFCAP"] diff --git a/test/v1beta1_samples/buildstrategy_samples.go b/test/v1beta1_samples/buildstrategy_samples.go index 534e0be4b..fdde35b4b 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.37.1 + image: quay.io/containers/buildah:v1.37.3 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.37.1 + image: quay.io/containers/buildah:v1.37.3 securityContext: privileged: true command: @@ -81,7 +81,7 @@ spec: emptyDir: {} steps: - name: buildah-bud - image: quay.io/containers/buildah:v1.37.1 + image: quay.io/containers/buildah:v1.37.3 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.37.1 + image: quay.io/containers/buildah:v1.37.3 securityContext: privileged: true command: diff --git a/test/v1beta1_samples/clusterbuildstrategy_samples.go b/test/v1beta1_samples/clusterbuildstrategy_samples.go index b7024ed4f..32afe8968 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.37.1 + image: quay.io/containers/buildah:v1.37.3 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.37.1 + image: quay.io/containers/buildah:v1.37.3 securityContext: privileged: true command: @@ -77,7 +77,7 @@ spec: emptyDir: {} steps: - name: buildah-bud - image: quay.io/containers/buildah:v1.37.1 + image: quay.io/containers/buildah:v1.37.3 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.37.1 + image: quay.io/containers/buildah:v1.37.3 securityContext: privileged: true command: