Skip to content

Commit 86a3688

Browse files
sivcharisivchari
authored
chore: Bump Kubernetes clients to 1.29.2 (argoproj#566)
* update k8s libs Signed-off-by: sivchari <[email protected]> * fix: golangci-lint Signed-off-by: sivchari <[email protected]> * fix nil map Signed-off-by: sivchari <[email protected]> * add deletion field Signed-off-by: sivchari <[email protected]> --------- Signed-off-by: sivchari <[email protected]>
1 parent fbecbb8 commit 86a3688

File tree

12 files changed

+241
-584
lines changed

12 files changed

+241
-584
lines changed

‎agent/main.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import (
55
"crypto/sha256"
66
"encoding/base64"
77
"fmt"
8-
"github.com/argoproj/gitops-engine/pkg/utils/text"
98
"net/http"
109
"os"
1110
"os/exec"
@@ -15,11 +14,13 @@ import (
1514
"text/tabwriter"
1615
"time"
1716

17+
"github.com/argoproj/gitops-engine/pkg/utils/text"
18+
1819
"github.com/go-logr/logr"
1920
"github.com/spf13/cobra"
2021
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2122
"k8s.io/client-go/tools/clientcmd"
22-
"k8s.io/klog/v2/klogr"
23+
"k8s.io/klog/v2/textlogger"
2324

2425
"github.com/argoproj/gitops-engine/pkg/cache"
2526
"github.com/argoproj/gitops-engine/pkg/engine"
@@ -37,7 +38,7 @@ const (
3738
)
3839

3940
func main() {
40-
log := klogr.New() // Delegates to klog
41+
log := textlogger.NewLogger(textlogger.NewConfig())
4142
err := newCmd(log).Execute()
4243
checkError(err, log)
4344
}

‎go.mod

+80-78
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
module github.com/argoproj/gitops-engine
22

3-
go 1.19
3+
go 1.21
44

55
require (
66
github.com/davecgh/go-spew v1.1.1
77
github.com/evanphx/json-patch v4.12.0+incompatible
8-
github.com/go-logr/logr v1.2.3
8+
github.com/go-logr/logr v1.3.0
99
github.com/golang/mock v1.6.0
10-
github.com/google/gnostic v0.5.7-v3refs
11-
github.com/spf13/cobra v1.6.0
12-
github.com/stretchr/testify v1.8.1
13-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
14-
google.golang.org/protobuf v1.28.1
15-
k8s.io/api v0.26.4
16-
k8s.io/apiextensions-apiserver v0.26.4
17-
k8s.io/apimachinery v0.26.4
18-
k8s.io/cli-runtime v0.26.4
19-
k8s.io/client-go v0.26.4
20-
k8s.io/klog/v2 v2.100.1
21-
k8s.io/kube-aggregator v0.26.4
22-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f
23-
k8s.io/kubectl v0.26.4
24-
k8s.io/kubernetes v1.26.4
10+
github.com/google/gnostic-models v0.6.8
11+
github.com/spf13/cobra v1.7.0
12+
github.com/stretchr/testify v1.8.4
13+
golang.org/x/sync v0.5.0
14+
google.golang.org/protobuf v1.31.0
15+
k8s.io/api v0.29.2
16+
k8s.io/apiextensions-apiserver v0.29.2
17+
k8s.io/apimachinery v0.29.2
18+
k8s.io/cli-runtime v0.29.2
19+
k8s.io/client-go v0.29.2
20+
k8s.io/klog/v2 v2.110.1
21+
k8s.io/kube-aggregator v0.29.2
22+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
23+
k8s.io/kubectl v0.29.2
24+
k8s.io/kubernetes v1.29.2
2525
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
2626
sigs.k8s.io/yaml v1.3.0
2727
)
@@ -31,100 +31,102 @@ require (
3131
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3232
github.com/beorn7/perks v1.0.1 // indirect
3333
github.com/blang/semver/v4 v4.0.0 // indirect
34-
github.com/cespare/xxhash/v2 v2.1.2 // indirect
34+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3535
github.com/chai2010/gettext-go v1.0.2 // indirect
36-
github.com/docker/distribution v2.8.1+incompatible // indirect
37-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
36+
github.com/distribution/reference v0.5.0 // indirect
37+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3838
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
3939
github.com/fatih/camelcase v1.0.0 // indirect
40-
github.com/fvbommel/sortorder v1.0.1 // indirect
41-
github.com/go-errors/errors v1.0.1 // indirect
40+
github.com/fvbommel/sortorder v1.1.0 // indirect
41+
github.com/go-errors/errors v1.4.2 // indirect
4242
github.com/go-openapi/jsonpointer v0.19.6 // indirect
43-
github.com/go-openapi/jsonreference v0.20.1 // indirect
43+
github.com/go-openapi/jsonreference v0.20.2 // indirect
4444
github.com/go-openapi/swag v0.22.3 // indirect
4545
github.com/gogo/protobuf v1.3.2 // indirect
46-
github.com/golang/protobuf v1.5.2 // indirect
46+
github.com/golang/protobuf v1.5.3 // indirect
4747
github.com/google/btree v1.0.1 // indirect
48-
github.com/google/go-cmp v0.5.9 // indirect
49-
github.com/google/gofuzz v1.1.0 // indirect
48+
github.com/google/go-cmp v0.6.0 // indirect
49+
github.com/google/gofuzz v1.2.0 // indirect
5050
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
51-
github.com/google/uuid v1.1.2 // indirect
51+
github.com/google/uuid v1.3.0 // indirect
52+
github.com/gorilla/websocket v1.5.0 // indirect
5253
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
5354
github.com/imdario/mergo v0.3.6 // indirect
54-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
55+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5556
github.com/jonboulle/clockwork v0.2.2 // indirect
5657
github.com/josharian/intern v1.0.0 // indirect
5758
github.com/json-iterator/go v1.1.12 // indirect
5859
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
5960
github.com/mailru/easyjson v0.7.7 // indirect
60-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
61-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
61+
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
62+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
6263
github.com/moby/spdystream v0.2.0 // indirect
63-
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
64+
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
6465
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6566
github.com/modern-go/reflect2 v1.0.2 // indirect
6667
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
6768
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
69+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
6870
github.com/opencontainers/go-digest v1.0.0 // indirect
6971
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7072
github.com/pkg/errors v0.9.1 // indirect
7173
github.com/pmezard/go-difflib v1.0.0 // indirect
72-
github.com/prometheus/client_golang v1.14.0 // indirect
73-
github.com/prometheus/client_model v0.3.0 // indirect
74-
github.com/prometheus/common v0.37.0 // indirect
75-
github.com/prometheus/procfs v0.8.0 // indirect
74+
github.com/prometheus/client_golang v1.16.0 // indirect
75+
github.com/prometheus/client_model v0.4.0 // indirect
76+
github.com/prometheus/common v0.44.0 // indirect
77+
github.com/prometheus/procfs v0.10.1 // indirect
7678
github.com/russross/blackfriday/v2 v2.1.0 // indirect
7779
github.com/spf13/pflag v1.0.5 // indirect
7880
github.com/stretchr/objx v0.5.0 // indirect
79-
github.com/xlab/treeprint v1.1.0 // indirect
80-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
81-
golang.org/x/net v0.7.0 // indirect
82-
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
83-
golang.org/x/sys v0.5.0 // indirect
84-
golang.org/x/term v0.5.0 // indirect
85-
golang.org/x/text v0.7.0 // indirect
86-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
81+
github.com/xlab/treeprint v1.2.0 // indirect
82+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
83+
golang.org/x/net v0.19.0 // indirect
84+
golang.org/x/oauth2 v0.10.0 // indirect
85+
golang.org/x/sys v0.15.0 // indirect
86+
golang.org/x/term v0.15.0 // indirect
87+
golang.org/x/text v0.14.0 // indirect
88+
golang.org/x/time v0.3.0 // indirect
8789
google.golang.org/appengine v1.6.7 // indirect
8890
gopkg.in/inf.v0 v0.9.1 // indirect
8991
gopkg.in/yaml.v2 v2.4.0 // indirect
9092
gopkg.in/yaml.v3 v3.0.1 // indirect
91-
k8s.io/apiserver v0.26.4 // indirect
92-
k8s.io/component-base v0.26.4 // indirect
93-
k8s.io/component-helpers v0.26.4 // indirect
94-
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
93+
k8s.io/apiserver v0.29.2 // indirect
94+
k8s.io/component-base v0.29.2 // indirect
95+
k8s.io/component-helpers v0.29.2 // indirect
96+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
9597
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
96-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
97-
sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
98+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
99+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
98100
)
99101

100102
replace (
101-
k8s.io/api => k8s.io/api v0.26.4
102-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.4
103-
k8s.io/apimachinery => k8s.io/apimachinery v0.26.4
104-
k8s.io/apiserver => k8s.io/apiserver v0.26.4
105-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.26.4
106-
k8s.io/client-go => k8s.io/client-go v0.26.4
107-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.4
108-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.4
109-
k8s.io/code-generator => k8s.io/code-generator v0.26.4
110-
k8s.io/component-base => k8s.io/component-base v0.26.4
111-
k8s.io/component-helpers => k8s.io/component-helpers v0.26.4
112-
k8s.io/controller-manager => k8s.io/controller-manager v0.26.4
113-
k8s.io/cri-api => k8s.io/cri-api v0.26.4
114-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.26.4
115-
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.26.4
116-
k8s.io/kms => k8s.io/kms v0.26.4
117-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.26.4
118-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.26.4
119-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.26.4
120-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.26.4
121-
k8s.io/kubectl => k8s.io/kubectl v0.26.4
122-
k8s.io/kubelet => k8s.io/kubelet v0.26.4
123-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.26.4
124-
k8s.io/metrics => k8s.io/metrics v0.26.4
125-
k8s.io/mount-utils => k8s.io/mount-utils v0.26.4
126-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.26.4
127-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.26.4
128-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.26.4
129-
k8s.io/sample-controller => k8s.io/sample-controller v0.26.4
103+
k8s.io/api => k8s.io/api v0.29.2
104+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.2
105+
k8s.io/apimachinery => k8s.io/apimachinery v0.29.2
106+
k8s.io/apiserver => k8s.io/apiserver v0.29.2
107+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.2
108+
k8s.io/client-go => k8s.io/client-go v0.29.2
109+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.2
110+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.2
111+
k8s.io/code-generator => k8s.io/code-generator v0.29.2
112+
k8s.io/component-base => k8s.io/component-base v0.29.2
113+
k8s.io/component-helpers => k8s.io/component-helpers v0.29.2
114+
k8s.io/controller-manager => k8s.io/controller-manager v0.29.2
115+
k8s.io/cri-api => k8s.io/cri-api v0.29.2
116+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.2
117+
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.2
118+
k8s.io/kms => k8s.io/kms v0.29.2
119+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.2
120+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.2
121+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.2
122+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.2
123+
k8s.io/kubectl => k8s.io/kubectl v0.29.2
124+
k8s.io/kubelet => k8s.io/kubelet v0.29.2
125+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.2
126+
k8s.io/metrics => k8s.io/metrics v0.29.2
127+
k8s.io/mount-utils => k8s.io/mount-utils v0.29.2
128+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.2
129+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.2
130+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.2
131+
k8s.io/sample-controller => k8s.io/sample-controller v0.29.2
130132
)

0 commit comments

Comments
 (0)