rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-16 06:59:25 +00:00
Code Issues Releases Wiki Activity

Use golangci-lint v0.40.1

Browse Source
This commit is contained in:
Sebastiaan van Steenis
2021-06-06 09:16:44 +02:00
parent 0ea542079a
commit 9c711e669c
19 changed files with 105 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cluster/encryption.go
View File

@@ -335,11 +335,7 @@ func (c *Cluster) updateEncryptionProvider(ctx context.Context, keys []*encrypti
if err := c.UpdateClusterCurrentState(ctx, fullState); err != nil {
return err
}
if err := services.RestartKubeAPIWithHealthcheck(ctx, c.ControlPlaneHosts, c.LocalConnDialerFactory, c.Certificates); err != nil {
return err
}
return nil
return services.RestartKubeAPIWithHealthcheck(ctx, c.ControlPlaneHosts, c.LocalConnDialerFactory, c.Certificates)
}
func (c *Cluster) DeployEncryptionProviderFile(ctx context.Context) error {
@@ -525,7 +521,7 @@ func resolveCustomEncryptionConfig(clusterFile string) (string, *apiserverconfig
var r map[string]interface{}
err = ghodssyaml.Unmarshal([]byte(clusterFile), &r)
if err != nil {
return clusterFile, nil, fmt.Errorf("error unmarshalling: %v", err)
return clusterFile, nil, fmt.Errorf("error unmarshalling clusterfile: %v", err)
}
services, ok := r["services"].(map[string]interface{})
if services == nil || !ok {
@@ -544,6 +540,9 @@ func resolveCustomEncryptionConfig(clusterFile string) (string, *apiserverconfig
if ok && customConfig != nil {
delete(sec, "custom_config")
newClusterFile, err := ghodssyaml.Marshal(r)
if err != nil {
return clusterFile, nil, fmt.Errorf("error marshalling clusterfile: %v", err)
}
c, err := parseCustomConfig(customConfig)
return string(newClusterFile), c, err
}