Merge pull request #802 from fluxcd/k8s-1.31-internal

Update internal packages
fluxcd · Aug 14, 2024 · bd579fc · bd579fc
2 parents be8df7e + c06927b
commit bd579fc
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 18 deletions.
diff --git a/git/gogit/go.mod b/git/gogit/go.mod
@@ -14,9 +14,9 @@ require (
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
 	github.com/elazarl/goproxy v0.0.0-20240726154733-8b0c20506380
 	github.com/fluxcd/gitkit v0.6.0
-	github.com/fluxcd/pkg/git v0.19.0
-	github.com/fluxcd/pkg/gittestserver v0.12.0
-	github.com/fluxcd/pkg/ssh v0.13.0
+	github.com/fluxcd/pkg/git v0.20.0
+	github.com/fluxcd/pkg/gittestserver v0.13.0
+	github.com/fluxcd/pkg/ssh v0.14.0
 	github.com/fluxcd/pkg/version v0.4.0
 	github.com/go-git/go-billy/v5 v5.5.0
 	github.com/go-git/go-git/v5 v5.12.0

diff --git a/git/internal/e2e/go.mod b/git/internal/e2e/go.mod
@@ -12,10 +12,10 @@ replace (
 
 require (
 	github.com/fluxcd/go-git-providers v0.20.1
-	github.com/fluxcd/pkg/git v0.19.0
+	github.com/fluxcd/pkg/git v0.20.0
 	github.com/fluxcd/pkg/git/gogit v0.19.0
-	github.com/fluxcd/pkg/gittestserver v0.12.0
-	github.com/fluxcd/pkg/ssh v0.13.0
+	github.com/fluxcd/pkg/gittestserver v0.13.0
+	github.com/fluxcd/pkg/ssh v0.14.0
 	github.com/go-git/go-git/v5 v5.12.0
 	github.com/go-logr/logr v1.4.2
 	github.com/google/uuid v1.6.0

diff --git a/kustomize/go.mod b/kustomize/go.mod
@@ -9,9 +9,9 @@ replace (
 )
 
 require (
-	github.com/fluxcd/pkg/apis/kustomize v1.5.0
+	github.com/fluxcd/pkg/apis/kustomize v1.6.0
 	github.com/fluxcd/pkg/envsubst v1.1.0
-	github.com/fluxcd/pkg/sourceignore v0.7.0
+	github.com/fluxcd/pkg/sourceignore v0.8.0
 	github.com/go-git/go-git/v5 v5.12.0
 	github.com/onsi/gomega v1.34.1
 	github.com/otiai10/copy v1.14.0
@@ -25,7 +25,7 @@ require (
 	sigs.k8s.io/yaml v1.4.0
 )
 
-// Pin kustomize to v5.4.0
+// Pin kustomize to v5.4.3
 replace (
 	sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.17.3
 	sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.17.2

diff --git a/oci/go.mod b/oci/go.mod
@@ -18,9 +18,9 @@ require (
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.27
 	github.com/aws/aws-sdk-go-v2/service/ecr v1.32.0
 	github.com/distribution/distribution/v3 v3.0.0-beta.1
-	github.com/fluxcd/pkg/cache v0.0.1
-	github.com/fluxcd/pkg/sourceignore v0.7.0
-	github.com/fluxcd/pkg/tar v0.7.0
+	github.com/fluxcd/pkg/cache v0.0.2
+	github.com/fluxcd/pkg/sourceignore v0.8.0
+	github.com/fluxcd/pkg/tar v0.8.0
 	github.com/fluxcd/pkg/version v0.4.0
 	github.com/google/go-containerregistry v0.20.2
 	github.com/onsi/gomega v1.34.1

diff --git a/oci/tests/integration/go.mod b/oci/tests/integration/go.mod
@@ -8,7 +8,7 @@ replace (
 )
 
 require (
-	github.com/fluxcd/pkg/cache v0.0.1
+	github.com/fluxcd/pkg/cache v0.0.2
 	github.com/fluxcd/pkg/oci v0.38.1
 	github.com/fluxcd/test-infra/tftestenv v0.0.0-20240805120810-5b91964f964f
 	github.com/google/go-containerregistry v0.20.2

diff --git a/runtime/go.mod b/runtime/go.mod
@@ -12,15 +12,15 @@ require (
 	github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24
 	github.com/fluxcd/cli-utils v0.36.0-flux.8
 	github.com/fluxcd/pkg/apis/acl v0.3.0
-	github.com/fluxcd/pkg/apis/event v0.9.0
-	github.com/fluxcd/pkg/apis/meta v1.5.0
+	github.com/fluxcd/pkg/apis/event v0.10.0
+	github.com/fluxcd/pkg/apis/meta v1.6.0
 	github.com/go-logr/logr v1.4.2
 	github.com/google/go-cmp v0.6.0
 	github.com/hashicorp/go-retryablehttp v0.7.7
 	github.com/kylelemons/godebug v1.1.0
 	github.com/onsi/gomega v1.34.1
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.19.1
+	github.com/prometheus/client_golang v1.20.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.9.0
 	go.uber.org/zap v1.27.0
@@ -70,6 +70,7 @@ require (
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect

diff --git a/runtime/go.sum b/runtime/go.sum
@@ -93,6 +93,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -135,8 +137,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
-github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
+github.com/prometheus/client_golang v1.20.0 h1:jBzTZ7B099Rg24tny+qngoynol8LtVYlA2bqx3vEloI=
+github.com/prometheus/client_golang v1.20.0/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
 github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
 github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
 github.com/prometheus/common v0.55.0 h1:KEi6DK7lXW/m7Ig5i47x0vRzuBsHuvJdi5ee6Y3G1dc=