Skip to content

Commit

Permalink
update k8s dependencies to update protobuf version (#357)
Browse files Browse the repository at this point in the history
Signed-off-by: Hirokuni-Kitahara1 <[email protected]>
  • Loading branch information
hirokuni-kitahara authored Sep 21, 2021
1 parent 9da9192 commit e388584
Show file tree
Hide file tree
Showing 8 changed files with 345 additions and 298 deletions.
14 changes: 7 additions & 7 deletions cmd/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ require (
github.com/sigstore/sigstore v0.0.0-20210516171352-bee6a385d4af
github.com/sirupsen/logrus v1.7.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/apimachinery v0.20.2
k8s.io/apimachinery v0.21.4
)

replace (
github.com/IBM/integrity-enforcer/cmd => ./
github.com/IBM/integrity-enforcer/shield => ../shield
github.com/sigstore/cosign => github.com/sigstore/cosign v0.4.1-0.20210513202038-96a92e0d5c84
k8s.io/api => k8s.io/api v0.19.0
k8s.io/apimachinery => k8s.io/apimachinery v0.19.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0
k8s.io/client-go => k8s.io/client-go v0.19.0
k8s.io/code-generator => k8s.io/code-generator v0.19.0
k8s.io/kubectl => k8s.io/kubectl v0.19.0
k8s.io/api => k8s.io/api v0.21.4
k8s.io/apimachinery => k8s.io/apimachinery v0.21.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.4
k8s.io/client-go => k8s.io/client-go v0.21.4
k8s.io/code-generator => k8s.io/code-generator v0.21.4
k8s.io/kubectl => k8s.io/kubectl v0.21.4
)

replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
176 changes: 97 additions & 79 deletions cmd/go.sum

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions integrity-shield-operator/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,32 +6,32 @@ require (
github.com/IBM/integrity-enforcer/shield v0.0.0-20201001024601-320551d946dc
github.com/dgrijalva/jwt-go v3.2.0+incompatible
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
github.com/go-logr/logr v0.3.0
github.com/go-logr/logr v0.4.0
github.com/google/go-cmp v0.5.5
github.com/onsi/ginkgo v1.14.2
github.com/onsi/gomega v1.10.3
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.13.0
github.com/openshift/api v3.9.0+incompatible
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b
k8s.io/api v0.20.2
k8s.io/apiextensions-apiserver v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.20.2
k8s.io/api v0.21.4
k8s.io/apiextensions-apiserver v0.21.4
k8s.io/apimachinery v0.21.4
k8s.io/client-go v0.21.4
k8s.io/klog v1.0.0
sigs.k8s.io/controller-runtime v0.8.3
sigs.k8s.io/controller-runtime v0.9.0
)

replace (
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.4-0.20200207053602-7439e774c9e9+incompatible
github.com/IBM/integrity-enforcer/cmd => ../cmd
github.com/IBM/integrity-enforcer/integrity-shield-operator => ./
github.com/IBM/integrity-enforcer/shield => ../shield
k8s.io/api => k8s.io/api v0.19.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0
k8s.io/apimachinery => k8s.io/apimachinery v0.19.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0
k8s.io/client-go => k8s.io/client-go v0.19.0
k8s.io/kubectl => k8s.io/kubectl v0.19.0
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.8.3
k8s.io/api => k8s.io/api v0.21.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.4
k8s.io/apimachinery => k8s.io/apimachinery v0.21.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.4
k8s.io/client-go => k8s.io/client-go v0.21.4
k8s.io/kubectl => k8s.io/kubectl v0.21.4
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.9.0
)

replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
Expand Down
182 changes: 100 additions & 82 deletions integrity-shield-operator/go.sum

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions observer/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ require (
github.com/onsi/ginkgo v1.14.2 // indirect
github.com/onsi/gomega v1.10.3 // indirect
github.com/sirupsen/logrus v1.7.0
k8s.io/api v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/client-go v12.0.0+incompatible
k8s.io/api v0.21.4
k8s.io/apimachinery v0.21.4
k8s.io/client-go v0.21.4
)

replace (
github.com/IBM/integrity-enforcer/observer => ./
github.com/IBM/integrity-enforcer/shield => ../shield
k8s.io/api => k8s.io/api v0.19.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0
k8s.io/apimachinery => k8s.io/apimachinery v0.19.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0
k8s.io/client-go => k8s.io/client-go v0.19.0
k8s.io/kubectl => k8s.io/kubectl v0.19.0
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.8.3
k8s.io/api => k8s.io/api v0.21.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.4
k8s.io/apimachinery => k8s.io/apimachinery v0.21.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.4
k8s.io/client-go => k8s.io/client-go v0.21.4
k8s.io/kubectl => k8s.io/kubectl v0.21.4
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.9.0
)

replace github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
Expand Down
30 changes: 15 additions & 15 deletions shield/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ require (
github.com/google/go-containerregistry v0.5.0
github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a
github.com/oliveagle/jsonpath v0.0.0-20180606110733-2e52cf6e6852
github.com/onsi/ginkgo v1.14.1
github.com/onsi/gomega v1.10.2
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.13.0
github.com/openshift/api v3.9.0+incompatible
github.com/pkg/errors v0.9.1
github.com/r3labs/diff v0.0.0-20191120142937-b4ed99a31f5a
Expand All @@ -22,24 +22,24 @@ require (
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b
gopkg.in/yaml.v2 v2.4.0
helm.sh/helm/v3 v3.0.2
k8s.io/api v0.20.2
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.20.2
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
k8s.io/kubectl v0.19.0
sigs.k8s.io/controller-runtime v0.8.2
k8s.io/api v0.21.4
k8s.io/apimachinery v0.21.4
k8s.io/client-go v0.21.4
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7
k8s.io/kubectl v0.21.4
sigs.k8s.io/controller-runtime v0.9.0
)

replace (
github.com/IBM/integrity-enforcer/cmd => ../cmd
github.com/IBM/integrity-enforcer/shield => ./
github.com/sigstore/cosign => github.com/sigstore/cosign v0.4.1-0.20210513202038-96a92e0d5c84
google.golang.org/grpc => google.golang.org/grpc v1.36.1
k8s.io/api => k8s.io/api v0.19.0
k8s.io/apimachinery => k8s.io/apimachinery v0.19.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0
k8s.io/client-go => k8s.io/client-go v0.19.0
k8s.io/code-generator => k8s.io/code-generator v0.19.0
k8s.io/kubectl => k8s.io/kubectl v0.19.0
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.8.3
k8s.io/api => k8s.io/api v0.21.4
k8s.io/apimachinery => k8s.io/apimachinery v0.21.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.21.4
k8s.io/client-go => k8s.io/client-go v0.21.4
k8s.io/code-generator => k8s.io/code-generator v0.21.4
k8s.io/kubectl => k8s.io/kubectl v0.21.4
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.9.0
)
Loading

0 comments on commit e388584

Please sign in to comment.