Merge pull request #614 from k4leung4/bump-cosign-d

bump cosign to v2.0.0 release
sigstore · Feb 25, 2023 · 4485e55 · 4485e55
2 parents 2ce2548 + 5a86de9
commit 4485e55
Show file tree

Hide file tree

Showing 11 changed files with 12 additions and 15 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -37,7 +37,7 @@ jobs:
 
       - uses: sigstore/cosign-installer@4079ad3567a89f68395480299c77e40170430341
         with:
-          cosign-release: 'v2.0.0-rc.3'
+          cosign-release: 'v2.0.0'
 
       - uses: actions/setup-go@6edd4406fa81c3da01a34fa6f6343087c207a568 # v3.5.0
         with:

diff --git a/.github/workflows/kind-cluster-image-policy-no-tuf.yaml b/.github/workflows/kind-cluster-image-policy-no-tuf.yaml
@@ -66,7 +66,7 @@ jobs:
 
     - uses: sigstore/cosign-installer@4079ad3567a89f68395480299c77e40170430341
       with:
-        cosign-release: 'v2.0.0-rc.3'
+        cosign-release: 'v2.0.0'
 
     - name: Install cluster + sigstore
       uses: sigstore/scaffolding/actions/setup@main

diff --git a/.github/workflows/kind-cluster-image-policy-resync-period.yaml b/.github/workflows/kind-cluster-image-policy-resync-period.yaml
@@ -66,7 +66,7 @@ jobs:
 
     - uses: sigstore/cosign-installer@4079ad3567a89f68395480299c77e40170430341
       with:
-        cosign-release: 'v2.0.0-rc.3'
+        cosign-release: 'v2.0.0'
 
     - name: Install cluster + sigstore
       uses: sigstore/scaffolding/actions/setup@main

diff --git a/.github/workflows/kind-cluster-image-policy-trustroot.yaml b/.github/workflows/kind-cluster-image-policy-trustroot.yaml
@@ -71,7 +71,7 @@ jobs:
 
     - uses: sigstore/cosign-installer@4079ad3567a89f68395480299c77e40170430341
       with:
-        cosign-release: 'v2.0.0-rc.3'
+        cosign-release: 'v2.0.0'
 
     - name: Install cluster + sigstore
       uses: sigstore/scaffolding/actions/setup@main

diff --git a/.github/workflows/kind-cluster-image-policy-tsa.yaml b/.github/workflows/kind-cluster-image-policy-tsa.yaml
@@ -66,7 +66,7 @@ jobs:
 
     - uses: sigstore/cosign-installer@4079ad3567a89f68395480299c77e40170430341 # v2
       with:
-        cosign-release: 'v2.0.0-rc.3'
+        cosign-release: 'v2.0.0'
 
     - name: Install cluster + sigstore
       uses: sigstore/scaffolding/actions/setup@v0.5.4

diff --git a/.github/workflows/kind-cluster-image-policy.yaml b/.github/workflows/kind-cluster-image-policy.yaml
@@ -80,7 +80,7 @@ jobs:
 
     - uses: sigstore/cosign-installer@4079ad3567a89f68395480299c77e40170430341
       with:
-        cosign-release: 'v2.0.0-rc.3'
+        cosign-release: 'v2.0.0'
 
     - name: Install cluster + sigstore
       uses: sigstore/scaffolding/actions/setup@main

diff --git a/.github/workflows/kind-e2e-cosigned.yaml b/.github/workflows/kind-e2e-cosigned.yaml
@@ -59,7 +59,7 @@ jobs:
 
     - uses: sigstore/cosign-installer@4079ad3567a89f68395480299c77e40170430341
       with:
-        cosign-release: 'v2.0.0-rc.3'
+        cosign-release: 'v2.0.0'
 
     - name: Setup mirror
       uses: chainguard-dev/actions/setup-mirror@main

diff --git a/.github/workflows/kind-e2e-trustroot-crd.yaml b/.github/workflows/kind-e2e-trustroot-crd.yaml
@@ -59,7 +59,7 @@ jobs:
 
     - uses: sigstore/cosign-installer@4079ad3567a89f68395480299c77e40170430341
       with:
-        cosign-release: 'v2.0.0-rc.3'
+        cosign-release: 'v2.0.0'
 
     - name: Setup mirror
       uses: chainguard-dev/actions/setup-mirror@main

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -27,7 +27,7 @@ jobs:
 
       - uses: sigstore/cosign-installer@4079ad3567a89f68395480299c77e40170430341
         with:
-          cosign-release: 'v2.0.0-rc.3'
+          cosign-release: 'v2.0.0'
 
       - uses: anchore/sbom-action/download-syft@07978da4bdb4faa726e52dfc6b1bed63d4b56479 # v0.13.3
 

diff --git a/go.mod b/go.mod
@@ -28,7 +28,7 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/mitchellh/mapstructure v1.5.0
 	github.com/ryanuber/go-glob v1.0.0
-	github.com/sigstore/cosign/v2 v2.0.0-rc.3
+	github.com/sigstore/cosign/v2 v2.0.0
 	github.com/sigstore/rekor v1.0.1
 	github.com/sigstore/sigstore v1.5.2
 	github.com/stretchr/testify v1.8.1
@@ -255,6 +255,3 @@ require (
 // TODO: this dependency causes issues on webhook startup due
 // to conflicting "log_dir" flags between this and klog (knative)
 replace github.com/golang/glog => github.com/jdolitsky/glog v0.0.0-20220729172235-78744e90d087
-
-// DO NOT MERGE!!! Update to cosign releave v2.0 before merge
-replace github.com/sigstore/cosign/v2 => github.com/sigstore/cosign/v2 v2.0.0-rc.3.0.20230223192635-d6b9001f8e6e
diff --git a/go.sum b/go.sum
@@ -786,8 +786,8 @@ github.com/secure-systems-lab/go-securesystemslib v0.4.0/go.mod h1:FGBZgq2tXWICs
 github.com/shibumi/go-pathspec v1.3.0 h1:QUyMZhFo0Md5B8zV8x2tesohbb5kfbpTi9rBnKh5dkI=
 github.com/shibumi/go-pathspec v1.3.0/go.mod h1:Xutfslp817l2I1cZvgcfeMQJG5QnU2lh5tVaaMCl3jE=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/sigstore/cosign/v2 v2.0.0-rc.3.0.20230223192635-d6b9001f8e6e h1:GtvjKSsm5i2x0eSjyVqnoYVnlJAQVejFkn2zLGtNP4M=
-github.com/sigstore/cosign/v2 v2.0.0-rc.3.0.20230223192635-d6b9001f8e6e/go.mod h1:MeJyYfKll3AAsb+CdnhI3YkecDPX2erPvf1JaUaFCrM=
+github.com/sigstore/cosign/v2 v2.0.0 h1:x+K6VQKtrBR9/MYOx6ebJB6/Aux56nmf2Zn3chZlP5w=
+github.com/sigstore/cosign/v2 v2.0.0/go.mod h1:MeJyYfKll3AAsb+CdnhI3YkecDPX2erPvf1JaUaFCrM=
 github.com/sigstore/rekor v1.0.1 h1:rcESXSNkAPRWFYZel9rarspdvneET60F2ngNkadi89c=
 github.com/sigstore/rekor v1.0.1/go.mod h1:ecTKdZWGWqE1pl3U1m1JebQJLU/hSjD9vYHOmHQ7w4g=
 github.com/sigstore/sigstore v1.5.2 h1:rvZSPJDH2ysoc8kjW9v4nv1UX3XwSA8y4x6Dk7hA0D4=