Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): bump k8s libs from 0.29.6 to 0.30.4 #19074

Merged
merged 12 commits into from
Aug 23, 2024
Merged

chore(deps): bump k8s libs from 0.29.6 to 0.30.4 #19074

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7bb2aa8
chore(deps): bump k8s libs from 0.29.6 to 0.30.2
crenshaw-dev Jul 15, 2024
6b21113
latest commit
crenshaw-dev Jul 15, 2024
ce6b4f4
update known types
crenshaw-dev Jul 18, 2024
8bd9ccd
bump controller-runtime to a version that's compatible with go-client…
crenshaw-dev Jul 18, 2024
ce910e2
update go-to-protobuf flag
crenshaw-dev Jul 19, 2024
aaeedf6
handle new requirements for proto file locations
crenshaw-dev Aug 19, 2024
743e3a0
merge master
crenshaw-dev Aug 19, 2024
338c685
bump gitops-engine version
crenshaw-dev Aug 19, 2024
e2e8d0e
fix openapigen
crenshaw-dev Aug 19, 2024
ed8516b
remove toolchain
crenshaw-dev Aug 20, 2024
c41326d
bump gitops-engine version
crenshaw-dev Aug 20, 2024
8e4223c
no need for replace now
crenshaw-dev Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions assets/swagger.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

98 changes: 50 additions & 48 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/argoproj/argo-cd/v2

go 1.21.0
go 1.22.0

require (
code.gitea.io/sdk/gitea v0.19.0
Expand Down Expand Up @@ -94,19 +94,19 @@ require (
google.golang.org/protobuf v1.34.2
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.29.6
k8s.io/apiextensions-apiserver v0.29.6
k8s.io/apimachinery v0.29.6
k8s.io/apiserver v0.29.6
k8s.io/client-go v0.29.6
k8s.io/code-generator v0.29.6
k8s.io/klog/v2 v2.110.1
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
k8s.io/kubectl v0.29.6
k8s.io/api v0.30.4
k8s.io/apiextensions-apiserver v0.31.2
k8s.io/apimachinery v0.30.4
k8s.io/apiserver v0.30.4
k8s.io/client-go v0.30.4
k8s.io/code-generator v0.30.4
k8s.io/klog/v2 v2.120.1
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
k8s.io/kubectl v0.31.2
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
layeh.com/gopher-json v0.0.0-20190114024228-97fed8db8427
oras.land/oras-go/v2 v2.5.0
sigs.k8s.io/controller-runtime v0.17.2
sigs.k8s.io/controller-runtime v0.18.4
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
sigs.k8s.io/yaml v1.4.0
)
Expand Down Expand Up @@ -155,6 +155,7 @@ require (
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
gopkg.in/retry.v1 v1.0.3 // indirect
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
k8s.io/klog v1.0.0 // indirect
nhooyr.io/websocket v1.8.7 // indirect
)
Expand Down Expand Up @@ -188,7 +189,7 @@ require (
github.com/dlclark/regexp2 v1.11.4
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emirpasic/gods v1.18.1 // indirect
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/evanphx/json-patch/v5 v5.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.1.0 // indirect
Expand Down Expand Up @@ -280,18 +281,19 @@ require (
gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
k8s.io/cli-runtime v0.29.6 // indirect
k8s.io/component-base v0.29.6 // indirect
k8s.io/component-helpers v0.29.6 // indirect
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
k8s.io/kube-aggregator v0.29.6 // indirect
k8s.io/kubernetes v1.29.6 // indirect
k8s.io/cli-runtime v0.30.4 // indirect
k8s.io/component-base v0.30.4 // indirect
k8s.io/component-helpers v0.30.4 // indirect
k8s.io/kube-aggregator v0.31.2 // indirect
k8s.io/kubernetes v1.30.4 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // 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 (
github.com/argoproj/gitops-engine => github.com/sivchari/gitops-engine v0.0.0-20240820144913-48307b8c3346
crenshaw-dev marked this conversation as resolved.
Show resolved Hide resolved

// https://github.com/golang/go/issues/33546#issuecomment-519656923
github.com/go-check/check => github.com/go-check/check v0.0.0-20180628173108-788fd7840127

Expand All @@ -306,34 +308,34 @@ replace (
// Avoid CVE-2022-28948
gopkg.in/yaml.v3 => gopkg.in/yaml.v3 v3.0.1

k8s.io/api => k8s.io/api v0.29.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.6
k8s.io/apimachinery => k8s.io/apimachinery v0.29.6
k8s.io/apiserver => k8s.io/apiserver v0.29.6
k8s.io/cli-runtime => k8s.io/cli-runtime v0.29.6
k8s.io/client-go => k8s.io/client-go v0.29.6
k8s.io/cloud-provider => k8s.io/cloud-provider v0.29.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.29.6
k8s.io/code-generator => k8s.io/code-generator v0.29.6
k8s.io/component-base => k8s.io/component-base v0.29.6
k8s.io/component-helpers => k8s.io/component-helpers v0.29.6
k8s.io/controller-manager => k8s.io/controller-manager v0.29.6
k8s.io/cri-api => k8s.io/cri-api v0.29.6
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.29.6
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.29.6
k8s.io/endpointslice => k8s.io/endpointslice v0.29.6
k8s.io/kms => k8s.io/kms v0.29.6
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.29.6
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.29.6
k8s.io/kube-proxy => k8s.io/kube-proxy v0.29.6
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.29.6
k8s.io/kubectl => k8s.io/kubectl v0.29.6
k8s.io/kubelet => k8s.io/kubelet v0.29.6
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.29.6
k8s.io/metrics => k8s.io/metrics v0.29.6
k8s.io/mount-utils => k8s.io/mount-utils v0.29.6
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.29.6
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.29.6
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.29.6
k8s.io/sample-controller => k8s.io/sample-controller v0.29.6
k8s.io/api => k8s.io/api v0.30.4
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.30.4
k8s.io/apimachinery => k8s.io/apimachinery v0.30.4
k8s.io/apiserver => k8s.io/apiserver v0.30.4
k8s.io/cli-runtime => k8s.io/cli-runtime v0.30.4
k8s.io/client-go => k8s.io/client-go v0.30.4
k8s.io/cloud-provider => k8s.io/cloud-provider v0.30.4
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.30.4
k8s.io/code-generator => k8s.io/code-generator v0.30.4
k8s.io/component-base => k8s.io/component-base v0.30.4
k8s.io/component-helpers => k8s.io/component-helpers v0.30.4
k8s.io/controller-manager => k8s.io/controller-manager v0.30.4
k8s.io/cri-api => k8s.io/cri-api v0.30.4
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.30.4
k8s.io/dynamic-resource-allocation => k8s.io/dynamic-resource-allocation v0.30.4
k8s.io/endpointslice => k8s.io/endpointslice v0.30.4
k8s.io/kms => k8s.io/kms v0.30.4
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.30.4
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.30.4
k8s.io/kube-proxy => k8s.io/kube-proxy v0.30.4
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.30.4
k8s.io/kubectl => k8s.io/kubectl v0.30.4
k8s.io/kubelet => k8s.io/kubelet v0.30.4
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.30.4
k8s.io/metrics => k8s.io/metrics v0.30.4
k8s.io/mount-utils => k8s.io/mount-utils v0.30.4
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.30.4
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.30.4
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.30.4
k8s.io/sample-controller => k8s.io/sample-controller v0.30.4
)
Loading