Merge pull request #5 from fluxcd/update-deps-go-1.22

Update dependencies to Go 1.22 and Kubernetes 1.29.3

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
  name: Set up Go
  uses: actions/setup-go@v4
  with:
- go-version: 1.20.x
+ go-version-file: "go.mod"
  cache-dependency-path: |
  **/go.sum
  **/go.mod

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
  name: Set up Go
  uses: actions/setup-go@v4
  with:
- go-version: 1.20.x
+ go-version-file: "go.mod"
  cache-dependency-path: |
  **/go.sum
  **/go.mod

cmd/main.go

@@ -11,21 +11,21 @@ import (
  "strings"
  "time"
 
+ "github.com/spf13/cobra"
+ "k8s.io/cli-runtime/pkg/genericclioptions"
+ "k8s.io/client-go/rest"
+ "k8s.io/component-base/cli"
+ "k8s.io/klog/v2"
+ "k8s.io/kubectl/pkg/cmd/util"
+
  "github.com/fluxcd/cli-utils/cmd/apply"
  "github.com/fluxcd/cli-utils/cmd/destroy"
- "github.com/fluxcd/cli-utils/cmd/diff"
  "github.com/fluxcd/cli-utils/cmd/initcmd"
  "github.com/fluxcd/cli-utils/cmd/preview"
  "github.com/fluxcd/cli-utils/cmd/status"
  "github.com/fluxcd/cli-utils/pkg/flowcontrol"
  "github.com/fluxcd/cli-utils/pkg/inventory"
  "github.com/fluxcd/cli-utils/pkg/manifestreader"
- "github.com/spf13/cobra"
- "k8s.io/cli-runtime/pkg/genericclioptions"
- "k8s.io/client-go/rest"
- "k8s.io/component-base/cli"
- "k8s.io/klog/v2"
- "k8s.io/kubectl/pkg/cmd/util"
 
  // This is here rather than in the libraries because of
  // https:/kubernetes-sigs/kustomize/issues/2060
@@ -69,7 +69,6 @@ func main() {
  initcmd.NewCmdInit(f, ioStreams),
  apply.Command(f, invFactory, loader, ioStreams),
  destroy.Command(f, invFactory, loader, ioStreams),
- diff.NewCommand(f, ioStreams),
  preview.Command(f, invFactory, loader, ioStreams),
  status.Command(context.TODO(), f, invFactory, status.NewInventoryLoader(loader)),
  }

go.mod

@@ -1,26 +1,26 @@
 module github.com/fluxcd/cli-utils
 
-go 1.20
+go 1.22
 
 require (
  github.com/google/go-cmp v0.6.0
- github.com/google/uuid v1.5.0
- github.com/onsi/ginkgo/v2 v2.15.0
- github.com/onsi/gomega v1.31.1
+ github.com/google/uuid v1.6.0
+ github.com/onsi/ginkgo/v2 v2.17.1
+ github.com/onsi/gomega v1.32.0
  github.com/spf13/cobra v1.8.0
- github.com/spyzhov/ajson v0.9.0
- github.com/stretchr/testify v1.8.4
+ github.com/spyzhov/ajson v0.9.1
+ github.com/stretchr/testify v1.9.0
  gopkg.in/yaml.v3 v3.0.1
- k8s.io/api v0.28.6
- k8s.io/apiextensions-apiserver v0.28.6
- k8s.io/apimachinery v0.28.6
- k8s.io/cli-runtime v0.28.6
- k8s.io/client-go v0.28.6
- k8s.io/component-base v0.28.6
- k8s.io/klog/v2 v2.100.1
- k8s.io/kubectl v0.28.6
- k8s.io/utils v0.0.0-20231127182322-b307cd553661
- sigs.k8s.io/controller-runtime v0.16.3
+ k8s.io/api v0.29.3
+ k8s.io/apiextensions-apiserver v0.29.3
+ k8s.io/apimachinery v0.29.3
+ k8s.io/cli-runtime v0.29.3
+ k8s.io/client-go v0.29.3
+ k8s.io/component-base v0.29.3
+ k8s.io/klog/v2 v2.110.1
+ k8s.io/kubectl v0.29.3
+ k8s.io/utils v0.0.0-20240310230437-4693a0247e57
+ sigs.k8s.io/controller-runtime v0.17.2
  sigs.k8s.io/kustomize/kyaml v0.16.0
  sigs.k8s.io/yaml v1.4.0
 )
@@ -35,25 +35,26 @@ require (
  github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/emicklei/go-restful/v3 v3.11.0 // indirect
  github.com/evanphx/json-patch v5.7.0+incompatible // indirect
- github.com/evanphx/json-patch/v5 v5.7.0 // indirect
+ github.com/evanphx/json-patch/v5 v5.8.0 // indirect
  github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
  github.com/fatih/camelcase v1.0.0 // indirect
- github.com/fsnotify/fsnotify v1.6.0 // indirect
+ github.com/fsnotify/fsnotify v1.7.0 // indirect
  github.com/fvbommel/sortorder v1.1.0 // indirect
  github.com/go-errors/errors v1.5.1 // indirect
- github.com/go-logr/logr v1.3.0 // indirect
+ github.com/go-logr/logr v1.4.1 // indirect
  github.com/go-openapi/jsonpointer v0.19.6 // indirect
  github.com/go-openapi/jsonreference v0.20.2 // indirect
  github.com/go-openapi/swag v0.22.3 // indirect
  github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
  github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
- github.com/golang/protobuf v1.5.3 // indirect
+ github.com/golang/protobuf v1.5.4 // indirect
  github.com/google/btree v1.0.1 // indirect
  github.com/google/gnostic-models v0.6.8 // indirect
  github.com/google/gofuzz v1.2.0 // indirect
  github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
  github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+ github.com/gorilla/websocket v1.5.0 // indirect
  github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
  github.com/imdario/mergo v0.3.13 // indirect
  github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -62,37 +63,37 @@ require (
  github.com/json-iterator/go v1.1.12 // indirect
  github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
  github.com/mailru/easyjson v0.7.7 // indirect
- github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
  github.com/mitchellh/go-wordwrap v1.0.1 // indirect
  github.com/moby/spdystream v0.2.0 // indirect
  github.com/moby/term v0.5.0 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
  github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
  github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
  github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
- github.com/prometheus/client_golang v1.17.0 // indirect
+ github.com/prometheus/client_golang v1.18.0 // indirect
  github.com/prometheus/client_model v0.5.0 // indirect
- github.com/prometheus/common v0.45.0 // indirect
+ github.com/prometheus/common v0.48.0 // indirect
  github.com/prometheus/procfs v0.12.0 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
  github.com/xlab/treeprint v1.2.0 // indirect
  go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
  golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
- golang.org/x/net v0.20.0 // indirect
+ golang.org/x/net v0.22.0 // indirect
  golang.org/x/oauth2 v0.16.0 // indirect
  golang.org/x/sync v0.6.0 // indirect
- golang.org/x/sys v0.16.0 // indirect
- golang.org/x/term v0.16.0 // indirect
+ golang.org/x/sys v0.18.0 // indirect
+ golang.org/x/term v0.18.0 // indirect
  golang.org/x/text v0.14.0 // indirect
  golang.org/x/time v0.5.0 // indirect
- golang.org/x/tools v0.17.0 // indirect
+ golang.org/x/tools v0.19.0 // indirect
  gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
- google.golang.org/protobuf v1.31.0 // indirect
+ google.golang.org/protobuf v1.33.0 // indirect
  gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect