Merge pull request #1594 from SaschaSchwarze0/sascha-v0.13-updates

[release-v0.13] Update build strategy tools, update golang.org/x/net
shipwright-io · May 6, 2024 · dc66f4c · dc66f4c
2 parents 570f276 + 181cc4e
commit dc66f4c
Show file tree

Hide file tree

Showing 70 changed files with 1,485 additions and 325 deletions.
diff --git a/docs/buildstrategies.md b/docs/buildstrategies.md
@@ -832,7 +832,7 @@ If we will apply the following resources:
 
   ```yaml
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.3
       workingDir: $(params.shp-source-root)
       securityContext:
         privileged: true
@@ -854,7 +854,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.0
+      image: quay.io/containers/buildah:v1.35.3
       securityContext:
         privileged: true
       command:

diff --git a/go.mod b/go.mod
@@ -97,14 +97,14 @@ require (
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
-	golang.org/x/crypto v0.18.0 // indirect
+	golang.org/x/crypto v0.22.0 // indirect
 	golang.org/x/exp v0.0.0-20230307190834-24139beb5833 // indirect
 	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.20.0 // indirect
+	golang.org/x/net v0.24.0 // indirect
 	golang.org/x/oauth2 v0.16.0 // indirect
 	golang.org/x/sync v0.6.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/term v0.16.0 // indirect
+	golang.org/x/sys v0.19.0 // indirect
+	golang.org/x/term v0.19.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/tools v0.17.0 // indirect

diff --git a/go.sum b/go.sum
@@ -442,8 +442,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
-golang.org/x/crypto v0.18.0 h1:PGVlW0xEltQnzFZ55hkuX5+KLyrMYhHld1YHO4AKcdc=
-golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
+golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30=
+golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -521,8 +521,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
-golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
+golang.org/x/net v0.24.0 h1:1PcaxkF854Fu3+lvBIx5SYn9wRlBzzcnHZSiaFFAb0w=
+golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -595,15 +595,15 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
+golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
-golang.org/x/term v0.16.0 h1:m+B6fahuftsE9qjo0VWp2FW0mB3MTJvR0BaMQrq0pmE=
-golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
+golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q=
+golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

diff --git 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.0"))
+				Expect(got.Steps[1].Image).To(Equal("quay.io/containers/buildah:v1.35.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
@@ -6,7 +6,7 @@ metadata:
 spec:
   buildSteps:
     - name: build
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.3
       workingDir: $(params.shp-source-root)
       securityContext:
         privileged: true

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
@@ -6,7 +6,7 @@ metadata:
 spec:
   buildSteps:
     - name: build-and-push
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.3
       workingDir: $(params.shp-source-root)
       securityContext:
         capabilities:

diff --git a/samples/v1alpha1/buildstrategy/kaniko/buildstrategy_kaniko-trivy_cr.yaml b/samples/v1alpha1/buildstrategy/kaniko/buildstrategy_kaniko-trivy_cr.yaml
@@ -58,7 +58,7 @@ spec:
           cpu: 250m
           memory: 65Mi
     - name: trivy-scan
-      image: docker.io/aquasec/trivy:0.50.0
+      image: docker.io/aquasec/trivy:0.51.1
       command:
         - trivy
       args:

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
@@ -21,7 +21,7 @@ spec:
         - name: s2i
           mountPath: /s2i
     - name: buildah
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.3
       workingDir: /s2i
       securityContext:
         privileged: true

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
@@ -6,7 +6,7 @@ metadata:
 spec:
   steps:
     - name: build
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.3
       workingDir: $(params.shp-source-root)
       securityContext:
         privileged: true

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
@@ -6,7 +6,7 @@ metadata:
 spec:
   steps:
     - name: build-and-push
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.3
       workingDir: $(params.shp-source-root)
       securityContext:
         capabilities:

diff --git a/samples/v1beta1/buildstrategy/kaniko/buildstrategy_kaniko-trivy_cr.yaml b/samples/v1beta1/buildstrategy/kaniko/buildstrategy_kaniko-trivy_cr.yaml
@@ -58,7 +58,7 @@ spec:
           cpu: 250m
           memory: 65Mi
     - name: trivy-scan
-      image: docker.io/aquasec/trivy:0.50.0
+      image: docker.io/aquasec/trivy:0.51.1
       command:
         - trivy
       args:

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
@@ -23,7 +23,7 @@ spec:
         - name: s2i
           mountPath: /s2i
     - name: buildah
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.3
       workingDir: /s2i
       securityContext:
         capabilities:

diff --git 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.0
+      image: quay.io/containers/buildah:v1.35.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.35.0
+      image: quay.io/containers/buildah:v1.35.3
       securityContext:
         capabilities:
           add: ["SETFCAP"]
@@ -83,7 +83,7 @@ spec:
       default: "vfs"
   buildSteps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.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.35.0
+      image: quay.io/containers/buildah:v1.35.3
       securityContext:
         capabilities:
           add: ["SETFCAP"]

diff --git 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.0
+      image: quay.io/containers/buildah:v1.35.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.35.0
+      image: quay.io/containers/buildah:v1.35.3
       securityContext:
         capabilities:
           add: ["SETFCAP"]
@@ -91,7 +91,7 @@ spec:
       default: "vfs"
   buildSteps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.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.35.0
+      image: quay.io/containers/buildah:v1.35.3
       securityContext:
         capabilities:
           add: ["SETFCAP"]

diff --git 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.0
+      image: quay.io/containers/buildah:v1.35.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.35.0
+      image: quay.io/containers/buildah:v1.35.3
       securityContext:
         privileged: true
       command:
@@ -81,7 +81,7 @@ spec:
       emptyDir: {}
   steps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.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.35.0
+      image: quay.io/containers/buildah:v1.35.3
       securityContext:
         privileged: true
       command:

diff --git 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.0
+      image: quay.io/containers/buildah:v1.35.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.35.0
+      image: quay.io/containers/buildah:v1.35.3
       securityContext:
         privileged: true
       command:
@@ -77,7 +77,7 @@ spec:
         emptyDir: {}
   steps:
     - name: buildah-bud
-      image: quay.io/containers/buildah:v1.35.0
+      image: quay.io/containers/buildah:v1.35.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.35.0
+      image: quay.io/containers/buildah:v1.35.3
       securityContext:
         privileged: true
       command: