Merge pull request #1041 from fluxcd/update-deps

Update dependencies

api/go.mod

@@ -4,9 +4,9 @@ go 1.18
 
 require (
  github.com/fluxcd/pkg/apis/acl v0.1.0
- github.com/fluxcd/pkg/apis/meta v0.19.0
- k8s.io/apimachinery v0.26.1
- sigs.k8s.io/controller-runtime v0.14.4
+ github.com/fluxcd/pkg/apis/meta v0.19.1
+ k8s.io/apimachinery v0.26.2
+ sigs.k8s.io/controller-runtime v0.14.5
 )
 
 // Fix CVE-2022-28948

api/go.sum

@@ -3,8 +3,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fluxcd/pkg/apis/acl v0.1.0 h1:EoAl377hDQYL3WqanWCdifauXqXbMyFuK82NnX6pH4Q=
 github.com/fluxcd/pkg/apis/acl v0.1.0/go.mod h1:zfEZzz169Oap034EsDhmCAGgnWlcWmIObZjYMusoXS8=
-github.com/fluxcd/pkg/apis/meta v0.19.0 h1:CX75e/eaRWZDTzNdMSWomY1InlssLKcS8GQDSg/aopI=
-github.com/fluxcd/pkg/apis/meta v0.19.0/go.mod h1:7b6prDPsViyAzoY7eRfSPS0/MbXpGGsOMvRq2QrTKa4=
+github.com/fluxcd/pkg/apis/meta v0.19.1 h1:fCI5CnTXpAqr67UlaI9q0H+OztMKB5kDTr6xV6vlAo0=
+github.com/fluxcd/pkg/apis/meta v0.19.1/go.mod h1:ZPPMYrPnWwPQYNEGM/Uc0N4SurUPS3xNI3IIpCQEfuM=
 github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=
 github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -74,14 +74,14 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ=
-k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ=
-k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74=
+k8s.io/apimachinery v0.26.2 h1:da1u3D5wfR5u2RpLhE/ZtZS2P7QvDgLZTi9wrNZl/tQ=
+k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
 k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4=
 k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y=
 k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/controller-runtime v0.14.4 h1:Kd/Qgx5pd2XUL08eOV2vwIq3L9GhIbJ5Nxengbd4/0M=
-sigs.k8s.io/controller-runtime v0.14.4/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
+sigs.k8s.io/controller-runtime v0.14.5 h1:6xaWFqzT5KuAQ9ufgUaj1G/+C4Y1GRkhrxl+BJ9i+5s=
+sigs.k8s.io/controller-runtime v0.14.5/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0=
 sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
 sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
 sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

go.mod

@@ -4,9 +4,6 @@ go 1.18
 
 replace github.com/fluxcd/source-controller/api => ./api
 
-// Fix CVE-2022-1996 (for v2, Go Modules incompatible)
-replace github.com/emicklei/go-restful => github.com/emicklei/go-restful v2.16.0+incompatible
-
 // Replace digest lib to master to gather access to BLAKE3.
 // xref: https://github.com/opencontainers/go-digest/pull/66
 replace github.com/opencontainers/go-digest => github.com/opencontainers/go-digest v1.0.1-0.20220411205349-bde1400a84be
@@ -23,26 +20,26 @@ require (
  github.com/docker/cli v23.0.1+incompatible
  github.com/docker/go-units v0.5.0
  github.com/fluxcd/go-git/v5 v5.0.0-20221219190809-2e5c9d01cfc4
- github.com/fluxcd/pkg/apis/event v0.4.0
- github.com/fluxcd/pkg/apis/meta v0.19.0
+ github.com/fluxcd/pkg/apis/event v0.4.1
+ github.com/fluxcd/pkg/apis/meta v0.19.1
  github.com/fluxcd/pkg/git v0.11.0
  github.com/fluxcd/pkg/git/gogit v0.8.0
  github.com/fluxcd/pkg/gittestserver v0.8.1
  github.com/fluxcd/pkg/helmtestserver v0.11.1
  github.com/fluxcd/pkg/lockedfile v0.1.0
  github.com/fluxcd/pkg/masktoken v0.2.0
- github.com/fluxcd/pkg/oci v0.20.0
- github.com/fluxcd/pkg/runtime v0.29.0
+ github.com/fluxcd/pkg/oci v0.20.1
+ github.com/fluxcd/pkg/runtime v0.30.0
  github.com/fluxcd/pkg/sourceignore v0.3.2
- github.com/fluxcd/pkg/ssh v0.7.1
+ github.com/fluxcd/pkg/ssh v0.7.2
  github.com/fluxcd/pkg/testserver v0.4.0
  github.com/fluxcd/pkg/untar v0.2.0
  github.com/fluxcd/pkg/version v0.2.1
  github.com/fluxcd/source-controller/api v0.35.2
  github.com/go-git/go-billy/v5 v5.4.1
  github.com/go-logr/logr v1.2.3
  github.com/google/go-containerregistry v0.13.0
- github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20230217043738-4a0e0af4bf95
+ github.com/google/go-containerregistry/pkg/authn/k8schain v0.0.0-20230227161101-1b8dc2babc55
  github.com/google/uuid v1.3.0
  github.com/minio/minio-go/v7 v7.0.49
  github.com/onsi/gomega v1.27.2
@@ -58,15 +55,15 @@ require (
  github.com/spf13/pflag v1.0.5
  golang.org/x/crypto v0.6.0
  golang.org/x/sync v0.1.0
- google.golang.org/api v0.110.0
+ google.golang.org/api v0.111.0
  gotest.tools v2.2.0+incompatible
  helm.sh/helm/v3 v3.11.1
- k8s.io/api v0.26.1
- k8s.io/apimachinery v0.26.1
- k8s.io/client-go v0.26.1
+ k8s.io/api v0.26.2
+ k8s.io/apimachinery v0.26.2
+ k8s.io/client-go v0.26.2
  k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
  sigs.k8s.io/cli-utils v0.34.0
- sigs.k8s.io/controller-runtime v0.14.4
+ sigs.k8s.io/controller-runtime v0.14.5
  sigs.k8s.io/yaml v1.3.0
 )
 
@@ -75,7 +72,7 @@ require (
  cloud.google.com/go v0.107.0 // indirect
  cloud.google.com/go/compute v1.18.0 // indirect
  cloud.google.com/go/compute/metadata v0.2.3 // indirect
- cloud.google.com/go/iam v0.8.0 // indirect
+ cloud.google.com/go/iam v0.11.0 // indirect
  github.com/AliyunContainerService/ack-ram-tool/pkg/credentials/alibabacloudsdkgo/helper v0.2.0 // indirect
  github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
  github.com/Azure/azure-sdk-for-go/sdk/internal v1.1.2 // indirect
@@ -113,18 +110,18 @@ require (
  github.com/aliyun/credentials-go v1.2.3 // indirect
  github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
  github.com/aws/aws-sdk-go-v2 v1.17.5 // indirect
- github.com/aws/aws-sdk-go-v2/config v1.18.14 // indirect
- github.com/aws/aws-sdk-go-v2/credentials v1.13.14 // indirect
+ github.com/aws/aws-sdk-go-v2/config v1.18.15 // indirect
+ github.com/aws/aws-sdk-go-v2/credentials v1.13.15 // indirect
  github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.23 // indirect
  github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.29 // indirect
  github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.23 // indirect
  github.com/aws/aws-sdk-go-v2/internal/ini v1.3.30 // indirect
- github.com/aws/aws-sdk-go-v2/service/ecr v1.18.3 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ecr v1.18.5 // indirect
  github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.13.17 // indirect
  github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.23 // indirect
- github.com/aws/aws-sdk-go-v2/service/sso v1.12.3 // indirect
- github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.3 // indirect
- github.com/aws/aws-sdk-go-v2/service/sts v1.18.4 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sso v1.12.4 // indirect
+ github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.4 // indirect
+ github.com/aws/aws-sdk-go-v2/service/sts v1.18.5 // indirect
  github.com/aws/smithy-go v1.13.5 // indirect
  github.com/awslabs/amazon-ecr-credential-helper/ecr-login v0.0.0-20221004211355-a250ad2ca1e3 // indirect
  github.com/benbjohnson/clock v1.1.0 // indirect
@@ -314,12 +311,12 @@ require (
  github.com/spf13/jwalterweatherman v1.1.0 // indirect
  github.com/spf13/viper v1.13.0 // indirect
  github.com/spiffe/go-spiffe/v2 v2.1.1 // indirect
- github.com/stretchr/testify v1.8.1 // indirect
+ github.com/stretchr/testify v1.8.2 // indirect
  github.com/subosito/gotenv v1.4.1 // indirect
  github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect
  github.com/tent/canonical-json-go v0.0.0-20130607151641-96e4ba3a7613 // indirect
  github.com/thales-e-security/pool v0.0.2 // indirect
- github.com/theupdateframework/go-tuf v0.5.2-0.20220930112810-3890c1e7ace4 // indirect
+ github.com/theupdateframework/go-tuf v0.5.2 // indirect
  github.com/titanous/rocacheck v0.0.0-20171023193734-afe73141d399 // indirect
  github.com/tjfoc/gmsm v1.3.2 // indirect
  github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect
@@ -376,7 +373,7 @@ require (
  golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
  gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/genproto v0.0.0-20230209215440-0dfe4f8abfcc // indirect
+ google.golang.org/genproto v0.0.0-20230223222841-637eb2293923 // indirect
  google.golang.org/grpc v1.53.0 // indirect
  google.golang.org/protobuf v1.28.1 // indirect
  gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
@@ -390,8 +387,8 @@ require (
  k8s.io/apiextensions-apiserver v0.26.1 // indirect
  k8s.io/apiserver v0.26.1 // indirect
  k8s.io/cli-runtime v0.26.0 // indirect
- k8s.io/component-base v0.26.1 // indirect
- k8s.io/klog/v2 v2.90.0 // indirect
+ k8s.io/component-base v0.26.2 // indirect
+ k8s.io/klog/v2 v2.90.1 // indirect
  k8s.io/kube-openapi v0.0.0-20221110221610-a28e98eb7c70 // indirect
  k8s.io/kubectl v0.26.0 // indirect
  oras.land/oras-go v1.2.2 // indirect