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

chore: go mod tidy #150

Merged
merged 1 commit into from
Dec 11, 2024
Merged

chore: go mod tidy #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ test:

.PHONY: tidy
tidy:
go mod tidy -go=1.20 -compat=1.20
go mod tidy -go=1.22.0 -compat=1.22

.PHONY: lint
lint:
Expand Down
2 changes: 1 addition & 1 deletion argo-cd
Open in desktop
Submodule argo-cd updated 1900 files
2 changes: 1 addition & 1 deletion gitops-engine
Open in desktop
Submodule gitops-engine updated 41 files
+2 −5 .github/workflows/ci.yaml
+2 −1 .gitignore
+3 −3 .golangci.yaml
+2 −2 Dockerfile
+4 −3 agent/main.go
+101 −87 go.mod
+165 −1,029 go.sum
+18 −0 hack/update_static_schema.sh
+279 −42 pkg/cache/cluster.go
+374 −53 pkg/cache/cluster_test.go
+72 −3 pkg/cache/mocks/ClusterCache.go
+6 −7 pkg/cache/references.go
+105 −0 pkg/cache/references_test.go
+31 −0 pkg/cache/resource.go
+11 −11 pkg/cache/resource_test.go
+12 −0 pkg/cache/settings.go
+233 −51 pkg/diff/diff.go
+58 −2 pkg/diff/diff_options.go
+256 −16 pkg/diff/diff_test.go
+58 −0 pkg/diff/mocks/ServerSideDryRunner.go
+9 −0 pkg/diff/testdata/data.go
+16 −0 pkg/diff/testdata/ssd-service-config.yaml
+55 −0 pkg/diff/testdata/ssd-service-live.yaml
+74 −0 pkg/diff/testdata/ssd-service-predicted-live.json
+2 −2 pkg/engine/engine_options.go
+11 −0 pkg/sync/common/types.go
+25 −7 pkg/sync/reconcile.go
+52 −0 pkg/sync/reconcile_test.go
+13 −4 pkg/sync/resource/annotations.go
+102 −16 pkg/sync/sync_context.go
+365 −12 pkg/sync/sync_context_test.go
+4 −0 pkg/sync/sync_task.go
+1 −0 pkg/utils/io/io.go
+9 −20 pkg/utils/kube/ctl.go
+51 −2 pkg/utils/kube/ctl_test.go
+2 −2 pkg/utils/kube/kube.go
+17 −2 pkg/utils/kube/kubetest/mock_resource_operations.go
+74 −50 pkg/utils/kube/resource_ops.go
+2,912 −842 pkg/utils/kube/scheme/parser.go
+516 −0 pkg/utils/kube/testdata/openapi_v2.json
+190 −0 pkg/utils/kube/uniqueprotomodels.go
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,22 @@ go 1.22.0
toolchain go1.22.9

require (
github.com/bmatcuk/doublestar/v4 v4.7.1
github.com/cert-manager/cert-manager v1.9.0
github.com/gobwas/glob v0.2.3
github.com/samber/lo v1.44.0
github.com/stretchr/testify v1.8.4
github.com/yuin/gopher-lua v1.1.0
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.24.2
k8s.io/apimachinery v0.24.2
layeh.com/gopher-json v0.0.0-20201124131017-552bb3c4c3bf
sigs.k8s.io/yaml v1.3.0
)

require (
github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
Expand All @@ -27,11 +29,9 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/text v0.16.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.24.2 // indirect
k8s.io/klog/v2 v2.70.0 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
Expand Down
6 changes: 2 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm
github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
github.com/bmatcuk/doublestar v1.3.4 h1:gPypJ5xD31uhX6Tf54sDPUOBXTqKH4c9aPY66CyQrS0=
github.com/bmatcuk/doublestar v1.3.4/go.mod h1:wiQtGV+rzVYxB7WIlirSN++5HPtPlXEo9MEoZQC/PmE=
github.com/bmatcuk/doublestar/v4 v4.7.1 h1:fdDeAqgT47acgwd9bd9HxJRDmc9UAmPpc+2m0CXv75Q=
github.com/bmatcuk/doublestar/v4 v4.7.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
Expand Down Expand Up @@ -240,8 +238,9 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
Expand Down Expand Up @@ -829,7 +828,6 @@ golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY=
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
Expand Down
1 change: 0 additions & 1 deletion pkg/health/testdata/Kubernetes/Deployment/deployment-scaling-up.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ metadata:
app.kubernetes.io/version: 6.5.4
app.kubernetes.io/managed-by: Helm
namespace: podinfo
annotations:
annotations:
expected-ready: "false"
expected-status: "Rolling Out"
Expand Down
Loading