Bump kubernetes to 1.28.4

.github/workflows/ci.yaml

@@ -10,7 +10,7 @@ on:
  - 'master'
 env:
  # Golang version to use across CI steps
- GOLANG_VERSION: '1.19'
+ GOLANG_VERSION: '1.21'
 jobs:
  test:
  runs-on: ubuntu-latest
@@ -29,7 +29,7 @@ jobs:
  - name: Run golangci-lint
  uses: golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5 # v3.4.0
  with:
- version: v1.51.0
+ version: v1.55.2
  args: --timeout 5m
  - uses: codecov/[email protected]
  with:

go.mod

@@ -1,28 +1,28 @@
 module github.com/argoproj/gitops-engine
 
-go 1.19
+go 1.21
 
 require (
  github.com/davecgh/go-spew v1.1.1
  github.com/evanphx/json-patch v4.12.0+incompatible
- github.com/go-logr/logr v1.2.3
+ github.com/go-logr/logr v1.2.4
  github.com/golang/mock v1.6.0
- github.com/google/gnostic v0.5.7-v3refs
- github.com/spf13/cobra v1.6.0
- github.com/stretchr/testify v1.8.1
- golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
- google.golang.org/protobuf v1.28.1
- k8s.io/api v0.26.4
- k8s.io/apiextensions-apiserver v0.26.4
- k8s.io/apimachinery v0.26.4
- k8s.io/cli-runtime v0.26.4
- k8s.io/client-go v0.26.4
+ github.com/google/gnostic v0.7.0
+ github.com/spf13/cobra v1.7.0
+ github.com/stretchr/testify v1.8.2
+ golang.org/x/sync v0.3.0
+ google.golang.org/protobuf v1.31.0
+ k8s.io/api v0.28.4
+ k8s.io/apiextensions-apiserver v0.28.4
+ k8s.io/apimachinery v0.28.4
+ k8s.io/cli-runtime v0.28.4
+ k8s.io/client-go v0.28.4
  k8s.io/klog/v2 v2.100.1
- k8s.io/kube-aggregator v0.26.4
- k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
- k8s.io/kubectl v0.26.4
- k8s.io/kubernetes v1.26.4
- sigs.k8s.io/structured-merge-diff/v4 v4.2.3
+ k8s.io/kube-aggregator v0.28.4
+ k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
+ k8s.io/kubectl v0.28.4
+ k8s.io/kubernetes v1.28.4
+ sigs.k8s.io/structured-merge-diff/v4 v4.4.1
  sigs.k8s.io/yaml v1.3.0
 )
 
@@ -31,36 +31,37 @@ require (
  github.com/MakeNowJust/heredoc v1.0.0 // indirect
  github.com/beorn7/perks v1.0.1 // indirect
  github.com/blang/semver/v4 v4.0.0 // indirect
- github.com/cespare/xxhash/v2 v2.1.2 // indirect
+ github.com/cespare/xxhash/v2 v2.2.0 // indirect
  github.com/chai2010/gettext-go v1.0.2 // indirect
- github.com/docker/distribution v2.8.1+incompatible // indirect
+ github.com/docker/distribution v2.8.2+incompatible // indirect
  github.com/emicklei/go-restful/v3 v3.9.0 // indirect
  github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
  github.com/fatih/camelcase v1.0.0 // indirect
- github.com/fvbommel/sortorder v1.0.1 // indirect
- github.com/go-errors/errors v1.0.1 // indirect
+ github.com/fvbommel/sortorder v1.1.0 // indirect
+ github.com/go-errors/errors v1.4.2 // indirect
  github.com/go-openapi/jsonpointer v0.19.6 // indirect
- github.com/go-openapi/jsonreference v0.20.1 // indirect
+ github.com/go-openapi/jsonreference v0.20.2 // indirect
  github.com/go-openapi/swag v0.22.3 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
- github.com/golang/protobuf v1.5.2 // indirect
+ github.com/golang/protobuf v1.5.3 // indirect
  github.com/google/btree v1.0.1 // indirect
+ github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
  github.com/google/go-cmp v0.5.9 // indirect
- github.com/google/gofuzz v1.1.0 // indirect
+ github.com/google/gofuzz v1.2.0 // indirect
  github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
- github.com/google/uuid v1.1.2 // indirect
+ github.com/google/uuid v1.3.0 // indirect
  github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
  github.com/imdario/mergo v0.3.6 // indirect
- github.com/inconshreveable/mousetrap v1.0.1 // indirect
+ github.com/inconshreveable/mousetrap v1.1.0 // indirect
  github.com/jonboulle/clockwork v0.2.2 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  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 v1.0.2 // indirect
- github.com/mitchellh/go-wordwrap v1.0.0 // indirect
+ github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+ github.com/mitchellh/go-wordwrap v1.0.1 // indirect
  github.com/moby/spdystream v0.2.0 // indirect
- github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
+ github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // 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
@@ -69,62 +70,63 @@ require (
  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.14.0 // indirect
- github.com/prometheus/client_model v0.3.0 // indirect
- github.com/prometheus/common v0.37.0 // indirect
- github.com/prometheus/procfs v0.8.0 // indirect
+ github.com/prometheus/client_golang v1.16.0 // indirect
+ github.com/prometheus/client_model v0.4.0 // indirect
+ github.com/prometheus/common v0.44.0 // indirect
+ github.com/prometheus/procfs v0.10.1 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
  github.com/stretchr/objx v0.5.0 // indirect
- github.com/xlab/treeprint v1.1.0 // indirect
- go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
- golang.org/x/net v0.7.0 // indirect
- golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
- golang.org/x/sys v0.5.0 // indirect
- golang.org/x/term v0.5.0 // indirect
- golang.org/x/text v0.7.0 // indirect
- golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+ github.com/xlab/treeprint v1.2.0 // indirect
+ go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
+ golang.org/x/net v0.17.0 // indirect
+ golang.org/x/oauth2 v0.8.0 // indirect
+ golang.org/x/sys v0.13.0 // indirect
+ golang.org/x/term v0.13.0 // indirect
+ golang.org/x/text v0.13.0 // indirect
+ golang.org/x/time v0.3.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
  gopkg.in/inf.v0 v0.9.1 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
- k8s.io/apiserver v0.26.4 // indirect
- k8s.io/component-base v0.26.4 // indirect
- k8s.io/component-helpers v0.26.4 // indirect
- k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
+ k8s.io/apiserver v0.28.4 // indirect
+ k8s.io/component-base v0.28.4 // indirect
+ k8s.io/component-helpers v0.28.4 // indirect
+ k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
  sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
- sigs.k8s.io/kustomize/api v0.12.1 // indirect
- sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
+ sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
+ sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
 )
 
 replace (
- k8s.io/api => k8s.io/api v0.26.4
- k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.4
- k8s.io/apimachinery => k8s.io/apimachinery v0.26.4
- k8s.io/apiserver => k8s.io/apiserver v0.26.4
- k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.4
- k8s.io/client-go => k8s.io/client-go v0.26.4
- k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.4
- k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.4
- k8s.io/code-generator => k8s.io/code-generator v0.26.4
- k8s.io/component-base => k8s.io/component-base v0.26.4
- k8s.io/component-helpers => k8s.io/component-helpers v0.26.4
- k8s.io/controller-manager => k8s.io/controller-manager v0.26.4
- k8s.io/cri-api => k8s.io/cri-api v0.26.4
- k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.4
- k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.4
- k8s.io/kms => k8s.io/kms v0.26.4
- k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.4
- k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.4
- k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.4
- k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.4
- k8s.io/kubectl => k8s.io/kubectl v0.26.4
- k8s.io/kubelet => k8s.io/kubelet v0.26.4
- k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.4
- k8s.io/metrics => k8s.io/metrics v0.26.4
- k8s.io/mount-utils => k8s.io/mount-utils v0.26.4
- k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.4
- k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.4
- k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.4
- k8s.io/sample-controller => k8s.io/sample-controller v0.26.4
+ k8s.io/api => k8s.io/api v0.28.4
+ k8s.io/endpointslice => k8s.io/endpointslice v0.28.4
+ k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.4
+ k8s.io/apimachinery => k8s.io/apimachinery v0.28.4
+ k8s.io/apiserver => k8s.io/apiserver v0.28.4
+ k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.4
+ k8s.io/client-go => k8s.io/client-go v0.28.4
+ k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.4
+ k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.4
+ k8s.io/code-generator => k8s.io/code-generator v0.28.4
+ k8s.io/component-base => k8s.io/component-base v0.28.4
+ k8s.io/component-helpers => k8s.io/component-helpers v0.28.4
+ k8s.io/controller-manager => k8s.io/controller-manager v0.28.4
+ k8s.io/cri-api => k8s.io/cri-api v0.28.4
+ k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.4
+ k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.28.4
+ k8s.io/kms => k8s.io/kms v0.28.4
+ k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.4
+ k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.4
+ k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.4
+ k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.4
+ k8s.io/kubectl => k8s.io/kubectl v0.28.4
+ k8s.io/kubelet => k8s.io/kubelet v0.28.4
+ k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.4
+ k8s.io/metrics => k8s.io/metrics v0.28.4
+ k8s.io/mount-utils => k8s.io/mount-utils v0.28.4
+ k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.4
+ k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.4
+ k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.4
+ k8s.io/sample-controller => k8s.io/sample-controller v0.28.4
 )