Skip to content

Commit ab4cb95

Browse files
carlmontanaricarlmontanari
authored
Merge pull request #167 from srl-labs/chore/fix-ui-tagging
Chore/fix UI tagging
2 parents 425440d + 31eb066 commit ab4cb95

File tree

6 files changed

+121
-276
lines changed

6 files changed

+121
-276
lines changed

‎.develop/devspace.yaml

+18
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,16 @@ profiles:
205205
path: images.clabernetes-launcher.buildArgs.VERSION
206206
value: ${RELEASE_VERSION}
207207

208+
- op: replace
209+
path: images.clabernetes-ui.tags
210+
value:
211+
- latest
212+
- ${RELEASE_VERSION}
213+
- ${COMMIT_HASH}
214+
- op: replace
215+
path: images.clabernetes-ui.buildArgs.VERSION
216+
value: ${RELEASE_VERSION}
217+
208218
- op: replace
209219
path: images.clabverter.tags
210220
value:
@@ -235,6 +245,14 @@ profiles:
235245
path: images.clabernetes-launcher.buildArgs.VERSION
236246
value: ${RELEASE_VERSION}
237247

248+
- op: replace
249+
path: images.clabernetes-ui.tags
250+
value:
251+
- ${RELEASE_VERSION}
252+
- op: replace
253+
path: images.clabernetes-ui.buildArgs.VERSION
254+
value: ${RELEASE_VERSION}
255+
238256
- op: replace
239257
path: images.clabverter.tags
240258
value:

‎.github/vars.env

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ GO_VERSION=1.22
22
DEVSPACE_VERSION=v6.3.12
33
GCI_VERSION=v0.13.4
44
GOFUMPT_VERSION=v0.6.0
5-
GOLANGCI_LINT_VERSION=v1.58.0
5+
GOLANGCI_LINT_VERSION=v1.59.1
66
GOLINES_VERSION=v0.12.2
7-
GOTESTSUM_VERSION=v1.11.0
8-
HELM_VERSION=v3.14.2
9-
GORELEASER_VERSION=v1.24.0
7+
GOTESTSUM_VERSION=v1.12.0
8+
HELM_VERSION=v3.15.3
9+
GORELEASER_VERSION=v2.1.0

‎.golangci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,4 +189,4 @@ output:
189189
uniq-by-line: false
190190

191191
service:
192-
golangci-lint-version: 1.57.x
192+
golangci-lint-version: 1.59.x

‎go.mod

+30-72
Original file line numberDiff line numberDiff line change
@@ -6,113 +6,71 @@ require (
66
github.com/carlmontanari/difflibgo v0.0.0-20240227210139-93685b1c22ae
77
github.com/carlmontanari/slurpeeth v0.0.0-20240209224827-246fa87e31f3
88
github.com/openconfig/kne v0.1.18
9-
github.com/urfave/cli/v2 v2.27.2
9+
github.com/urfave/cli/v2 v2.27.4
1010
google.golang.org/protobuf v1.34.2
1111
gopkg.in/yaml.v3 v3.0.1
12-
k8s.io/api v0.30.3
13-
k8s.io/apiextensions-apiserver v0.30.3
14-
k8s.io/apimachinery v0.30.3
15-
// pin back to help controller-runtime out
12+
k8s.io/api v0.30.1
13+
k8s.io/apiextensions-apiserver v0.30.1
14+
k8s.io/apimachinery v0.30.1
15+
// pin back to help controller-runtime out (until v0.19.0)
1616
// https://github.com/kubernetes-sigs/controller-runtime/issues/2788
17-
k8s.io/client-go v0.30.3
17+
// and actually this is all the k8s things really, and there is another thing in admission
18+
// webhook that makes this need to be pinned back (in ctrlruntime)
19+
k8s.io/client-go v0.30.1
1820
k8s.io/klog/v2 v2.130.1
19-
k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f
20-
sigs.k8s.io/controller-runtime v0.18.4
21+
k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f
22+
sigs.k8s.io/controller-runtime v0.18.5
2123
sigs.k8s.io/yaml v1.4.0
2224
)
2325

24-
require golang.org/x/crypto v0.25.0
26+
require golang.org/x/crypto v0.26.0
2527

2628
require (
27-
github.com/NYTimes/gziphandler v1.1.1 // indirect
28-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
29-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
3029
github.com/beorn7/perks v1.0.1 // indirect
31-
github.com/blang/semver/v4 v4.0.0 // indirect
32-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
33-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
34-
github.com/coreos/go-semver v0.3.1 // indirect
35-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
30+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3631
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
3732
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
38-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
33+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
3934
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
4035
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
41-
github.com/felixge/httpsnoop v1.0.3 // indirect
4236
github.com/fsnotify/fsnotify v1.7.0 // indirect
43-
github.com/go-logr/logr v1.4.1 // indirect
44-
github.com/go-logr/stdr v1.2.2 // indirect
45-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
46-
github.com/go-openapi/jsonreference v0.20.2 // indirect
47-
github.com/go-openapi/swag v0.22.4 // indirect
37+
github.com/go-logr/logr v1.4.2 // indirect
38+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
39+
github.com/go-openapi/jsonreference v0.21.0 // indirect
40+
github.com/go-openapi/swag v0.23.0 // indirect
4841
github.com/gogo/protobuf v1.3.2 // indirect
4942
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5043
github.com/golang/protobuf v1.5.4 // indirect
51-
github.com/google/cel-go v0.17.8 // indirect
5244
github.com/google/gnostic-models v0.6.8 // indirect
5345
github.com/google/go-cmp v0.6.0 // indirect
5446
github.com/google/gofuzz v1.2.0 // indirect
55-
github.com/google/uuid v1.4.0 // indirect
56-
github.com/gorilla/websocket v1.5.0 // indirect
57-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
58-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
47+
github.com/google/uuid v1.6.0 // indirect
5948
github.com/imdario/mergo v0.3.15 // indirect
60-
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6149
github.com/josharian/intern v1.0.0 // indirect
6250
github.com/json-iterator/go v1.1.12 // indirect
6351
github.com/mailru/easyjson v0.7.7 // indirect
64-
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
65-
github.com/moby/spdystream v0.2.0 // indirect
6652
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6753
github.com/modern-go/reflect2 v1.0.2 // indirect
6854
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
69-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
7055
github.com/pkg/errors v0.9.1 // indirect
71-
github.com/prometheus/client_golang v1.18.0 // indirect
72-
github.com/prometheus/client_model v0.5.0 // indirect
73-
github.com/prometheus/common v0.45.0 // indirect
74-
github.com/prometheus/procfs v0.12.0 // indirect
56+
github.com/prometheus/client_golang v1.19.1 // indirect
57+
github.com/prometheus/client_model v0.6.1 // indirect
58+
github.com/prometheus/common v0.55.0 // indirect
59+
github.com/prometheus/procfs v0.15.1 // indirect
7560
github.com/russross/blackfriday/v2 v2.1.0 // indirect
76-
github.com/spf13/cobra v1.8.0 // indirect
7761
github.com/spf13/pflag v1.0.5 // indirect
78-
github.com/stoewer/go-strcase v1.2.0 // indirect
79-
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
80-
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
81-
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
82-
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
83-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
84-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
85-
go.opentelemetry.io/otel v1.19.0 // indirect
86-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
87-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
88-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
89-
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
90-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
91-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
92-
go.uber.org/multierr v1.11.0 // indirect
93-
go.uber.org/zap v1.26.0 // indirect
94-
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
95-
golang.org/x/net v0.24.0 // indirect
96-
golang.org/x/oauth2 v0.13.0 // indirect
97-
golang.org/x/sync v0.7.0 // indirect
98-
golang.org/x/sys v0.22.0 // indirect
99-
golang.org/x/term v0.22.0 // indirect
100-
golang.org/x/text v0.16.0 // indirect
62+
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
63+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
64+
golang.org/x/net v0.28.0 // indirect
65+
golang.org/x/oauth2 v0.21.0 // indirect
66+
golang.org/x/sys v0.23.0 // indirect
67+
golang.org/x/term v0.23.0 // indirect
68+
golang.org/x/text v0.17.0 // indirect
10169
golang.org/x/time v0.3.0 // indirect
10270
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
103-
google.golang.org/appengine v1.6.8 // indirect
104-
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
105-
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
106-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
107-
google.golang.org/grpc v1.60.1 // indirect
10871
gopkg.in/inf.v0 v0.9.1 // indirect
109-
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
11072
gopkg.in/yaml.v2 v2.4.0 // indirect
111-
k8s.io/apiserver v0.30.3 // indirect
112-
k8s.io/component-base v0.30.3 // indirect
113-
k8s.io/kms v0.30.3 // indirect
114-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
115-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
73+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
11674
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
11775
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
11876
)

0 commit comments

Comments
 (0)