Skip to content

Commit 921a1c0

Browse files
authored
feat(argo): supporting latest argo cd version (#31)
Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
1 parent af9e234 commit 921a1c0

6 files changed

Lines changed: 225 additions & 61 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
/*-toolkit/
66
/pkg/config/testdata/clusters-proxy.yaml
77
taskfiles/
8+
/vendor/

TROUBLESHOOTING.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,8 @@ You can control the container gateway hostname via the `CRI_GATEWAY` environment
1212
- or ip `CRI_GATEWAY=172.18.0.1`
1313

1414
## Argo is behind a reverse proxy (ingress like treafik)
15-
You can add required flags, such as `--grpc-web`, to the argocd commands by adding `ARGOFLAGS` an an environment variable.
16-
Ie, `ARGOFLAGS=--grpc-web`
15+
You can add required flags, such as `--grpc-web`, to the argocd commands by adding `ARGOFLAGS` an environment variable.
16+
Eg, `ARGOFLAGS=--grpc-web`
17+
18+
## How do I see more verbose logs?
19+
Set the environment variable `DEBUG=1` to see more verbose logs.

go.mod

Lines changed: 73 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,124 +1,142 @@
11
module github.com/rumstead/gitops-toolkit
22

3-
go 1.22
3+
go 1.22.4
44

5-
toolchain go1.22.0
5+
toolchain go1.23.2
66

77
require (
88
github.com/ghodss/yaml v1.0.0
9-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
10-
github.com/invopop/jsonschema v0.6.0
11-
github.com/k3d-io/k3d/v5 v5.6.0
9+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0
10+
github.com/invopop/jsonschema v0.12.0
11+
github.com/k3d-io/k3d/v5 v5.7.4
1212
github.com/sirupsen/logrus v1.9.3
13-
github.com/spf13/cobra v1.8.0
13+
github.com/spf13/cobra v1.8.1
1414
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0
15-
google.golang.org/protobuf v1.32.0
15+
google.golang.org/protobuf v1.35.1
1616
)
1717

1818
require (
1919
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
20-
github.com/Microsoft/go-winio v0.6.1 // indirect
20+
github.com/Microsoft/go-winio v0.6.2 // indirect
2121
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
22+
github.com/bahlo/generic-list-go v0.2.0 // indirect
2223
github.com/beorn7/perks v1.0.1 // indirect
23-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
24-
github.com/containerd/containerd v1.7.13 // indirect
24+
github.com/buger/jsonparser v1.1.1 // indirect
25+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
26+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
27+
github.com/containerd/containerd v1.7.22 // indirect
2528
github.com/containerd/log v0.1.0 // indirect
2629
github.com/containerd/stargz-snapshotter/estargz v0.15.1 // indirect
2730
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2831
github.com/dimchansky/utfbom v1.1.1 // indirect
29-
github.com/distribution/reference v0.5.0 // indirect
30-
github.com/docker/cli v25.0.3+incompatible // indirect
32+
github.com/distribution/reference v0.6.0 // indirect
33+
github.com/docker/cli v27.3.1+incompatible // indirect
3134
github.com/docker/distribution v2.8.3+incompatible // indirect
32-
github.com/docker/docker v25.0.3+incompatible // indirect
33-
github.com/docker/docker-credential-helpers v0.8.1 // indirect
35+
github.com/docker/docker v27.3.1+incompatible // indirect
36+
github.com/docker/docker-credential-helpers v0.8.2 // indirect
3437
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
3538
github.com/docker/go-connections v0.5.0 // indirect
3639
github.com/docker/go-metrics v0.0.1 // indirect
3740
github.com/docker/go-units v0.5.0 // indirect
3841
github.com/felixge/httpsnoop v1.0.4 // indirect
3942
github.com/fsnotify/fsnotify v1.7.0 // indirect
4043
github.com/fvbommel/sortorder v1.1.0 // indirect
41-
github.com/go-logr/logr v1.4.1 // indirect
44+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
45+
github.com/go-logr/logr v1.4.2 // indirect
4246
github.com/go-logr/stdr v1.2.2 // indirect
43-
github.com/go-test/deep v1.1.0 // indirect
47+
github.com/go-test/deep v1.1.1 // indirect
4448
github.com/gogo/protobuf v1.3.2 // indirect
45-
github.com/golang/glog v1.1.0 // indirect
46-
github.com/golang/protobuf v1.5.3 // indirect
49+
github.com/golang/glog v1.2.2 // indirect
50+
github.com/golang/protobuf v1.5.4 // indirect
4751
github.com/goodhosts/hostsfile v0.1.6 // indirect
48-
github.com/google/go-containerregistry v0.19.0 // indirect
52+
github.com/google/go-containerregistry v0.20.2 // indirect
4953
github.com/google/gofuzz v1.2.0 // indirect
54+
github.com/google/uuid v1.6.0 // indirect
5055
github.com/gorilla/mux v1.8.1 // indirect
5156
github.com/hashicorp/hcl v1.0.0 // indirect
52-
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 // indirect
57+
github.com/iancoleman/orderedmap v0.3.0 // indirect
5358
github.com/imdario/mergo v0.3.16 // indirect
5459
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5560
github.com/json-iterator/go v1.1.12 // indirect
56-
github.com/klauspost/compress v1.17.6 // indirect
61+
github.com/klauspost/compress v1.17.10 // indirect
5762
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
5863
github.com/magefile/mage v1.15.0 // indirect
5964
github.com/magiconair/properties v1.8.7 // indirect
65+
github.com/mailru/easyjson v0.7.7 // indirect
6066
github.com/miekg/pkcs11 v1.1.1 // indirect
6167
github.com/mitchellh/copystructure v1.2.0 // indirect
6268
github.com/mitchellh/go-homedir v1.1.0 // indirect
6369
github.com/mitchellh/mapstructure v1.5.0 // indirect
6470
github.com/mitchellh/reflectwalk v1.0.2 // indirect
71+
github.com/moby/docker-image-spec v1.3.1 // indirect
6572
github.com/moby/patternmatcher v0.6.0 // indirect
66-
github.com/moby/sys/sequential v0.5.0 // indirect
67-
github.com/moby/sys/user v0.1.0 // indirect
73+
github.com/moby/sys/sequential v0.6.0 // indirect
74+
github.com/moby/sys/user v0.3.0 // indirect
75+
github.com/moby/sys/userns v0.1.0 // indirect
6876
github.com/moby/term v0.5.0 // indirect
6977
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7078
github.com/modern-go/reflect2 v1.0.2 // indirect
79+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7180
github.com/opencontainers/go-digest v1.0.0 // indirect
72-
github.com/opencontainers/image-spec v1.1.0-rc6 // indirect
73-
github.com/pelletier/go-toml/v2 v2.1.1 // indirect
81+
github.com/opencontainers/image-spec v1.1.0 // indirect
82+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
7483
github.com/pkg/errors v0.9.1 // indirect
75-
github.com/prometheus/client_golang v1.18.0 // indirect
76-
github.com/prometheus/client_model v0.5.0 // indirect
77-
github.com/prometheus/common v0.46.0 // indirect
78-
github.com/prometheus/procfs v0.12.0 // indirect
79-
github.com/rancher/wharfie v0.6.5 // indirect
80-
github.com/sagikazarmark/locafero v0.4.0 // indirect
84+
github.com/prometheus/client_golang v1.20.4 // indirect
85+
github.com/prometheus/client_model v0.6.1 // indirect
86+
github.com/prometheus/common v0.60.0 // indirect
87+
github.com/prometheus/procfs v0.15.1 // indirect
88+
github.com/rancher/wharfie v0.6.7 // indirect
89+
github.com/sagikazarmark/locafero v0.6.0 // indirect
8190
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
8291
github.com/sourcegraph/conc v0.3.0 // indirect
8392
github.com/spf13/afero v1.11.0 // indirect
84-
github.com/spf13/cast v1.6.0 // indirect
93+
github.com/spf13/cast v1.7.0 // indirect
8594
github.com/spf13/pflag v1.0.5 // indirect
86-
github.com/spf13/viper v1.18.2 // indirect
95+
github.com/spf13/viper v1.19.0 // indirect
8796
github.com/subosito/gotenv v1.6.0 // indirect
8897
github.com/theupdateframework/notary v0.7.0 // indirect
89-
github.com/vbatts/tar-split v0.11.5 // indirect
98+
github.com/vbatts/tar-split v0.11.6 // indirect
99+
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
100+
github.com/x448/float16 v0.8.4 // indirect
90101
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
91102
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
92103
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
93-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect
94-
go.opentelemetry.io/otel v1.23.1 // indirect
95-
go.opentelemetry.io/otel/metric v1.23.1 // indirect
96-
go.opentelemetry.io/otel/trace v1.23.1 // indirect
104+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
105+
go.opentelemetry.io/otel v1.30.0 // indirect
106+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.30.0 // indirect
107+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect
108+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0 // indirect
109+
go.opentelemetry.io/otel/metric v1.30.0 // indirect
110+
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
111+
go.opentelemetry.io/otel/sdk/metric v1.30.0 // indirect
112+
go.opentelemetry.io/otel/trace v1.30.0 // indirect
113+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
97114
go.uber.org/multierr v1.11.0 // indirect
98115
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
99-
golang.org/x/crypto v0.19.0 // indirect
116+
golang.org/x/crypto v0.28.0 // indirect
100117
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
101-
golang.org/x/mod v0.15.0 // indirect
102-
golang.org/x/net v0.21.0 // indirect
103-
golang.org/x/oauth2 v0.17.0 // indirect
104-
golang.org/x/sync v0.6.0 // indirect
105-
golang.org/x/sys v0.17.0 // indirect
106-
golang.org/x/term v0.17.0 // indirect
107-
golang.org/x/text v0.14.0 // indirect
108-
golang.org/x/time v0.5.0 // indirect
109-
golang.org/x/tools v0.18.0 // indirect
118+
golang.org/x/mod v0.21.0 // indirect
119+
golang.org/x/net v0.30.0 // indirect
120+
golang.org/x/oauth2 v0.23.0 // indirect
121+
golang.org/x/sync v0.8.0 // indirect
122+
golang.org/x/sys v0.26.0 // indirect
123+
golang.org/x/term v0.25.0 // indirect
124+
golang.org/x/text v0.19.0 // indirect
125+
golang.org/x/time v0.7.0 // indirect
126+
golang.org/x/tools v0.26.0 // indirect
110127
google.golang.org/appengine v1.6.8 // indirect
111-
google.golang.org/genproto v0.0.0-20231106174013-bbf56f31fb17 // indirect
112-
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
113-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
128+
google.golang.org/genproto v0.0.0-20240213162025-012b6fc9bca9 // indirect
129+
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
130+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
131+
google.golang.org/grpc v1.67.1 // indirect
114132
gopkg.in/inf.v0 v0.9.1 // indirect
115133
gopkg.in/ini.v1 v1.67.0 // indirect
116134
gopkg.in/yaml.v2 v2.4.0 // indirect
117135
gopkg.in/yaml.v3 v3.0.1 // indirect
118-
k8s.io/apimachinery v0.29.2 // indirect
119-
k8s.io/client-go v0.29.2 // indirect
120-
k8s.io/klog/v2 v2.120.1 // indirect
121-
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
136+
k8s.io/apimachinery v0.31.1 // indirect
137+
k8s.io/client-go v0.31.1 // indirect
138+
k8s.io/klog/v2 v2.130.1 // indirect
139+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
122140
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
123141
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
124142
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)