Skip to content

Commit c57ccb8

Browse files
rurikudorurikudo
authored
update k8s-manifest-sigstore version and enable CheckMutatingResource (#69)
Signed-off-by: Ruriko Kudo <[email protected]>
1 parent b22fe45 commit c57ccb8

File tree

9 files changed

+14
-12
lines changed

9 files changed

+14
-12
lines changed

‎integrity-shield-operator/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2066,8 +2066,8 @@ github.com/sigstore/cosign v1.5.2/go.mod h1:USeA+jISR3H86hfgsTn1UJYKC9mgEE7/o+dJ
20662066
github.com/sigstore/fulcio v0.0.0-20210720153316-846105495d38/go.mod h1:FZL7iVdWduaZRpXrvjmuWyr7WyXy6KXsaEVhHdITlz4=
20672067
github.com/sigstore/fulcio v0.1.2-0.20220114150912-86a2036f9bc7 h1:XE7A9lJ+wYhmUFBWYTaw3Ph943zHB4iBYd5R0SX0ZOA=
20682068
github.com/sigstore/fulcio v0.1.2-0.20220114150912-86a2036f9bc7/go.mod h1:ANQivY/lfOp9hN92S813LEthkm/kit96hzeIF3SNoZA=
2069-
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220316094109-adfc287a58c0 h1:mKlrF8MYhReT1wwwM6SW77/v1EbCfDiIiVE62Mj2jTU=
2070-
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220316094109-adfc287a58c0/go.mod h1:fWELceT4GvNZZrC12UutTIpuNa15++WW0rxxiStokTw=
2069+
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220323082949-1c9e624d9ac9 h1:UYm8SbXXJmHrOU4LCvx0F1jJxJMt/tHs6MOhKqtV7Zw=
2070+
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220323082949-1c9e624d9ac9/go.mod h1:fWELceT4GvNZZrC12UutTIpuNa15++WW0rxxiStokTw=
20712071
github.com/sigstore/rekor v0.2.1-0.20210714185543-38d532d5c0b1/go.mod h1:cL9B3+/gp3BG+/bhkSHBA3MQZMten5xM6BhJYd5b5zU=
20722072
github.com/sigstore/rekor v0.4.1-0.20220114213500-23f583409af3 h1:mbqXrm8YZXN/cJMGeBkgPnswtfrOxDE1f7QZdJ+POQE=
20732073
github.com/sigstore/rekor v0.4.1-0.20220114213500-23f583409af3/go.mod h1:u9clLqaVjqV9pExVL1XkM37dGyMCOX/LMocS9nsnWDY=

‎observer/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.16
55
require (
66
github.com/open-policy-agent/gatekeeper v0.0.0-20210824170141-dd97b8a7e966
77
github.com/sigstore/cosign v1.5.2
8-
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220316094109-adfc287a58c0
8+
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220323082949-1c9e624d9ac9
99
github.com/sirupsen/logrus v1.8.1
1010
github.com/stolostron/integrity-shield/reporter v0.0.0-00010101000000-000000000000
1111
github.com/stolostron/integrity-shield/shield v0.0.0-00010101000000-000000000000

‎observer/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2067,8 +2067,8 @@ github.com/sigstore/cosign v1.5.2/go.mod h1:USeA+jISR3H86hfgsTn1UJYKC9mgEE7/o+dJ
20672067
github.com/sigstore/fulcio v0.0.0-20210720153316-846105495d38/go.mod h1:FZL7iVdWduaZRpXrvjmuWyr7WyXy6KXsaEVhHdITlz4=
20682068
github.com/sigstore/fulcio v0.1.2-0.20220114150912-86a2036f9bc7 h1:XE7A9lJ+wYhmUFBWYTaw3Ph943zHB4iBYd5R0SX0ZOA=
20692069
github.com/sigstore/fulcio v0.1.2-0.20220114150912-86a2036f9bc7/go.mod h1:ANQivY/lfOp9hN92S813LEthkm/kit96hzeIF3SNoZA=
2070-
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220316094109-adfc287a58c0 h1:mKlrF8MYhReT1wwwM6SW77/v1EbCfDiIiVE62Mj2jTU=
2071-
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220316094109-adfc287a58c0/go.mod h1:fWELceT4GvNZZrC12UutTIpuNa15++WW0rxxiStokTw=
2070+
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220323082949-1c9e624d9ac9 h1:UYm8SbXXJmHrOU4LCvx0F1jJxJMt/tHs6MOhKqtV7Zw=
2071+
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220323082949-1c9e624d9ac9/go.mod h1:fWELceT4GvNZZrC12UutTIpuNa15++WW0rxxiStokTw=
20722072
github.com/sigstore/rekor v0.2.1-0.20210714185543-38d532d5c0b1/go.mod h1:cL9B3+/gp3BG+/bhkSHBA3MQZMten5xM6BhJYd5b5zU=
20732073
github.com/sigstore/rekor v0.4.1-0.20220114213500-23f583409af3 h1:mbqXrm8YZXN/cJMGeBkgPnswtfrOxDE1f7QZdJ+POQE=
20742074
github.com/sigstore/rekor v0.4.1-0.20220114213500-23f583409af3/go.mod h1:u9clLqaVjqV9pExVL1XkM37dGyMCOX/LMocS9nsnWDY=

‎reporter/go.sum

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1845,7 +1845,7 @@ github.com/sigstore/cosign v0.6.1-0.20210723014001-364cadc9e41f/go.mod h1:/mRVq8
18451845
github.com/sigstore/cosign v1.5.2/go.mod h1:USeA+jISR3H86hfgsTn1UJYKC9mgEE7/o+dJ7sk63MY=
18461846
github.com/sigstore/fulcio v0.0.0-20210720153316-846105495d38/go.mod h1:FZL7iVdWduaZRpXrvjmuWyr7WyXy6KXsaEVhHdITlz4=
18471847
github.com/sigstore/fulcio v0.1.2-0.20220114150912-86a2036f9bc7/go.mod h1:ANQivY/lfOp9hN92S813LEthkm/kit96hzeIF3SNoZA=
1848-
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220316094109-adfc287a58c0/go.mod h1:fWELceT4GvNZZrC12UutTIpuNa15++WW0rxxiStokTw=
1848+
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220323082949-1c9e624d9ac9/go.mod h1:fWELceT4GvNZZrC12UutTIpuNa15++WW0rxxiStokTw=
18491849
github.com/sigstore/rekor v0.2.1-0.20210714185543-38d532d5c0b1/go.mod h1:cL9B3+/gp3BG+/bhkSHBA3MQZMten5xM6BhJYd5b5zU=
18501850
github.com/sigstore/rekor v0.4.1-0.20220114213500-23f583409af3/go.mod h1:u9clLqaVjqV9pExVL1XkM37dGyMCOX/LMocS9nsnWDY=
18511851
github.com/sigstore/sigstore v0.0.0-20210713222344-1fee53516622/go.mod h1:aOSeNrlcHsfUD8Q1hwWd8KloNqBnxEZlu4k47cFg5rg=

‎shield/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/jinzhu/copier v0.3.2
88
github.com/pkg/errors v0.9.1
99
github.com/sigstore/cosign v1.5.2
10-
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220316094109-adfc287a58c0
10+
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220323082949-1c9e624d9ac9
1111
github.com/sirupsen/logrus v1.8.1
1212
k8s.io/api v0.23.0
1313
k8s.io/apimachinery v0.23.0

‎shield/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2065,8 +2065,8 @@ github.com/sigstore/cosign v1.5.2/go.mod h1:USeA+jISR3H86hfgsTn1UJYKC9mgEE7/o+dJ
20652065
github.com/sigstore/fulcio v0.0.0-20210720153316-846105495d38/go.mod h1:FZL7iVdWduaZRpXrvjmuWyr7WyXy6KXsaEVhHdITlz4=
20662066
github.com/sigstore/fulcio v0.1.2-0.20220114150912-86a2036f9bc7 h1:XE7A9lJ+wYhmUFBWYTaw3Ph943zHB4iBYd5R0SX0ZOA=
20672067
github.com/sigstore/fulcio v0.1.2-0.20220114150912-86a2036f9bc7/go.mod h1:ANQivY/lfOp9hN92S813LEthkm/kit96hzeIF3SNoZA=
2068-
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220316094109-adfc287a58c0 h1:mKlrF8MYhReT1wwwM6SW77/v1EbCfDiIiVE62Mj2jTU=
2069-
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220316094109-adfc287a58c0/go.mod h1:fWELceT4GvNZZrC12UutTIpuNa15++WW0rxxiStokTw=
2068+
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220323082949-1c9e624d9ac9 h1:UYm8SbXXJmHrOU4LCvx0F1jJxJMt/tHs6MOhKqtV7Zw=
2069+
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220323082949-1c9e624d9ac9/go.mod h1:fWELceT4GvNZZrC12UutTIpuNa15++WW0rxxiStokTw=
20702070
github.com/sigstore/rekor v0.2.1-0.20210714185543-38d532d5c0b1/go.mod h1:cL9B3+/gp3BG+/bhkSHBA3MQZMten5xM6BhJYd5b5zU=
20712071
github.com/sigstore/rekor v0.4.1-0.20220114213500-23f583409af3 h1:mbqXrm8YZXN/cJMGeBkgPnswtfrOxDE1f7QZdJ+POQE=
20722072
github.com/sigstore/rekor v0.4.1-0.20220114213500-23f583409af3/go.mod h1:u9clLqaVjqV9pExVL1XkM37dGyMCOX/LMocS9nsnWDY=

‎shield/pkg/shield/verify.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,8 @@ func setVerifyOption(constraint *config.ManifestVerifyRule, mvconfig *config.Man
277277
if vo.DryRunNamespace == "" {
278278
vo.DryRunNamespace = config.DefaultDryRunNS
279279
}
280+
// set CheckMutatingResource option for multiple mutating webhooks
281+
vo.CheckMutatingResource = true
280282

281283
// set Signature type
282284
if signatureAnnotationType == SignatureAnnotationTypeShield {

‎webhook/admission-controller/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/jinzhu/copier v0.3.2
88
github.com/pkg/errors v0.9.1
99
github.com/sigstore/cosign v1.5.2
10-
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220316094109-adfc287a58c0
10+
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220323082949-1c9e624d9ac9
1111
github.com/sirupsen/logrus v1.8.1
1212
github.com/stolostron/integrity-shield/shield v0.0.0-00010101000000-000000000000
1313
k8s.io/api v0.23.0

‎webhook/admission-controller/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2065,8 +2065,8 @@ github.com/sigstore/cosign v1.5.2/go.mod h1:USeA+jISR3H86hfgsTn1UJYKC9mgEE7/o+dJ
20652065
github.com/sigstore/fulcio v0.0.0-20210720153316-846105495d38/go.mod h1:FZL7iVdWduaZRpXrvjmuWyr7WyXy6KXsaEVhHdITlz4=
20662066
github.com/sigstore/fulcio v0.1.2-0.20220114150912-86a2036f9bc7 h1:XE7A9lJ+wYhmUFBWYTaw3Ph943zHB4iBYd5R0SX0ZOA=
20672067
github.com/sigstore/fulcio v0.1.2-0.20220114150912-86a2036f9bc7/go.mod h1:ANQivY/lfOp9hN92S813LEthkm/kit96hzeIF3SNoZA=
2068-
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220316094109-adfc287a58c0 h1:mKlrF8MYhReT1wwwM6SW77/v1EbCfDiIiVE62Mj2jTU=
2069-
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220316094109-adfc287a58c0/go.mod h1:fWELceT4GvNZZrC12UutTIpuNa15++WW0rxxiStokTw=
2068+
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220323082949-1c9e624d9ac9 h1:UYm8SbXXJmHrOU4LCvx0F1jJxJMt/tHs6MOhKqtV7Zw=
2069+
github.com/sigstore/k8s-manifest-sigstore v0.2.1-0.20220323082949-1c9e624d9ac9/go.mod h1:fWELceT4GvNZZrC12UutTIpuNa15++WW0rxxiStokTw=
20702070
github.com/sigstore/rekor v0.2.1-0.20210714185543-38d532d5c0b1/go.mod h1:cL9B3+/gp3BG+/bhkSHBA3MQZMten5xM6BhJYd5b5zU=
20712071
github.com/sigstore/rekor v0.4.1-0.20220114213500-23f583409af3 h1:mbqXrm8YZXN/cJMGeBkgPnswtfrOxDE1f7QZdJ+POQE=
20722072
github.com/sigstore/rekor v0.4.1-0.20220114213500-23f583409af3/go.mod h1:u9clLqaVjqV9pExVL1XkM37dGyMCOX/LMocS9nsnWDY=

0 commit comments

Comments
 (0)