diff --git a/kubewatch/go.mod b/kubewatch/go.mod index 37d3c5191..314c1e3ab 100644 --- a/kubewatch/go.mod +++ b/kubewatch/go.mod @@ -1,11 +1,11 @@ module github.com/devtron-labs/kubewatch -go 1.24.2 +go 1.24.6 -toolchain go1.24.3 +toolchain go1.24.7 require ( - github.com/argoproj/argo-cd/v2 v2.14.13 + github.com/argoproj/argo-cd/v2 v2.14.17 github.com/argoproj/argo-workflows/v3 v3.6.7 github.com/argoproj/gitops-engine v0.7.1-0.20250521000818-c08b0a72c1f1 github.com/caarlos0/env v3.5.0+incompatible diff --git a/kubewatch/go.sum b/kubewatch/go.sum index 9c83775e3..5e5fc888d 100644 --- a/kubewatch/go.sum +++ b/kubewatch/go.sum @@ -42,8 +42,8 @@ github.com/alicebob/miniredis/v2 v2.33.0/go.mod h1:MhP4a3EU7aENRi9aO+tHfTBZicLqQ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8= github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/argoproj/argo-cd/v2 v2.14.13 h1:oSLPHV9Gon6mEqVkyBOuLJ7T16ShZv6xSjkCiquzEDM= -github.com/argoproj/argo-cd/v2 v2.14.13/go.mod h1:P72XxcRigWQpQsuAgaXyHPFYkSPE4sdACA5g/s3Si1I= +github.com/argoproj/argo-cd/v2 v2.14.17 h1:r/CkYKzHoPjGgJ/4/fdubUVpG+LBj6AtOigbitNHgy4= +github.com/argoproj/argo-cd/v2 v2.14.17/go.mod h1:CF9GX0CjKiszpAnvYNCLV5tLSVqgfOgn/tcOt2VHTQo= github.com/argoproj/argo-events v1.9.6 h1:tQTyUmMt0/4UI+9fbXrmK1/h9oalV7KBCC3YgPI7qz0= github.com/argoproj/argo-events v1.9.6/go.mod h1:MkJI9UXTLnLOFX6LKo0rC1tnvWfLFzKkGigsdfu58SA= github.com/argoproj/argo-workflows/v3 v3.6.7 h1:3vT0ygPVtZxSSUaZsCeI+Th/Bm9Cfc2J1FQOGe2iKoM= diff --git a/kubewatch/vendor/github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/repository_types.go b/kubewatch/vendor/github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/repository_types.go index 047ae14b1..33d50b513 100644 --- a/kubewatch/vendor/github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/repository_types.go +++ b/kubewatch/vendor/github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/repository_types.go @@ -290,7 +290,6 @@ func (m *Repository) Sanitized() *Repository { Repo: m.Repo, Type: m.Type, Name: m.Name, - Username: m.Username, Insecure: m.IsInsecure(), EnableLFS: m.EnableLFS, EnableOCI: m.EnableOCI, diff --git a/kubewatch/vendor/github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/types.go b/kubewatch/vendor/github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/types.go index 524f574f8..6eedbfd91 100644 --- a/kubewatch/vendor/github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/types.go +++ b/kubewatch/vendor/github.com/argoproj/argo-cd/v2/pkg/apis/application/v1alpha1/types.go @@ -2099,6 +2099,32 @@ type Cluster struct { Annotations map[string]string `json:"annotations,omitempty" protobuf:"bytes,13,opt,name=annotations"` } +func (c *Cluster) Sanitized() *Cluster { + return &Cluster{ + ID: c.ID, + Server: c.Server, + Name: c.Name, + Project: c.Project, + Namespaces: c.Namespaces, + Shard: c.Shard, + Labels: c.Labels, + Annotations: c.Annotations, + ClusterResources: c.ClusterResources, + ConnectionState: c.ConnectionState, + ServerVersion: c.ServerVersion, + Info: c.Info, + RefreshRequestedAt: c.RefreshRequestedAt, + Config: ClusterConfig{ + AWSAuthConfig: c.Config.AWSAuthConfig, + ProxyUrl: c.Config.ProxyUrl, + DisableCompression: c.Config.DisableCompression, + TLSClientConfig: TLSClientConfig{ + Insecure: c.Config.Insecure, + }, + }, + } +} + // Equals returns true if two cluster objects are considered to be equal func (c *Cluster) Equals(other *Cluster) bool { if c.Server != other.Server { diff --git a/kubewatch/vendor/modules.txt b/kubewatch/vendor/modules.txt index 20312f827..992380f23 100644 --- a/kubewatch/vendor/modules.txt +++ b/kubewatch/vendor/modules.txt @@ -51,8 +51,8 @@ github.com/ProtonMail/go-crypto/openpgp/packet github.com/ProtonMail/go-crypto/openpgp/s2k github.com/ProtonMail/go-crypto/openpgp/x25519 github.com/ProtonMail/go-crypto/openpgp/x448 -# github.com/argoproj/argo-cd/v2 v2.14.13 -## explicit; go 1.23.0 +# github.com/argoproj/argo-cd/v2 v2.14.17 +## explicit; go 1.24.6 github.com/argoproj/argo-cd/v2/assets github.com/argoproj/argo-cd/v2/common github.com/argoproj/argo-cd/v2/pkg/apis/application