Skip to content

Commit 314be2b

Browse files
committed
Cut off kcp-dev/kcp dependencies
Signed-off-by: Dr. Stefan Schimanski <stefan.schimanski@gmail.com>
1 parent aa38cc1 commit 314be2b

File tree

8 files changed

+531
-79
lines changed

8 files changed

+531
-79
lines changed

cmd/gcp/main.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,21 @@ package main
1818

1919
import (
2020
"os"
21+
"regexp"
22+
"strings"
23+
"unicode"
2124

22-
"github.com/kcp-dev/kcp/cli/pkg/help"
25+
"github.com/MakeNowJust/heredoc"
2326
"github.com/spf13/cobra"
27+
"k8s.io/component-base/term"
2428

2529
"k8s.io/component-base/cli"
2630
_ "k8s.io/component-base/logs/json/register"
2731
_ "k8s.io/component-base/metrics/prometheus/clientgo"
2832
_ "k8s.io/component-base/metrics/prometheus/version"
2933

3034
server "github.com/kcp-dev/generic-controlplane/server/cmd"
35+
"github.com/kcp-dev/generic-controlplane/server/cmd/help"
3136
)
3237

3338
func main() {

go.mod

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
module github.com/kcp-dev/generic-controlplane
22

3-
go 1.22.2
3+
go 1.23.0
4+
5+
toolchain go1.24.0
46

57
require (
68
github.com/google/uuid v1.6.0
7-
github.com/kcp-dev/kcp v0.24.0
8-
github.com/kcp-dev/kcp/cli v0.24.0
9+
github.com/kcp-dev/kcp v0.26.1
910
github.com/spf13/cobra v1.8.1
1011
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace
1112
k8s.io/apiextensions-apiserver v0.31.0
12-
k8s.io/apimachinery v0.31.1
13+
k8s.io/apimachinery v0.32.2
1314
k8s.io/apiserver v0.31.1
1415
k8s.io/client-go v0.31.1
1516
k8s.io/component-base v0.31.1
@@ -25,7 +26,7 @@ require (
2526

2627
require (
2728
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
28-
github.com/MakeNowJust/heredoc v1.0.0 // indirect; indifswarect
29+
github.com/MakeNowJust/heredoc v1.0.0 // indifswarect
2930
github.com/NYTimes/gziphandler v1.1.1 // indirect
3031
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
3132
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
@@ -69,13 +70,11 @@ require (
6970
github.com/josharian/intern v1.0.0 // indirect
7071
github.com/json-iterator/go v1.1.12 // indirect
7172
github.com/mailru/easyjson v0.7.7 // indirect
72-
github.com/mattn/go-runewidth v0.0.12 // indirect
73-
github.com/moby/spdystream v0.4.0 // indirect
73+
github.com/moby/spdystream v0.5.0 // indirect
7474
github.com/moby/sys/mountinfo v0.7.1 // indirect
7575
github.com/moby/term v0.5.0 // indirect
7676
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7777
github.com/modern-go/reflect2 v1.0.2 // indirect
78-
github.com/muesli/reflow v0.3.0 // indirect
7978
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8079
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
8180
github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -86,7 +85,6 @@ require (
8685
github.com/prometheus/client_model v0.6.1 // indirect
8786
github.com/prometheus/common v0.55.0 // indirect
8887
github.com/prometheus/procfs v0.15.1 // indirect
89-
github.com/rivo/uniseg v0.2.0 // indirect
9088
github.com/robfig/cron/v3 v3.0.1 // indirect
9189
github.com/sirupsen/logrus v1.9.3 // indirect
9290
github.com/soheilhy/cmux v0.1.5 // indirect
@@ -96,12 +94,12 @@ require (
9694
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
9795
go.etcd.io/bbolt v1.3.9 // indirect
9896
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
99-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
97+
go.etcd.io/etcd/client/pkg/v3 v3.5.14
10098
go.etcd.io/etcd/client/v2 v2.305.13 // indirect
10199
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
102100
go.etcd.io/etcd/pkg/v3 v3.5.13 // indirect
103101
go.etcd.io/etcd/raft/v3 v3.5.13 // indirect
104-
go.etcd.io/etcd/server/v3 v3.5.13 // indirect
102+
go.etcd.io/etcd/server/v3 v3.5.13
105103
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
106104
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
107105
go.opentelemetry.io/otel v1.28.0 // indirect
@@ -112,22 +110,22 @@ require (
112110
go.opentelemetry.io/otel/trace v1.28.0 // indirect
113111
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
114112
go.uber.org/multierr v1.11.0 // indirect
115-
go.uber.org/zap v1.27.0 // indirect
116-
golang.org/x/crypto v0.24.0 // indirect
117-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
118-
golang.org/x/net v0.26.0 // indirect
113+
go.uber.org/zap v1.27.0
114+
golang.org/x/crypto v0.28.0 // indirect
115+
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
116+
golang.org/x/net v0.30.0 // indirect
119117
golang.org/x/oauth2 v0.21.0 // indirect
120-
golang.org/x/sync v0.7.0 // indirect
121-
golang.org/x/sys v0.21.0 // indirect
122-
golang.org/x/term v0.21.0 // indirect
123-
golang.org/x/text v0.16.0 // indirect
124-
golang.org/x/time v0.5.0 // indirect
125-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
118+
golang.org/x/sync v0.8.0 // indirect
119+
golang.org/x/sys v0.26.0 // indirect
120+
golang.org/x/term v0.25.0 // indirect
121+
golang.org/x/text v0.19.0 // indirect
122+
golang.org/x/time v0.7.0 // indirect
123+
golang.org/x/tools v0.26.0 // indirect
126124
google.golang.org/genproto v0.0.0-20240509183442-62759503f434 // indirect
127125
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
128126
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
129127
google.golang.org/grpc v1.65.0 // indirect
130-
google.golang.org/protobuf v1.34.2 // indirect
128+
google.golang.org/protobuf v1.35.1 // indirect
131129
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
132130
gopkg.in/inf.v0 v0.9.1 // indirect
133131
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
@@ -141,13 +139,13 @@ require (
141139
k8s.io/controller-manager v0.30.0 // indirect
142140
k8s.io/dynamic-resource-allocation v0.31.1 // indirect
143141
k8s.io/kms v0.31.1 // indirect
144-
k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect
142+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
145143
k8s.io/kubelet v0.31.1 // indirect
146144
k8s.io/mount-utils v0.30.0 // indirect
147145
k8s.io/pod-security-admission v0.30.0 // indirect
148-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
146+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
149147
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
150-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
151-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
148+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
149+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
152150
sigs.k8s.io/yaml v1.4.0 // indirect
153151
)

0 commit comments

Comments
 (0)