Skip to content

Commit 801ac5f

Browse files
iQQBotroboquat
iQQBot
authored and
roboquat
committed
Add metrics push gateway for supervisor
1 parent 754e756 commit 801ac5f

28 files changed

+176
-5
lines changed

‎components/supervisor/go.mod

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,14 @@ require (
3636
nhooyr.io/websocket v1.8.7 // indirect
3737
)
3838

39-
require golang.org/x/net v0.0.0-20211209124913-491a49abca63
39+
require (
40+
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
41+
github.com/prometheus/client_golang v1.12.1
42+
github.com/prometheus/client_model v0.2.0
43+
github.com/prometheus/common v0.32.1
44+
github.com/prometheus/pushgateway v1.4.2
45+
golang.org/x/net v0.0.0-20211209124913-491a49abca63
46+
)
4047

4148
require (
4249
cloud.google.com/go v0.83.0 // indirect
@@ -45,15 +52,17 @@ require (
4552
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
4653
github.com/cespare/xxhash/v2 v2.1.2 // indirect
4754
github.com/dustin/go-humanize v1.0.0 // indirect
55+
github.com/go-kit/log v0.2.0 // indirect
56+
github.com/go-logfmt/logfmt v0.5.1 // indirect
4857
github.com/go-ozzo/ozzo-validation v3.5.0+incompatible // indirect
4958
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5059
github.com/golang/protobuf v1.5.2 // indirect
5160
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
52-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
5361
github.com/hashicorp/golang-lru v0.5.1 // indirect
5462
github.com/inconshreveable/mousetrap v1.0.0 // indirect
5563
github.com/json-iterator/go v1.1.12 // indirect
5664
github.com/jstemmer/go-junit-report v0.9.1 // indirect
65+
github.com/julienschmidt/httprouter v1.3.0 // indirect
5766
github.com/klauspost/compress v1.15.1 // indirect
5867
github.com/klauspost/cpuid v1.3.1 // indirect
5968
github.com/kr/pretty v0.2.1 // indirect
@@ -70,9 +79,6 @@ require (
7079
github.com/opencontainers/image-spec v1.0.2 // indirect
7180
github.com/opentracing/opentracing-go v1.2.0 // indirect
7281
github.com/pkg/errors v0.9.1 // indirect
73-
github.com/prometheus/client_golang v1.12.1 // indirect
74-
github.com/prometheus/client_model v0.2.0 // indirect
75-
github.com/prometheus/common v0.32.1 // indirect
7682
github.com/rs/xid v1.2.1 // indirect
7783
github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 // indirect
7884
github.com/sourcegraph/jsonrpc2 v0.0.0-20200429184054-15c2290dcb37 // indirect

‎components/supervisor/go.sum

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,13 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2
119119
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
120120
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
121121
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
122+
github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw=
123+
github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
122124
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
123125
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
124126
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
127+
github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
128+
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
125129
github.com/go-ozzo/ozzo-validation v3.5.0+incompatible h1:sUy/in/P6askYr16XJgTKq/0SZhiWsdg4WZGaLsGQkM=
126130
github.com/go-ozzo/ozzo-validation v3.5.0+incompatible/go.mod h1:gsEKFIVnabGBt6mXmxK0MoFy+cZoTJY6mu5Ll3LVLBU=
127131
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
@@ -274,6 +278,7 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
274278
github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
275279
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
276280
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
281+
github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
277282
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
278283
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
279284
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
@@ -366,14 +371,19 @@ github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6T
366371
github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
367372
github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
368373
github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
374+
github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
375+
github.com/prometheus/common v0.31.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
369376
github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4=
370377
github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
378+
github.com/prometheus/exporter-toolkit v0.6.1/go.mod h1:ZUBIj498ePooX9t/2xtDjeQYwvRpiPP2lh5u4iblj2g=
371379
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
372380
github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
373381
github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
374382
github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
375383
github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
376384
github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
385+
github.com/prometheus/pushgateway v1.4.2 h1:EG4zmOzG4XGY2IoVds8lBpcYEexZRS4Nlkf7urxZXj0=
386+
github.com/prometheus/pushgateway v1.4.2/go.mod h1:J6PQbNW8CwFlra9vSLKwYZtB8E45gz8EezgsRbpZ8R4=
377387
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
378388
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
379389
github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
@@ -385,7 +395,11 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb
385395
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
386396
github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3 h1:ZuhckGJ10ulaKkdvJtiAqsLTiPrLaXSdnVgXJKJkTxE=
387397
github.com/segmentio/backo-go v0.0.0-20200129164019-23eae7c10bd3/go.mod h1:9/Rh6yILuLysoQnZ2oNooD2g7aBnvM7r/fNVxRNWfBc=
398+
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk=
399+
github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
388400
github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
401+
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 h1:pXY9qYc/MP5zdvqWEUH6SjNiu7VhSjuVFTFiTcphaLU=
402+
github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
389403
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
390404
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
391405
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
@@ -463,6 +477,7 @@ golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8U
463477
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
464478
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
465479
golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
480+
golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
466481
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ=
467482
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
468483
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -629,6 +644,7 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
629644
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
630645
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
631646
golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
647+
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
632648
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 h1:XfKQ4OlFl8okEOr5UvAqFRVj8pY/4yfcXrddB8qAbU0=
633649
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
634650
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

‎components/supervisor/pkg/supervisor/supervisor.go

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
grpc_logrus "github.com/grpc-ecosystem/go-grpc-middleware/logging/logrus"
3434
grpcruntime "github.com/grpc-ecosystem/grpc-gateway/v2/runtime"
3535
"github.com/improbable-eng/grpc-web/go/grpcweb"
36+
"github.com/prometheus/common/route"
3637
"github.com/prometheus/procfs"
3738
"github.com/soheilhy/cmux"
3839
"golang.org/x/crypto/ssh"
@@ -55,6 +56,14 @@ import (
5556
"github.com/gitpod-io/gitpod/supervisor/pkg/dropwriter"
5657
"github.com/gitpod-io/gitpod/supervisor/pkg/ports"
5758
"github.com/gitpod-io/gitpod/supervisor/pkg/terminal"
59+
60+
grpc_prometheus "github.com/grpc-ecosystem/go-grpc-prometheus"
61+
"github.com/prometheus/client_golang/prometheus"
62+
"github.com/prometheus/client_golang/prometheus/collectors"
63+
"github.com/prometheus/client_golang/prometheus/promhttp"
64+
dto "github.com/prometheus/client_model/go"
65+
"github.com/prometheus/pushgateway/handler"
66+
"github.com/prometheus/pushgateway/storage"
5867
)
5968

6069
const (
@@ -1037,6 +1046,13 @@ func startAPIEndpoint(ctx context.Context, cfg *Config, wg *sync.WaitGroup, serv
10371046
)
10381047
}
10391048

1049+
grpcMetrics := grpc_prometheus.NewServerMetrics()
1050+
grpcMetrics.EnableHandlingTimeHistogram()
1051+
opts = append(opts,
1052+
grpc.StreamInterceptor(grpcMetrics.StreamServerInterceptor()),
1053+
grpc.UnaryInterceptor(grpcMetrics.UnaryServerInterceptor()),
1054+
)
1055+
10401056
m := cmux.New(l)
10411057
restMux := grpcruntime.NewServeMux()
10421058
grpcMux := m.MatchWithWriters(cmux.HTTP2MatchHeaderFieldSendSettings("content-type", "application/grpc"))
@@ -1060,6 +1076,31 @@ func startAPIEndpoint(ctx context.Context, cfg *Config, wg *sync.WaitGroup, serv
10601076
grpcWebServer := grpcweb.WrapServer(grpcServer, grpcweb.WithWebsockets(true), grpcweb.WithWebsocketOriginFunc(func(req *http.Request) bool {
10611077
return true
10621078
}))
1079+
1080+
reg := prometheus.NewRegistry()
1081+
reg.MustRegister(grpcMetrics)
1082+
1083+
reg.MustRegister(
1084+
collectors.NewGoCollector(),
1085+
collectors.NewProcessCollector(collectors.ProcessCollectorOpts{}),
1086+
)
1087+
ms := storage.NewDiskMetricStore("", time.Minute*5, prometheus.DefaultGatherer, nil)
1088+
1089+
g := prometheus.Gatherers{
1090+
reg,
1091+
prometheus.GathererFunc(func() ([]*dto.MetricFamily, error) { return ms.GetMetricFamilies(), nil }),
1092+
}
1093+
r := route.New()
1094+
1095+
r.Get("/metrics", promhttp.HandlerFor(g, promhttp.HandlerOpts{}).ServeHTTP)
1096+
r.Put("/metrics/job/:job/*labels", handler.Push(ms, true, true, false, nil))
1097+
r.Post("/metrics/job/:job/*labels", handler.Push(ms, false, true, false, nil))
1098+
r.Del("/metrics/job/:job/*labels", handler.Delete(ms, false, nil))
1099+
r.Put("/metrics/job/:job", handler.Push(ms, true, true, false, nil))
1100+
r.Post("/metrics/job/:job", handler.Push(ms, false, true, false, nil))
1101+
1102+
routes.Handle("/", r)
1103+
10631104
routes.Handle("/_supervisor/v1/", http.StripPrefix("/_supervisor", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
10641105
if strings.Contains(r.Header.Get("Content-Type"), "application/grpc") ||
10651106
websocket.IsWebSocketUpgrade(r) {

‎components/ws-manager/pkg/manager/create.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,7 @@ func (m *Manager) createWorkspaceContainer(startContext *startWorkspaceContext)
648648
ImagePullPolicy: corev1.PullIfNotPresent,
649649
Ports: []corev1.ContainerPort{
650650
{ContainerPort: startContext.IDEPort},
651+
{ContainerPort: startContext.SupervisorPort, Name: "supervisor"},
651652
},
652653
Resources: corev1.ResourceRequirements{
653654
Limits: limits,

‎components/ws-manager/pkg/manager/testdata/cdwp_admission.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
"ports": [
6767
{
6868
"containerPort": 23000
69+
},
70+
{
71+
"name": "supervisor",
72+
"containerPort": 22999
6973
}
7074
],
7175
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_affinity.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
"ports": [
6767
{
6868
"containerPort": 23000
69+
},
70+
{
71+
"name": "supervisor",
72+
"containerPort": 22999
6973
}
7074
],
7175
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_class.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
"ports": [
6767
{
6868
"containerPort": 23000
69+
},
70+
{
71+
"name": "supervisor",
72+
"containerPort": 22999
6973
}
7074
],
7175
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_customcerts.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@
7878
"ports": [
7979
{
8080
"containerPort": 23000
81+
},
82+
{
83+
"name": "supervisor",
84+
"containerPort": 22999
8185
}
8286
],
8387
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_empty_resource_req.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
"ports": [
6767
{
6868
"containerPort": 23000
69+
},
70+
{
71+
"name": "supervisor",
72+
"containerPort": 22999
6973
}
7074
],
7175
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_envvars.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
"ports": [
6767
{
6868
"containerPort": 23000
69+
},
70+
{
71+
"name": "supervisor",
72+
"containerPort": 22999
6973
}
7074
],
7175
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_fixedresources.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@
6767
"ports": [
6868
{
6969
"containerPort": 23000
70+
},
71+
{
72+
"name": "supervisor",
73+
"containerPort": 22999
7074
}
7175
],
7276
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_fullworkspacebackup.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,10 @@
6161
"ports": [
6262
{
6363
"containerPort": 23000
64+
},
65+
{
66+
"name": "supervisor",
67+
"containerPort": 22999
6468
}
6569
],
6670
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_imagebuild.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@
7878
"ports": [
7979
{
8080
"containerPort": 23000
81+
},
82+
{
83+
"name": "supervisor",
84+
"containerPort": 22999
8185
}
8286
],
8387
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_imagebuild_template.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@
7878
"ports": [
7979
{
8080
"containerPort": 23000
81+
},
82+
{
83+
"name": "supervisor",
84+
"containerPort": 22999
8185
}
8286
],
8387
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_no_ideimage.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
"ports": [
6767
{
6868
"containerPort": 23000
69+
},
70+
{
71+
"name": "supervisor",
72+
"containerPort": 22999
6973
}
7074
],
7175
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_prebuild.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
"ports": [
6767
{
6868
"containerPort": 23000
69+
},
70+
{
71+
"name": "supervisor",
72+
"containerPort": 22999
6973
}
7074
],
7175
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
"ports": [
6767
{
6868
"containerPort": 23000
69+
},
70+
{
71+
"name": "supervisor",
72+
"containerPort": 22999
6973
}
7074
],
7175
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_prebuild_template_override_resources.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
"ports": [
6767
{
6868
"containerPort": 23000
69+
},
70+
{
71+
"name": "supervisor",
72+
"containerPort": 22999
6973
}
7074
],
7175
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_probe.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
"ports": [
6767
{
6868
"containerPort": 23000
69+
},
70+
{
71+
"name": "supervisor",
72+
"containerPort": 22999
6973
}
7074
],
7175
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_readinessprobe.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
"ports": [
6767
{
6868
"containerPort": 23000
69+
},
70+
{
71+
"name": "supervisor",
72+
"containerPort": 22999
6973
}
7074
],
7175
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_tasks.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
"ports": [
6767
{
6868
"containerPort": 23000
69+
},
70+
{
71+
"name": "supervisor",
72+
"containerPort": 22999
6973
}
7074
],
7175
"env": [

‎components/ws-manager/pkg/manager/testdata/cdwp_template.golden

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,10 @@
6666
"ports": [
6767
{
6868
"containerPort": 23000
69+
},
70+
{
71+
"name": "supervisor",
72+
"containerPort": 22999
6973
}
7074
],
7175
"env": [

0 commit comments

Comments
 (0)