Skip to content

Commit b1d37a5

Browse files
committed
bump vcluster to v0.23.0
1 parent b0d3635 commit b1d37a5

File tree

10 files changed

+2847
-394
lines changed

10 files changed

+2847
-394
lines changed

v2/devspace.yaml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ hooks:
1212
fi
1313
1414
deployments:
15-
prometheus-operator:
15+
prometheus-operator-crds:
1616
helm:
1717
chart:
18-
name: kube-prometheus-stack
18+
name: prometheus-operator-crds
1919
repo: https://prometheus-community.github.io/helm-charts
20-
version: 60.2.0
20+
version: 18.0.1
2121
vcluster:
2222
helm:
2323
chart:
2424
name: vcluster
2525
repo: https://charts.loft.sh
26-
version: v0.20.0-beta.5
26+
version: v0.23.0
2727
values:
2828
controlPlane:
2929
advanced:
@@ -36,6 +36,13 @@ deployments:
3636
enabled: false
3737
readinessProbe:
3838
enabled: false
39+
resources:
40+
limits:
41+
cpu: null
42+
memory: 4Gi
43+
requests:
44+
cpu: null
45+
memory: 4Gi
3946
distro:
4047
k3s:
4148
enabled: true
@@ -53,9 +60,9 @@ deployments:
5360
verbs: ["create", "delete", "patch", "update", "get", "list", "watch"]
5461
clusterRole:
5562
extraRules:
56-
- apiGroups: [ "apiextensions.k8s.io" ]
57-
resources: [ "customresourcedefinitions" ]
58-
verbs: [ "get", "list", "watch" ]
63+
- apiGroups: ["apiextensions.k8s.io"]
64+
resources: ["customresourcedefinitions"]
65+
verbs: ["get", "list", "watch"]
5966
dev:
6067
vcluster:
6168
imageSelector: "ghcr.io/loft-sh/vcluster-pro"

v2/devspace_start.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ COLOR_RESET="\033[0m"
77
if [ ! -f "/vcluster/syncer" ]; then
88
echo "Downloading vCluster syncer..."
99
mkdir -p /vcluster
10-
curl -L -o /vcluster/syncer "https://github.com/loft-sh/vcluster/releases/download/v0.20.0-beta.5/syncer-linux-$(go env GOARCH)"
11-
curl -L -o /usr/local/bin/kine "https://github.com/k3s-io/kine/releases/download/v0.11.9/kine-$(go env GOARCH)"
10+
curl -L -o /vcluster/syncer "https://github.com/loft-sh/vcluster/releases/download/v0.23.0/syncer-linux-$(go env GOARCH)"
11+
curl -L -o /usr/local/bin/kine "https://github.com/k3s-io/kine/releases/download/v0.13.8/kine-$(go env GOARCH)"
1212
chmod +x /vcluster/syncer
1313
chmod +x /usr/local/bin/kine
1414
echo "Successfully downloaded syncer"

v2/go.mod

Lines changed: 73 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
11
module github.com/codefresh-contrib/vcluster-prometheus-operator-plugin/v2
22

3-
go 1.23.0
3+
go 1.23.2
44

55
toolchain go1.24.0
66

77
require (
8-
github.com/loft-sh/vcluster v0.20.1
9-
github.com/loft-sh/vcluster-sdk v0.5.3
8+
github.com/loft-sh/vcluster v0.23.0
9+
github.com/loft-sh/vcluster-sdk v0.5.4-0.20241113113254-48b060194b63
1010
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0
11-
k8s.io/apimachinery v0.30.2
12-
sigs.k8s.io/controller-runtime v0.18.4
11+
k8s.io/apimachinery v0.32.1
12+
k8s.io/klog/v2 v2.130.1
13+
sigs.k8s.io/controller-runtime v0.20.1
1314
)
1415

1516
require (
17+
cel.dev/expr v0.18.0 // indirect
1618
github.com/AlecAivazis/survey/v2 v2.3.7 // indirect
1719
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
1820
github.com/MakeNowJust/heredoc v1.0.0 // indirect
1921
github.com/NYTimes/gziphandler v1.1.1 // indirect
2022
github.com/ProtonMail/go-crypto v1.0.0 // indirect
2123
github.com/Sytten/logrus-zap-hook v0.1.0 // indirect
2224
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
23-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
25+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
2426
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
2527
github.com/bahlo/generic-list-go v0.2.0 // indirect
2628
github.com/beorn7/perks v1.0.1 // indirect
@@ -36,27 +38,26 @@ require (
3638
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3739
github.com/denisbrodbeck/machineid v1.0.1 // indirect
3840
github.com/dprotaso/go-yit v0.0.0-20191028211022-135eb7262960 // indirect
39-
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
41+
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
4042
github.com/evanphx/json-patch v5.8.1+incompatible // indirect
4143
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
42-
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
44+
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
4345
github.com/fatih/camelcase v1.0.0 // indirect
4446
github.com/fatih/color v1.16.0 // indirect
4547
github.com/felixge/httpsnoop v1.0.4 // indirect
4648
github.com/fsnotify/fsnotify v1.7.0 // indirect
47-
github.com/fvbommel/sortorder v1.1.0 // indirect
49+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4850
github.com/ghodss/yaml v1.0.0 // indirect
4951
github.com/go-errors/errors v1.4.2 // indirect
5052
github.com/go-logr/logr v1.4.2 // indirect
5153
github.com/go-logr/stdr v1.2.2 // indirect
52-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
53-
github.com/go-openapi/jsonreference v0.20.4 // indirect
54-
github.com/go-openapi/swag v0.22.7 // indirect
54+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
55+
github.com/go-openapi/jsonreference v0.21.0 // indirect
56+
github.com/go-openapi/swag v0.23.0 // indirect
5557
github.com/gogo/protobuf v1.3.2 // indirect
56-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5758
github.com/golang/protobuf v1.5.4 // indirect
58-
github.com/google/btree v1.1.2 // indirect
59-
github.com/google/cel-go v0.17.8 // indirect
59+
github.com/google/btree v1.1.3 // indirect
60+
github.com/google/cel-go v0.22.0 // indirect
6061
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
6162
github.com/google/go-cmp v0.6.0 // indirect
6263
github.com/google/go-github/v30 v30.1.0 // indirect
@@ -65,15 +66,14 @@ require (
6566
github.com/google/gofuzz v1.2.0 // indirect
6667
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6768
github.com/google/uuid v1.6.0 // indirect
68-
github.com/gorilla/websocket v1.5.1 // indirect
69-
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
69+
github.com/gorilla/websocket v1.5.3 // indirect
70+
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
7071
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
71-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 // indirect
72+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
7273
github.com/hashicorp/go-hclog v0.14.1 // indirect
7374
github.com/hashicorp/go-plugin v1.6.0 // indirect
7475
github.com/hashicorp/golang-lru/v2 v2.0.2 // indirect
7576
github.com/hashicorp/yamux v0.1.1 // indirect
76-
github.com/imdario/mergo v0.3.16 // indirect
7777
github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf // indirect
7878
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7979
github.com/invopop/jsonschema v0.12.0 // indirect
@@ -82,7 +82,9 @@ require (
8282
github.com/json-iterator/go v1.1.12 // indirect
8383
github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213 // indirect
8484
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
85+
github.com/klauspost/compress v1.17.10 // indirect
8586
github.com/kubernetes-csi/external-snapshotter/client/v4 v4.2.0 // indirect
87+
github.com/kylelemons/godebug v1.1.0 // indirect
8688
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
8789
github.com/loft-sh/admin-apis v0.0.0-20240203010124-3600c1c582a8 // indirect
8890
github.com/loft-sh/agentapi/v4 v4.0.0-alpha.6.0.20240614131646-3359da6a4818 // indirect
@@ -98,8 +100,7 @@ require (
98100
github.com/mitchellh/go-homedir v1.1.0 // indirect
99101
github.com/mitchellh/go-testing-interface v1.0.0 // indirect
100102
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
101-
github.com/moby/locker v1.0.1 // indirect
102-
github.com/moby/spdystream v0.2.0 // indirect
103+
github.com/moby/spdystream v0.5.0 // indirect
103104
github.com/moby/term v0.5.0 // indirect
104105
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
105106
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -110,79 +111,79 @@ require (
110111
github.com/otiai10/copy v1.11.0 // indirect
111112
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
112113
github.com/pkg/errors v0.9.1 // indirect
113-
github.com/prometheus/client_golang v1.18.0 // indirect
114+
github.com/prometheus/client_golang v1.20.4 // indirect
114115
github.com/prometheus/client_model v0.6.1 // indirect
115-
github.com/prometheus/common v0.46.0 // indirect
116+
github.com/prometheus/common v0.60.0 // indirect
116117
github.com/prometheus/procfs v0.15.1 // indirect
117118
github.com/rhysd/go-github-selfupdate v1.2.3 // indirect
118119
github.com/russross/blackfriday/v2 v2.1.0 // indirect
119120
github.com/samber/lo v1.38.1 // indirect
120121
github.com/sirupsen/logrus v1.9.3 // indirect
121122
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
122-
github.com/spf13/cobra v1.8.0 // indirect
123+
github.com/spf13/cobra v1.8.1 // indirect
123124
github.com/spf13/pflag v1.0.5 // indirect
124125
github.com/stoewer/go-strcase v1.3.0 // indirect
125126
github.com/tcnksm/go-gitconfig v0.1.2 // indirect
126127
github.com/ulikunitz/xz v0.5.11 // indirect
127128
github.com/vmware-labs/yaml-jsonpath v0.3.2 // indirect
128129
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
130+
github.com/x448/float16 v0.8.4 // indirect
129131
github.com/xlab/treeprint v1.2.0 // indirect
130-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
131-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
132-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
133-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
134-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 // indirect
135-
go.opentelemetry.io/otel v1.27.0 // indirect
136-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 // indirect
137-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.22.0 // indirect
138-
go.opentelemetry.io/otel/metric v1.27.0 // indirect
139-
go.opentelemetry.io/otel/sdk v1.27.0 // indirect
140-
go.opentelemetry.io/otel/trace v1.27.0 // indirect
141-
go.opentelemetry.io/proto/otlp v1.1.0 // indirect
142-
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
132+
go.etcd.io/etcd/api/v3 v3.5.17 // indirect
133+
go.etcd.io/etcd/client/pkg/v3 v3.5.17 // indirect
134+
go.etcd.io/etcd/client/v3 v3.5.17 // indirect
135+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 // indirect
136+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect
137+
go.opentelemetry.io/otel v1.30.0 // indirect
138+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.30.0 // indirect
139+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.30.0 // indirect
140+
go.opentelemetry.io/otel/metric v1.30.0 // indirect
141+
go.opentelemetry.io/otel/sdk v1.30.0 // indirect
142+
go.opentelemetry.io/otel/trace v1.30.0 // indirect
143+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
143144
go.uber.org/atomic v1.11.0 // indirect
144145
go.uber.org/multierr v1.11.0 // indirect
145146
go.uber.org/zap v1.27.0 // indirect
146-
golang.org/x/crypto v0.24.0 // indirect
147-
golang.org/x/exp v0.0.0-20240604190554-fc45aab8b7f8 // indirect
148-
golang.org/x/mod v0.18.0 // indirect
149-
golang.org/x/net v0.26.0 // indirect
150-
golang.org/x/oauth2 v0.21.0 // indirect
151-
golang.org/x/sync v0.7.0 // indirect
152-
golang.org/x/sys v0.21.0 // indirect
153-
golang.org/x/term v0.21.0 // indirect
154-
golang.org/x/text v0.16.0 // indirect
155-
golang.org/x/time v0.5.0 // indirect
147+
golang.org/x/crypto v0.32.0 // indirect
148+
golang.org/x/exp v0.0.0-20241004190924-225e2abe05e6 // indirect
149+
golang.org/x/mod v0.21.0 // indirect
150+
golang.org/x/net v0.34.0 // indirect
151+
golang.org/x/oauth2 v0.23.0 // indirect
152+
golang.org/x/sync v0.10.0 // indirect
153+
golang.org/x/sys v0.29.0 // indirect
154+
golang.org/x/term v0.28.0 // indirect
155+
golang.org/x/text v0.21.0 // indirect
156+
golang.org/x/time v0.7.0 // indirect
156157
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
157-
google.golang.org/genproto/googleapis/api v0.0.0-20240604185151-ef581f913117 // indirect
158-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
159-
google.golang.org/grpc v1.64.0 // indirect
160-
google.golang.org/protobuf v1.34.1 // indirect
158+
google.golang.org/genproto/googleapis/api v0.0.0-20240930140551-af27646dc61f // indirect
159+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240930140551-af27646dc61f // indirect
160+
google.golang.org/grpc v1.67.1 // indirect
161+
google.golang.org/protobuf v1.35.1 // indirect
162+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
161163
gopkg.in/inf.v0 v0.9.1 // indirect
162164
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
163165
gopkg.in/yaml.v2 v2.4.0 // indirect
164166
gopkg.in/yaml.v3 v3.0.1 // indirect
165-
k8s.io/api v0.30.2 // indirect
166-
k8s.io/apiextensions-apiserver v0.30.2 // indirect
167-
k8s.io/apiserver v0.30.2 // indirect
168-
k8s.io/cli-runtime v0.30.2 // indirect
169-
k8s.io/client-go v0.30.2 // indirect
170-
k8s.io/component-base v0.30.2 // indirect
171-
k8s.io/component-helpers v0.30.2 // indirect
172-
k8s.io/klog/v2 v2.120.1 // indirect
173-
k8s.io/kms v0.30.2 // indirect
174-
k8s.io/kube-aggregator v0.30.2 // indirect
175-
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
176-
k8s.io/kubectl v0.30.2 // indirect
177-
k8s.io/kubelet v0.30.2 // indirect
178-
k8s.io/metrics v0.30.2 // indirect
179-
k8s.io/pod-security-admission v0.30.2 // indirect
180-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
167+
k8s.io/api v0.32.1 // indirect
168+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
169+
k8s.io/apiserver v0.32.1 // indirect
170+
k8s.io/cli-runtime v0.32.1 // indirect
171+
k8s.io/client-go v0.32.1 // indirect
172+
k8s.io/component-base v0.32.1 // indirect
173+
k8s.io/component-helpers v0.32.1 // indirect
174+
k8s.io/kms v0.32.1 // indirect
175+
k8s.io/kube-aggregator v0.32.1 // indirect
176+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
177+
k8s.io/kubectl v0.32.1 // indirect
178+
k8s.io/kubelet v0.32.1 // indirect
179+
k8s.io/metrics v0.32.1 // indirect
180+
k8s.io/pod-security-admission v0.32.1 // indirect
181+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
181182
mvdan.cc/sh/v3 v3.6.0 // indirect
182-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
183-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
184-
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
185-
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
186-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
183+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
184+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
185+
sigs.k8s.io/kustomize/api v0.18.0 // indirect
186+
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
187+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
187188
sigs.k8s.io/yaml v1.4.0 // indirect
188189
)

0 commit comments

Comments
 (0)