Skip to content

Commit 9a59dd9

Browse files
shanshanyingshanshanying
authored
chore: add pod manifest to report (#608)
1 parent 10f3afd commit 9a59dd9

File tree

8 files changed

+67
-39
lines changed

8 files changed

+67
-39
lines changed

‎go.mod

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
module github.com/apecloud/kbcli
22

3-
go 1.22.7
3+
go 1.23.0
4+
5+
toolchain go1.23.6
46

57
require (
68
cuelang.org/go v0.8.0
79
github.com/76creates/stickers v1.4.0
810
github.com/Masterminds/semver/v3 v3.3.0
911
github.com/NimbleMarkets/ntcharts v0.1.2
1012
github.com/apecloud/dbctl v0.0.0-20240827084000-68a1980b1a46
11-
github.com/apecloud/kubeblocks v1.0.0-beta.45
13+
github.com/apecloud/kubeblocks v1.0.0
1214
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2
1315
github.com/briandowns/spinner v1.23.0
1416
github.com/chaos-mesh/chaos-mesh/api v0.0.0-20230912020346-a5d89c1c90ad
@@ -54,10 +56,11 @@ require (
5456
github.com/stretchr/testify v1.10.0
5557
github.com/xeipuuv/gojsonschema v1.2.0
5658
go.uber.org/zap v1.27.0
57-
golang.org/x/crypto v0.31.0
59+
golang.org/x/crypto v0.39.0
5860
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
59-
golang.org/x/mod v0.20.0
60-
golang.org/x/sync v0.10.0
61+
golang.org/x/mod v0.25.0
62+
golang.org/x/net v0.40.0
63+
golang.org/x/sync v0.15.0
6164
gopkg.in/yaml.v2 v2.4.0
6265
helm.sh/helm/v3 v3.16.2
6366
k8s.io/api v0.31.1
@@ -336,13 +339,12 @@ require (
336339
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
337340
go.uber.org/multierr v1.11.0 // indirect
338341
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect
339-
golang.org/x/net v0.33.0 // indirect
340342
golang.org/x/oauth2 v0.24.0 // indirect
341-
golang.org/x/sys v0.28.0 // indirect
342-
golang.org/x/term v0.27.0 // indirect
343-
golang.org/x/text v0.21.0 // indirect
343+
golang.org/x/sys v0.33.0 // indirect
344+
golang.org/x/term v0.32.0 // indirect
345+
golang.org/x/text v0.26.0 // indirect
344346
golang.org/x/time v0.5.0 // indirect
345-
golang.org/x/tools v0.24.0 // indirect
347+
golang.org/x/tools v0.33.0 // indirect
346348
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
347349
google.golang.org/api v0.171.0 // indirect
348350
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect

‎go.sum

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -677,8 +677,8 @@ github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4x
677677
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
678678
github.com/apecloud/dbctl v0.0.0-20240827084000-68a1980b1a46 h1:+Jcc7IjDGxPgIfIkGX2Q5Yxj35U65zgcfjh0B9rDhjo=
679679
github.com/apecloud/dbctl v0.0.0-20240827084000-68a1980b1a46/go.mod h1:eksJtZ7z1nVcVLqDzAdcN5EfpHwXllIAvHZEks2zWys=
680-
github.com/apecloud/kubeblocks v1.0.0-beta.45 h1:Q+1ctqex9qlPe1XhoFe8N59/hh8+DbWC9WUX1xBEnNA=
681-
github.com/apecloud/kubeblocks v1.0.0-beta.45/go.mod h1:Mk5xRLm2MpxoTNZKEdDcrIY3I1EpokQBU3Q9Zwse8MI=
680+
github.com/apecloud/kubeblocks v1.0.0 h1:ditcH7RNZyDiWiHP1V7IuXWHdcBJv3/X5N89Qlz+xew=
681+
github.com/apecloud/kubeblocks v1.0.0/go.mod h1:Mk5xRLm2MpxoTNZKEdDcrIY3I1EpokQBU3Q9Zwse8MI=
682682
github.com/apparentlymart/go-textseg v1.0.0/go.mod h1:z96Txxhf3xSFMPmb5X/1W05FF/Nj9VFpLOpjS5yuumk=
683683
github.com/apparentlymart/go-textseg/v13 v13.0.0/go.mod h1:ZK2fH7c4NqDTLtiYLvIkEghdlcqw7yxLeM89kiTRPUo=
684684
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
@@ -1835,8 +1835,8 @@ golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98y
18351835
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
18361836
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
18371837
golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
1838-
golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
1839-
golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
1838+
golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
1839+
golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
18401840
golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
18411841
golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
18421842
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -1901,8 +1901,8 @@ golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
19011901
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
19021902
golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
19031903
golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
1904-
golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
1905-
golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
1904+
golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
1905+
golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
19061906
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
19071907
golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
19081908
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -1976,8 +1976,8 @@ golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
19761976
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
19771977
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
19781978
golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
1979-
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
1980-
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
1979+
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
1980+
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
19811981
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
19821982
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
19831983
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -2031,8 +2031,8 @@ golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
20312031
golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
20322032
golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
20332033
golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
2034-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
2035-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
2034+
golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
2035+
golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
20362036
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
20372037
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
20382038
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -2138,8 +2138,8 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21382138
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21392139
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
21402140
golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
2141-
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
2142-
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
2141+
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
2142+
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
21432143
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
21442144
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
21452145
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
@@ -2157,8 +2157,8 @@ golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
21572157
golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
21582158
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
21592159
golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
2160-
golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
2161-
golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
2160+
golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
2161+
golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
21622162
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
21632163
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
21642164
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -2179,8 +2179,8 @@ golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
21792179
golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
21802180
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
21812181
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
2182-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
2183-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
2182+
golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
2183+
golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
21842184
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
21852185
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
21862186
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -2263,8 +2263,8 @@ golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
22632263
golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
22642264
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
22652265
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
2266-
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
2267-
golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
2266+
golang.org/x/tools v0.33.0 h1:4qz2S3zmRxbGIhDIAgjxvFutSvH5EfnsYrRBj0UI0bc=
2267+
golang.org/x/tools v0.33.0/go.mod h1:CIJMaWEY88juyUfo7UbgPqbC8rU2OqfAV1h2Qp0oMYI=
22682268
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
22692269
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
22702270
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎hack/license/header-check.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/bash
22
#
33
# Copyright (C) 2022-2025 ApeCloud Co., Ltd
4-
#
4+
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
77
# You may obtain a copy of the License at
8-
#
8+
#
99
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
10+
#
1111
# Unless required by applicable law or agreed to in writing, software
1212
# distributed under the License is distributed on an "AS IS" BASIS,
1313
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,7 +24,7 @@ set -e -o pipefail
2424
# Initialize vars
2525
ERR=false
2626
FAIL=false
27-
EXCLUDES_DIRS="vendor/\|apis/\|tools/\|externalapis/\|pkg/lorry/component/\|pkg/cli/cmd/plugin/download"
27+
EXCLUDES_DIRS="vendor/\|apis/\|tools/\|externalapis/\|pkg/lorry/component/\|pkg/cmd/plugin/download"
2828
APACHE2_DIRS="apis/\|externalapis/"
2929

3030
for file in $(git ls-files | grep '\.cue\|\.go$' | grep -v ${EXCLUDES_DIRS}); do

‎pkg/cmd/addon/purge.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ import (
3434
cmdutil "k8s.io/kubectl/pkg/cmd/util"
3535
"k8s.io/kubectl/pkg/util/templates"
3636

37-
"github.com/apecloud/kbcli/pkg/util/prompt"
3837
kbv1alpha1 "github.com/apecloud/kubeblocks/apis/apps/v1alpha1"
3938
"github.com/apecloud/kubeblocks/apis/extensions/v1alpha1"
4039

40+
"github.com/apecloud/kbcli/pkg/util/prompt"
41+
4142
"github.com/apecloud/kbcli/pkg/types"
4243
"github.com/apecloud/kbcli/pkg/util"
4344
)

‎pkg/cmd/playground/init.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ func (o *initOptions) local() error {
219219
if err != nil {
220220
return err
221221
}
222-
return fmt.Errorf(fmt.Sprintf("k3s image not specified, you can run `rm -rf %s ` and retry", playgrouddir))
222+
return fmt.Errorf("k3s image not specified, you can run `rm -rf %s ` and retry", playgrouddir)
223223
}
224224
clusterInfo.K3sImage = cp.K3sImageDefault
225225
clusterInfo.K3dProxyImage = cp.K3dProxyImageDefault
@@ -343,7 +343,7 @@ func (o *initOptions) confirmToContinue() error {
343343

344344
func (o *initOptions) confirmInitNewKubeCluster() error {
345345
printer.Warning(o.Out, `This action will create a kubernetes cluster on the cloud that may
346-
incur charges. Be sure to delete your infrastructure properly to avoid additional charges.
346+
incur charges. Be sure to delete your infrastructure properly to avoid additional charges.
347347
`)
348348

349349
fmt.Fprintf(o.Out, `

‎pkg/cmd/report/report.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,9 @@ func (o *reportClusterOptions) handleManifests(ctx context.Context) error {
506506
types.OpsGVR(),
507507
types.PVCGVR(),
508508
types.ComponentGVR(),
509+
types.ParameterGVR(),
510+
types.ComponentParameterGVR(),
511+
types.PodGVR(),
509512
// TODO: add new configuration API
510513
}
511514
globalGvrs = []schema.GroupVersionResource{

‎pkg/testing/client.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ package testing
2222
import (
2323
kbappsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
2424
opsv1alpha1 "github.com/apecloud/kubeblocks/apis/operations/v1alpha1"
25+
parametersv1alpha1 "github.com/apecloud/kubeblocks/apis/parameters/v1alpha1"
2526
workloadsv1 "github.com/apecloud/kubeblocks/apis/workloads/v1"
27+
2628
"k8s.io/apimachinery/pkg/runtime"
2729
dynamicfakeclient "k8s.io/client-go/dynamic/fake"
2830
kubefakeclient "k8s.io/client-go/kubernetes/fake"
@@ -49,6 +51,8 @@ func FakeDynamicClient(objects ...runtime.Object) *dynamicfakeclient.FakeDynamic
4951
_ = extensionsv1alpha1.AddToScheme(scheme.Scheme)
5052
_ = dpv1alpha1.AddToScheme(scheme.Scheme)
5153
_ = workloadsv1.AddToScheme(scheme.Scheme)
54+
_ = parametersv1alpha1.AddToScheme(scheme.Scheme)
55+
5256
return dynamicfakeclient.NewSimpleDynamicClient(scheme.Scheme, objects...)
5357
}
5458

‎pkg/types/types.go

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,8 +131,6 @@ const (
131131
KindDeployment = "Deployment"
132132
KindConfigMap = "ConfigMap"
133133
KindCronJob = "CronJob"
134-
KindParametersDef = "ParametersDefinition"
135-
KindParameterConfigRender = "ParameterConfigRender"
136134
)
137135

138136
// K8S rbac API group
@@ -178,8 +176,18 @@ const (
178176
ResourceBackupRepos = "backuprepos"
179177
ResourceBackupSchedules = "backupschedules"
180178
ResourceBackupTemplates = "backuppolicytemplates"
181-
ParametersAPIGroup = "parameters.kubeblocks.io"
182-
ParametersAPIVersion = "v1alpha1"
179+
)
180+
181+
// Parameters API group
182+
const (
183+
ParametersAPIGroup = "parameters.kubeblocks.io"
184+
ParametersAPIVersion = "v1alpha1"
185+
186+
KindParametersDef = "ParametersDefinition"
187+
KindParameterConfigRender = "ParameterConfigRender"
188+
189+
ResourceParameters = "parameters"
190+
ResourceComponentParameters = "componentparameters"
183191
)
184192

185193
// Extensions API group
@@ -498,3 +506,13 @@ func CronJobGVR() schema.GroupVersionResource {
498506
func TraceGVR() schema.GroupVersionResource {
499507
return schema.GroupVersionResource{Group: TraceAPIGroup, Version: TraceAPIVersion, Resource: ResourceTrace}
500508
}
509+
510+
// Parameters API group
511+
512+
func ParameterGVR() schema.GroupVersionResource {
513+
return schema.GroupVersionResource{Group: ParametersAPIGroup, Version: ParametersAPIVersion, Resource: ResourceParameters}
514+
}
515+
516+
func ComponentParameterGVR() schema.GroupVersionResource {
517+
return schema.GroupVersionResource{Group: ParametersAPIGroup, Version: ParametersAPIVersion, Resource: ResourceComponentParameters}
518+
}

0 commit comments

Comments
 (0)