rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-06-21 13:07:08 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2596 from chaudhryfaisal/CustomCertsEncryptionConfig

Browse Source 
set EncryptionConfig on DesiredState when using CustomCerts
This commit is contained in:
Sebastiaan van Steenis 2021-07-06 22:27:29 +02:00 committed by GitHub
commit 0650395889
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cluster/state.go
View File

@ -182,6 +182,11 @@ func RebuildState(ctx context.Context, kubeCluster *Cluster, oldState *FullState
} }
newState.DesiredState.CertificatesBundle = certBundle newState.DesiredState.CertificatesBundle = certBundle
newState.CurrentState = oldState.CurrentState newState.CurrentState = oldState.CurrentState
err = updateEncryptionConfig(kubeCluster, oldState, newState)
if err != nil {
return nil, err
}
return newState, nil return newState, nil
} }
@ -341,7 +346,12 @@ func rebuildExistingState(ctx context.Context, kubeCluster *Cluster, oldState, n
return err return err
} }
newState.DesiredState.CertificatesBundle = pkiCertBundle newState.DesiredState.CertificatesBundle = pkiCertBundle
if isEncryptionEnabled(rkeConfig) { err := updateEncryptionConfig(kubeCluster, oldState, newState)
return err
}
func updateEncryptionConfig(kubeCluster *Cluster, oldState *FullState, newState *FullState) error {
if isEncryptionEnabled(&kubeCluster.RancherKubernetesEngineConfig) {
if oldState.DesiredState.EncryptionConfig != "" { if oldState.DesiredState.EncryptionConfig != "" {
newState.DesiredState.EncryptionConfig = oldState.DesiredState.EncryptionConfig newState.DesiredState.EncryptionConfig = oldState.DesiredState.EncryptionConfig
} else { } else {
@ -351,6 +361,5 @@ func rebuildExistingState(ctx context.Context, kubeCluster *Cluster, oldState, n
} }
} }
} }
return nil return nil
} }