Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: do not create the kcl.mod.lock file when building config #720

Merged
merged 3 commits into from
Dec 25, 2023
Merged

feat: do not create the kcl.mod.lock file when building config #720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b0c0aac
feat: do not create the kcl.mod.lock file when building config
SparkYuan Dec 21, 2023
cfe1db5
test: for test
SparkYuan Dec 25, 2023
72a0016
feat: do not create the kcl.mod.lock file when building config
SparkYuan Dec 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ require (
k8s.io/component-base v0.27.2
k8s.io/kubectl v0.27.1
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
kcl-lang.io/kcl-go v0.7.0
kcl-lang.io/kcl-go v0.7.1
kcl-lang.io/kcl-plugin v0.5.0
kcl-lang.io/kpm v0.4.2
kcl-lang.io/kpm v0.4.7
kusionstack.io/kube-api v0.1.1
sigs.k8s.io/controller-runtime v0.15.1
)
Expand Down Expand Up @@ -100,6 +100,7 @@ require (
github.com/xlab/treeprint v1.1.0 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
gopkg.in/ini.v1 v1.66.2 // indirect
kcl-lang.io/lib v0.7.3 // indirect
sigs.k8s.io/kustomize/api v0.13.2 // indirect
sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
)
Expand Down Expand Up @@ -285,7 +286,6 @@ require (
gopkg.in/warnings.v0 v0.1.2 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
kcl-lang.io/kcl-artifact-go v0.7.1 // indirect
lukechampine.com/frand v1.4.2 // indirect
oras.land/oras-go v1.2.3 // indirect
oras.land/oras-go/v2 v2.3.0 // indirect
Expand Down
12 changes: 6 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,14 +974,14 @@ k8s.io/kubectl v0.27.1 h1:9T5c5KdpburYiW8XKQSH0Uly1kMNE90aGSnbYUZNdcA=
k8s.io/kubectl v0.27.1/go.mod h1:QsAkSmrRsKTPlAFzF8kODGDl4p35BIwQnc9XFhkcsy8=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI=
k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
kcl-lang.io/kcl-artifact-go v0.7.1 h1:tPSJxVKNm3+QseqtyDwtfx9qTeAioyHNYJIUsz7djqU=
kcl-lang.io/kcl-artifact-go v0.7.1/go.mod h1:c07mqi9Hu2UjPW7lYfHhAAWOlZiB7lo7Vkr4jL5ov/M=
kcl-lang.io/kcl-go v0.7.0 h1:mcYpQA+0JvlJ48rGec10GaASsRclJgAY18tz3AjWbEc=
kcl-lang.io/kcl-go v0.7.0/go.mod h1:ZEA8AA/L+vvp68PeBX16aR1Se81hLAWNp+7Qa2cYWdo=
kcl-lang.io/kcl-go v0.7.1 h1:qulSVPT7Kpn68ol35WGABnidhitnC5vGhRsmzEKlnuM=
kcl-lang.io/kcl-go v0.7.1/go.mod h1:byAAoC83Lfk88n33pgADSJAwF6iJcxCl5Z2gbCbKyGw=
kcl-lang.io/kcl-plugin v0.5.0 h1:eoh6y4l81rwA8yhJXU4hN7YmJeTUNB1nfYCP9OffSxc=
kcl-lang.io/kcl-plugin v0.5.0/go.mod h1:QnZ5OLcyBw5nOnHpChRHtvBq8wvjwiHu/ZZ8j1dfz48=
kcl-lang.io/kpm v0.4.2 h1:rEjfUdX+2kmwwuBaYvsNURQ5D97C3qLNBYAd+XT+DbU=
kcl-lang.io/kpm v0.4.2/go.mod h1:9C/Q9RhRDinbhN7HzQxEexw00HVWUYwWbarMuC1E4xM=
kcl-lang.io/kpm v0.4.7 h1:8jHcBk0qxWHCBXbNLv/VbUoKkgsyr0YfhooO7zk1Guk=
kcl-lang.io/kpm v0.4.7/go.mod h1:Ba2ijUHQR/sMdB4S7982vOrajly4LdgshrqXd2SXBog=
kcl-lang.io/lib v0.7.3 h1:YsKBo5jrICQ3fJobywkB9dFfVIW/ixCAkqmYQ5Z2lqQ=
kcl-lang.io/lib v0.7.3/go.mod h1:ubsalGXxJaa5II/EsHmsI/tL2EluYHIcW+BwzQPt+uY=
kusionstack.io/kube-api v0.1.1 h1:ieoZhaUfK78hsyQ7GsU6ZuxBAcVU+ZuKs7vedGkO8sI=
kusionstack.io/kube-api v0.1.1/go.mod h1:QIQrH+MK9xuV+mXCAkk6DN8z6b8oyf4XN0VRccmHH/k=
lukechampine.com/frand v1.4.2 h1:RzFIpOvkMXuPMBb9maa4ND4wjBn71E1Jpf8BzJHMaVw=
Expand Down
8 changes: 3 additions & 5 deletions pkg/cmd/build/builders/kcl/kcl_builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,9 @@ func Run(o *builders.Options, stack *v1.Stack) (*CompileResult, error) {

var result *kcl.KCLResultList
if o.IsKclPkg {
result, err = api.RunPkgWithOpt(
&opt.CompileOptions{
Option: kclpkg.NewOption().Merge(optList...),
},
result, err = api.RunWithOpts(
opt.WithKclOption(*kclpkg.NewOption().Merge(optList...)),
opt.WithNoSumCheck(true),
)
} else {
// call kcl run
Expand Down Expand Up @@ -187,7 +186,6 @@ func BuildKCLOptions(o *builders.Options) ([]kcl.Option, error) {
if withOpt.Err != nil {
return nil, withOpt.Err
}

optList = append(optList, withOpt)

if arguments[IncludeSchemaTypePath] == "true" {
Expand Down
Loading