Skip to content

Commit c1301c0

Browse files
ssongliussongliu
committed
Merge branch 'master' of github.com:KubeOperator/KubePi
2 parents 440e942 + 191617f commit c1301c0

File tree

9 files changed

+36
-80
lines changed

9 files changed

+36
-80
lines changed

‎go.mod

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/docker/docker v20.10.9+incompatible // indirect
1313
github.com/fatih/color v1.13.0 // indirect
1414
github.com/fsnotify/fsnotify v1.5.1 // indirect
15-
github.com/go-ldap/ldap v3.0.3+incompatible
15+
github.com/go-ldap/ldap/v3 v3.4.1
1616
github.com/go-logr/logr v0.4.0
1717
github.com/gofrs/flock v0.8.1
1818
github.com/golang/snappy v0.0.4 // indirect
@@ -36,7 +36,6 @@ require (
3636
golang.org/x/sys v0.0.0-20210927052749-1cf2251ac284 // indirect
3737
golang.org/x/text v0.3.6
3838
google.golang.org/protobuf v1.27.1 // indirect
39-
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
4039
gopkg.in/igm/sockjs-go.v2 v2.1.0
4140
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
4241
helm.sh/helm/v3 v3.7.0
@@ -46,8 +45,7 @@ require (
4645
k8s.io/cli-runtime v0.22.1
4746
k8s.io/client-go v0.22.2
4847
k8s.io/klog/v2 v2.9.0
49-
k8s.io/kubectl v0.22.1 // indirect
50-
sigs.k8s.io/controller-runtime v0.10.3
48+
k8s.io/kubectl v0.22.1
5149
)
5250

5351
replace github.com/KubeOperator/webkubectl/gotty v0.0.0-20210927072155-e9ce79172471 => ./thirdparty/gotty

‎go.sum

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935
5656
github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
5757
github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8=
5858
github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
59+
github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c h1:/IBSNwUN8+eKzUzbJPqhK839ygXJ82sde8x3ogr6R28=
60+
github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c/go.mod h1:chxPXzSsl7ZWRAuOIE23GDNzjWuZquvFlgA8xmpunjU=
5961
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
6062
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
6163
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
@@ -145,7 +147,6 @@ github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd3
145147
github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible h1:Ppm0npCCsmuR9oQaBtRuZcmILVE74aXE+AmrJj8L2ns=
146148
github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
147149
github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
148-
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
149150
github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
150151
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
151152
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -372,7 +373,6 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y
372373
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
373374
github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
374375
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
375-
github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ=
376376
github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
377377
github.com/evanphx/json-patch v4.11.0+incompatible h1:glyUF9yIYtMHzn8xaKw5rMhdWcwsYV8dZHIq5567/xs=
378378
github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
@@ -402,6 +402,8 @@ github.com/garyburd/redigo v0.0.0-20150301180006-535138d7bcd7/go.mod h1:NR3MbYis
402402
github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ=
403403
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
404404
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
405+
github.com/go-asn1-ber/asn1-ber v1.5.1 h1:pDbRAunXzIUXfx4CB2QJFv5IuPiuoW+sWvr/Us009o8=
406+
github.com/go-asn1-ber/asn1-ber v1.5.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
405407
github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w=
406408
github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
407409
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
@@ -411,16 +413,15 @@ github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3I
411413
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
412414
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
413415
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
414-
github.com/go-ldap/ldap v3.0.3+incompatible h1:HTeSZO8hWMS1Rgb2Ziku6b8a7qRIZZMHjsvuZyatzwk=
415-
github.com/go-ldap/ldap v3.0.3+incompatible/go.mod h1:qfd9rJvER9Q0/D/Sqn1DfHRoBp40uXYvFoEVrNEPqRc=
416+
github.com/go-ldap/ldap/v3 v3.4.1 h1:fU/0xli6HY02ocbMuozHAYsaHLcnkLjvho2r5a34BUU=
417+
github.com/go-ldap/ldap/v3 v3.4.1/go.mod h1:iYS1MdmrmceOJ1QOTnRXrIs7i3kloqtmGQjRvjKpyMg=
416418
github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
417419
github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
418420
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
419421
github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
420422
github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
421423
github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc=
422424
github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
423-
github.com/go-logr/zapr v0.4.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk=
424425
github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
425426
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
426427
github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
@@ -631,7 +632,6 @@ github.com/iris-contrib/jade v1.1.4/go.mod h1:EDqR+ur9piDl6DUgs6qRrlfzmlx/D5Uybo
631632
github.com/iris-contrib/schema v0.0.6 h1:CPSBLyx2e91H2yJzPuhGuifVRnZBBJ3pCOMbOvPZaTw=
632633
github.com/iris-contrib/schema v0.0.6/go.mod h1:iYszG0IOsuIsfzjymw1kMzTL8YQcCWlm65f3wX8J5iA=
633634
github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
634-
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
635635
github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
636636
github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
637637
github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik=
@@ -1112,7 +1112,6 @@ go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/
11121112
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
11131113
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
11141114
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
1115-
go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
11161115
golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
11171116
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
11181117
golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
@@ -1130,6 +1129,7 @@ golang.org/x/crypto v0.0.0-20191122220453-ac88ee75c92c/go.mod h1:LzIPMQfyMNhhGPh
11301129
golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
11311130
golang.org/x/crypto v0.0.0-20200323165209-0ec3e9974c59/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
11321131
golang.org/x/crypto v0.0.0-20200414173820-0848c9571904/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
1132+
golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
11331133
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
11341134
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
11351135
golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -1350,7 +1350,6 @@ golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBc
13501350
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13511351
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13521352
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1353-
golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13541353
golang.org/x/sys v0.0.0-20210927052749-1cf2251ac284 h1:lBPNCmq8u4zFP3huKCmUQ2Fx8kcY4X+O12UgGnyKsrg=
13551354
golang.org/x/sys v0.0.0-20210927052749-1cf2251ac284/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
13561355
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
@@ -1439,7 +1438,6 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
14391438
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
14401439
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
14411440
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
1442-
gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY=
14431441
google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
14441442
google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
14451443
google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
@@ -1561,8 +1559,6 @@ google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+Rur
15611559
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
15621560
gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
15631561
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
1564-
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d h1:TxyelI5cVkbREznMhfzycHdkp5cLA7DpE+GKjSslYhM=
1565-
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d/go.mod h1:cuepJuh7vyXfUyUwEgHQXw849cJrilpS5NeIjOWESAw=
15661562
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
15671563
gopkg.in/check.v1 v1.0.0-20141024133853-64131543e789/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
15681564
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -1691,8 +1687,6 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
16911687
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.14/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
16921688
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
16931689
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.22/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
1694-
sigs.k8s.io/controller-runtime v0.10.3 h1:s5Ttmw/B4AuIbwrXD3sfBkXwnPMMWrqpVj4WRt1dano=
1695-
sigs.k8s.io/controller-runtime v0.10.3/go.mod h1:CQp8eyUQZ/Q7PJvnIrB6/hgfTC1kBkGylwsLgOQi1WY=
16961690
sigs.k8s.io/kustomize/api v0.8.11 h1:LzQzlq6Z023b+mBtc6v72N2mSHYmN8x7ssgbf/hv0H8=
16971691
sigs.k8s.io/kustomize/api v0.8.11/go.mod h1:a77Ls36JdfCWojpUqR6m60pdGY1AYFix4AH83nJtY1g=
16981692
sigs.k8s.io/kustomize/cmd/config v0.9.13/go.mod h1:7547FLF8W/lTaDf0BDqFTbZxM9zqwEJqCKN9sSR0xSs=

‎internal/service/v1/file/file.go

Lines changed: 9 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import (
66
"github.com/KubeOperator/kubepi/internal/model/v1/file"
77
"github.com/KubeOperator/kubepi/internal/service/v1/cluster"
88
"github.com/KubeOperator/kubepi/internal/service/v1/common"
9+
kubeClient "github.com/KubeOperator/kubepi/pkg/kubernetes"
910
"github.com/KubeOperator/kubepi/pkg/util"
10-
"github.com/KubeOperator/kubepi/pkg/util/kubernetes"
1111
"github.com/KubeOperator/kubepi/pkg/util/podbase"
12+
"k8s.io/client-go/kubernetes"
1213
"os"
1314
"path"
1415
"path/filepath"
@@ -74,26 +75,6 @@ func (f service) DownloadFile(request file.Request) (string, error) {
7475
if err != nil {
7576
return fileP, err
7677
}
77-
//clu, err := f.clusterService.Get(request.Cluster, common.DBOptions{})
78-
//if err != nil {
79-
// return fileP, err
80-
//}
81-
//config := &kubernetes.Config{
82-
// Host: clu.Spec.Connect.Forward.ApiServer,
83-
// Token: clu.Spec.Authentication.BearerToken,
84-
//}
85-
//k8sConfig := kubernetes.NewClusterConfig(config)
86-
//k8sClient, err := kubernetes.NewKubernetesClient(config)
87-
//if err != nil {
88-
// return fileP, err
89-
//}
90-
//pb := podbase.PodBase{
91-
// Namespace: request.Namespace,
92-
// PodName: request.PodName,
93-
// Container: request.ContainerName,
94-
// K8sClient: k8sClient,
95-
// RestClient: k8sConfig,
96-
//}
9778
exec := pb.NewPodExec()
9879
fileNameWithSuffix := path.Base(request.Path)
9980
fileType := path.Ext(fileNameWithSuffix)
@@ -113,28 +94,6 @@ func (f service) DownloadFile(request file.Request) (string, error) {
11394
}
11495

11596
func (f service) UploadFile(request file.Request) error {
116-
//clu, err := f.clusterService.Get(request.Cluster, common.DBOptions{})
117-
//if err != nil {
118-
// return err
119-
//}
120-
//config := &kubernetes.Config{
121-
// Host: clu.Spec.Connect.Forward.ApiServer,
122-
// Token: clu.Spec.Authentication.BearerToken,
123-
//}
124-
//k8sConfig := kubernetes.NewClusterConfig(config)
125-
//k8sClient, err := kubernetes.NewKubernetesClient(config)
126-
//if err != nil {
127-
// return err
128-
//}
129-
//pb := podbase.PodBase{
130-
// Namespace: request.Namespace,
131-
// PodName: request.PodName,
132-
// Container: request.ContainerName,
133-
// K8sClient: k8sClient,
134-
// RestClient: k8sConfig,
135-
//}
136-
//exec := pb.NewPodExec()
137-
13897
pb, err := f.GetPodBase(request)
13998
if err != nil {
14099
return err
@@ -153,21 +112,21 @@ func (f service) GetPodBase(request file.Request) (podbase.PodBase, error) {
153112
if err != nil {
154113
return pb, err
155114
}
156-
config := &kubernetes.Config{
157-
Host: clu.Spec.Connect.Forward.ApiServer,
158-
Token: clu.Spec.Authentication.BearerToken,
115+
client := kubeClient.Kubernetes{clu}
116+
config, err := client.Config()
117+
if err != nil {
118+
return pb, err
159119
}
160-
k8sConfig := kubernetes.NewClusterConfig(config)
161-
k8sClient, err := kubernetes.NewKubernetesClient(config)
120+
clientset, err := kubernetes.NewForConfig(config)
162121
if err != nil {
163122
return pb, err
164123
}
165124
pb = podbase.PodBase{
166125
Namespace: request.Namespace,
167126
PodName: request.PodName,
168127
Container: request.ContainerName,
169-
K8sClient: k8sClient,
170-
RestClient: k8sConfig,
128+
K8sClient: clientset,
129+
RestClient: config,
171130
}
172131
return pb, nil
173132
}

‎internal/service/v1/ldap/ldap.go

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ func (l *service) Create(ldap *v1Ldap.Ldap, options common.DBOptions) error {
5151
if err != nil {
5252
return err
5353
}
54-
username := ldap.Username + "," + ldap.Dn
55-
lc := ldapClient.NewLdapClient(ldap.Address, ldap.Port, username, ldap.Password, ldap.TLS)
54+
lc := ldapClient.NewLdapClient(ldap.Address, ldap.Port, ldap.Username, ldap.Password, ldap.TLS)
5655
err = lc.Connect()
5756
if err != nil {
5857
return err
@@ -79,8 +78,7 @@ func (l *service) Update(id string, ldap *v1Ldap.Ldap, options common.DBOptions)
7978
if err != nil {
8079
return err
8180
}
82-
username := ldap.Username + "," + ldap.Dn
83-
lc := ldapClient.NewLdapClient(ldap.Address, ldap.Port, username, ldap.Password, ldap.TLS)
81+
lc := ldapClient.NewLdapClient(ldap.Address, ldap.Port, ldap.Username, ldap.Password, ldap.TLS)
8482
if err := lc.Connect(); err != nil {
8583
return err
8684
}
@@ -131,8 +129,7 @@ func (l *service) Login(user v1User.User, password string, options common.DBOpti
131129
userFilter = "(" + v + "=" + user.Name + ")"
132130
}
133131
}
134-
username := ldap.Username + "," + ldap.Dn
135-
lc := ldapClient.NewLdapClient(ldap.Address, ldap.Port, username, ldap.Password, ldap.TLS)
132+
lc := ldapClient.NewLdapClient(ldap.Address, ldap.Port, ldap.Username, ldap.Password, ldap.TLS)
136133
if err := lc.Connect(); err != nil {
137134
return err
138135
}
@@ -144,8 +141,7 @@ func (l *service) Sync(id string, options common.DBOptions) error {
144141
if err != nil {
145142
return err
146143
}
147-
username := ldap.Username + "," + ldap.Dn
148-
lc := ldapClient.NewLdapClient(ldap.Address, ldap.Port, username, ldap.Password, ldap.TLS)
144+
lc := ldapClient.NewLdapClient(ldap.Address, ldap.Port, ldap.Username, ldap.Password, ldap.TLS)
149145
if err := lc.Connect(); err != nil {
150146
return err
151147
}

‎pkg/util/ldap/ldap_client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"crypto/tls"
55
"errors"
66
"fmt"
7-
"github.com/go-ldap/ldap"
7+
"github.com/go-ldap/ldap/v3"
88
)
99

1010
type Ldap struct {

‎pkg/util/mfa/mfa.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func GetOtp(username string) (otp Otp, err error) {
2020
secret := gotp.RandomSecret(secretLength)
2121
otp.Secret = secret
2222
totp := gotp.NewDefaultTOTP(secret)
23-
uri := totp.ProvisioningUri(username, "Kubepi")
23+
uri := totp.ProvisioningUri(username, "KubePi")
2424
subImg, err := qrcode.Encode(uri, qrcode.Medium, 256)
2525
dist := make([]byte, 3000)
2626
base64.StdEncoding.Encode(dist, subImg)

‎pkg/util/podbase/kotool.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,9 @@ func (p *PodBase) PodInfo() (*coreV1.Pod, error) {
4141

4242
func (p *PodBase) OsAndArch(nodeName string) (osType string, arch string) {
4343
// get pod system arch and type
44+
osType = "linux"
45+
arch = "amd64"
46+
4447
node, err := p.K8sClient.CoreV1().Nodes().
4548
Get(context.TODO(), nodeName, metaV1.GetOptions{})
4649
if err == nil {

‎web/dashboard/src/business/workloads/pods/podfilebrowser/index.vue

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,9 @@
124124
:title="$t('business.pod.upload')"
125125
:visible.sync="openUpload"
126126
:close-on-click-modal="false"
127+
:before-close="handleUploadClose"
127128
width="30%">
128-
<el-upload :on-change="onUploadChange" action="" :auto-upload="false" class="upload-demo" :multiple="false" :limit="1">
129+
<el-upload :on-change="onUploadChange" ref="upload" action="" :auto-upload="false" class="upload-demo" :multiple="false" :limit="1">
129130
<el-button>{{$t('business.pod.choose_file')}}</el-button>
130131
<div slot="tip" class="el-upload__tip">{{$t('business.pod.upload_tip')}}</div>
131132
</el-upload>
@@ -246,8 +247,13 @@ export default {
246247
this.$refs["renameForm"].resetFields()
247248
},
248249
openUploadPage() {
250+
this.file= {}
249251
this.openUpload = true
250252
},
253+
handleUploadClose() {
254+
this.openUpload = false
255+
this.$refs.upload.clearFiles();
256+
},
251257
handleFileClose() {
252258
this.openAddFile = false
253259
this.editFile = false
@@ -383,7 +389,7 @@ export default {
383389
type: "success",
384390
message: this.$t("commons.msg.upload_success"),
385391
})
386-
this.openUpload = false
392+
this.handleUploadClose()
387393
}).finally(() => {
388394
this.loading = false
389395
})

‎web/kubepi/src/business/user-management/ldap/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<el-checkbox v-model="form.tls">{{$t('commons.bool.true')}}</el-checkbox>
1515
</el-form-item>
1616
<el-form-item style="width: 100%" :label="$t('business.user.ldap_username')" prop="username">
17-
<el-input v-model="form.username" :placeholder="'cn=Manager'"></el-input>
17+
<el-input v-model="form.username" :placeholder="'cn=Manager,ou=users,dc=ko,dc=com or Manager@ko.com'"></el-input>
1818
</el-form-item>
1919
<el-form-item style="width: 100%" :label="$t('business.user.ldap_password')" prop="password">
2020
<el-input type="password" v-model="form.password"></el-input>

0 commit comments

Comments
 (0)