Skip to content

Commit

Permalink
Merge pull request #167 from srl-labs/chore/fix-ui-tagging
Browse files Browse the repository at this point in the history
Chore/fix UI tagging
  • Loading branch information
carlmontanari authored Aug 13, 2024
2 parents 425440d + 31eb066 commit ab4cb95
Show file tree
Hide file tree
Showing 6 changed files with 121 additions and 276 deletions.
18 changes: 18 additions & 0 deletions .develop/devspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,16 @@ profiles:
path: images.clabernetes-launcher.buildArgs.VERSION
value: ${RELEASE_VERSION}

- op: replace
path: images.clabernetes-ui.tags
value:
- latest
- ${RELEASE_VERSION}
- ${COMMIT_HASH}
- op: replace
path: images.clabernetes-ui.buildArgs.VERSION
value: ${RELEASE_VERSION}

- op: replace
path: images.clabverter.tags
value:
Expand Down Expand Up @@ -235,6 +245,14 @@ profiles:
path: images.clabernetes-launcher.buildArgs.VERSION
value: ${RELEASE_VERSION}

- op: replace
path: images.clabernetes-ui.tags
value:
- ${RELEASE_VERSION}
- op: replace
path: images.clabernetes-ui.buildArgs.VERSION
value: ${RELEASE_VERSION}

- op: replace
path: images.clabverter.tags
value:
Expand Down
8 changes: 4 additions & 4 deletions .github/vars.env
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ GO_VERSION=1.22
DEVSPACE_VERSION=v6.3.12
GCI_VERSION=v0.13.4
GOFUMPT_VERSION=v0.6.0
GOLANGCI_LINT_VERSION=v1.58.0
GOLANGCI_LINT_VERSION=v1.59.1
GOLINES_VERSION=v0.12.2
GOTESTSUM_VERSION=v1.11.0
HELM_VERSION=v3.14.2
GORELEASER_VERSION=v1.24.0
GOTESTSUM_VERSION=v1.12.0
HELM_VERSION=v3.15.3
GORELEASER_VERSION=v2.1.0
2 changes: 1 addition & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,4 @@ output:
uniq-by-line: false

service:
golangci-lint-version: 1.57.x
golangci-lint-version: 1.59.x
102 changes: 30 additions & 72 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,113 +6,71 @@ require (
github.com/carlmontanari/difflibgo v0.0.0-20240227210139-93685b1c22ae
github.com/carlmontanari/slurpeeth v0.0.0-20240209224827-246fa87e31f3
github.com/openconfig/kne v0.1.18
github.com/urfave/cli/v2 v2.27.2
github.com/urfave/cli/v2 v2.27.4
google.golang.org/protobuf v1.34.2
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.30.3
k8s.io/apiextensions-apiserver v0.30.3
k8s.io/apimachinery v0.30.3
// pin back to help controller-runtime out
k8s.io/api v0.30.1
k8s.io/apiextensions-apiserver v0.30.1
k8s.io/apimachinery v0.30.1
// pin back to help controller-runtime out (until v0.19.0)
// https://github.com/kubernetes-sigs/controller-runtime/issues/2788
k8s.io/client-go v0.30.3
// and actually this is all the k8s things really, and there is another thing in admission
// webhook that makes this need to be pinned back (in ctrlruntime)
k8s.io/client-go v0.30.1
k8s.io/klog/v2 v2.130.1
k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f
sigs.k8s.io/controller-runtime v0.18.4
k8s.io/kube-openapi v0.0.0-20240812233141-91dab695df6f
sigs.k8s.io/controller-runtime v0.18.5
sigs.k8s.io/yaml v1.4.0
)

require golang.org/x/crypto v0.25.0
require golang.org/x/crypto v0.26.0

require (
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.4 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.21.0 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/cel-go v0.17.8 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/imdario/mergo v0.3.15 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.18.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/prometheus/client_golang v1.19.1 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.55.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/spf13/cobra v1.8.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
github.com/xrash/smetrics v0.0.0-20240312152122-5f08fbb34913 // indirect
go.etcd.io/etcd/api/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
go.etcd.io/etcd/client/v3 v3.5.10 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0 // indirect
go.opentelemetry.io/otel v1.19.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
go.opentelemetry.io/otel/metric v1.19.0 // indirect
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
go.opentelemetry.io/otel/trace v1.19.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.26.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
golang.org/x/net v0.28.0 // indirect
golang.org/x/oauth2 v0.21.0 // indirect
golang.org/x/sys v0.23.0 // indirect
golang.org/x/term v0.23.0 // indirect
golang.org/x/text v0.17.0 // indirect
golang.org/x/time v0.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto v0.0.0-20240102182953-50ed04b92917 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240116215550-a9fa1716bcac // indirect
google.golang.org/grpc v1.60.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apiserver v0.30.3 // indirect
k8s.io/component-base v0.30.3 // indirect
k8s.io/kms v0.30.3 // indirect
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)
Loading

0 comments on commit ab4cb95

Please sign in to comment.