1
0
mirror of https://github.com/kairos-io/provider-k3s.git synced 2025-05-11 17:39:01 +00:00
This commit is contained in:
Nianyu Shen 2024-09-22 19:40:33 -07:00
parent b2e0f92ecd
commit fd62566b6b
No known key found for this signature in database
GPG Key ID: 624F14EA93C848DD
2 changed files with 1 additions and 5 deletions

View File

@ -6,10 +6,6 @@ repos:
- repo: https://github.com/tekwizely/pre-commit-golang
rev: v1.0.0-rc.1
hooks:
- id: my-cmd-repo
name: go-work-sync
alias: go-work-sync
args: [go, work, sync]
- id: go-mod-tidy
- repo: https://github.com/golangci/golangci-lint
rev: v1.61.0

View File

@ -90,7 +90,7 @@ func parseOptions(cluster clusterplugin.Cluster) ([]byte, []byte, []byte) {
options, _ := json.Marshal(k3sConfig)
// if provided, parse additional K3s server options (which may override the above settings)
if cluster.ProviderOptions != nil && len(cluster.ProviderOptions) > 0 {
if len(cluster.ProviderOptions) > 0 {
logrus.Infof("applying cluster provider options: %+v", cluster.ProviderOptions)
providerOpts, err := yaml.Marshal(cluster.ProviderOptions)