diff --git a/Makefile b/Makefile index 42b1c21..dcb0b3b 100644 --- a/Makefile +++ b/Makefile @@ -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: diff --git a/argo-cd b/argo-cd index c2dfab5..2f51067 160000 --- a/argo-cd +++ b/argo-cd @@ -1 +1 @@ -Subproject commit c2dfab5560cbe2bbc0daec31814a1eae57e9c363 +Subproject commit 2f51067e7559ae705d823b979eb8244cf24678c1 diff --git a/gitops-engine b/gitops-engine index 425d65e..0371401 160000 --- a/gitops-engine +++ b/gitops-engine @@ -1 +1 @@ -Subproject commit 425d65e07695a741d90b248f2f365f6a4329c23d +Subproject commit 0371401803996f84bcd70a5f6bb2f0ecc7d7b5d2 diff --git a/go.mod b/go.mod index a0531a8..33b306a 100644 --- a/go.mod +++ b/go.mod @@ -5,12 +5,15 @@ 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 @@ -18,7 +21,6 @@ require ( ) 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 @@ -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 diff --git a/go.sum b/go.sum index 3befd97..06d4100 100644 --- a/go.sum +++ b/go.sum @@ -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= @@ -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= @@ -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= diff --git a/pkg/health/testdata/Kubernetes/Deployment/deployment-scaling-up.yaml b/pkg/health/testdata/Kubernetes/Deployment/deployment-scaling-up.yaml index 9d1b46d..21f5b7b 100644 --- a/pkg/health/testdata/Kubernetes/Deployment/deployment-scaling-up.yaml +++ b/pkg/health/testdata/Kubernetes/Deployment/deployment-scaling-up.yaml @@ -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"