github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-19 09:52:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #111783 from SataQiu/fix-kubeadm-20220810

Browse Source 
kubeadm: try to load CA cert from external CertificateAuthority file when CertificateAuthorityData is empty for existing kubeconfig
This commit is contained in:
Kubernetes Prow Robot 2022-08-23 19:00:36 -07:00 committed by GitHub
commit 17e03f858e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/kubeadm/app/phases/kubeconfig/kubeconfig.go
View File

@ -22,6 +22,7 @@ import (
"crypto/x509"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"time"
@ -238,6 +239,18 @@ func validateKubeConfig(outDir, filename string, config *clientcmdapi.Config) er
// the base64 CA and places it raw in the v1.Config object. In case the user has extra whitespace
// in the CA they used to create a kubeconfig this comparison to a generated v1.Config will otherwise fail.
caCurrent := bytes.TrimSpace(currentConfig.Clusters[currentCluster].CertificateAuthorityData)
if len(caCurrent) == 0 {
// fallback to load CA cert data from external CA file
clusterCAFilePath := currentConfig.Clusters[currentCluster].CertificateAuthority
if len(clusterCAFilePath) > 0 {
clusterCABytes, err := ioutil.ReadFile(clusterCAFilePath)
if err != nil {
klog.Warningf("failed to load CA cert from %q for kubeconfig %q, %v", clusterCAFilePath, kubeConfigFilePath, err)
} else {
caCurrent = bytes.TrimSpace(clusterCABytes)
}
}
}
caExpected := bytes.TrimSpace(config.Clusters[expectedCluster].CertificateAuthorityData)
// If the current CA cert on disk doesn't match the expected CA cert, error out because we have a file, but it's stale

25
cmd/kubeadm/app/phases/kubeconfig/kubeconfig_test.go
View File

@ -22,6 +22,7 @@ import (
"crypto/x509"
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
"reflect"
@ -483,6 +484,25 @@ func TestValidateKubeConfig(t *testing.T) {
configWithAnotherClusterCa := setupdKubeConfigWithClientAuth(t, anotherCaCert, anotherCaKey, "https://1.2.3.4:1234", "test-cluster", "myOrg1")
configWithAnotherServerURL := setupdKubeConfigWithClientAuth(t, caCert, caKey, "https://4.3.2.1:4321", "test-cluster", "myOrg1")
configWithSameClusterCaByExternalFile := config.DeepCopy()
currentCtx, exists := configWithSameClusterCaByExternalFile.Contexts[configWithSameClusterCaByExternalFile.CurrentContext]
if !exists {
t.Fatal("failed to find CurrentContext in Contexts of the kubeconfig")
}
if configWithSameClusterCaByExternalFile.Clusters[currentCtx.Cluster] == nil {
t.Fatal("failed to find the given CurrentContext Cluster in Clusters of the kubeconfig")
}
tmpfile, err := ioutil.TempFile("", "external-ca.crt")
if err != nil {
t.Fatal(err)
}
defer os.Remove(tmpfile.Name())
if _, err := tmpfile.Write(pkiutil.EncodeCertPEM(caCert)); err != nil {
t.Fatal(err)
}
configWithSameClusterCaByExternalFile.Clusters[currentCtx.Cluster].CertificateAuthorityData = nil
configWithSameClusterCaByExternalFile.Clusters[currentCtx.Cluster].CertificateAuthority = tmpfile.Name()
// create a valid config but with whitespace around the CA PEM.
// validateKubeConfig() should tolerate that.
configWhitespace := config.DeepCopy()
@ -519,6 +539,11 @@ func TestValidateKubeConfig(t *testing.T) {
kubeConfig: config,
expectedError: false,
},
"kubeconfig exist and is valid even if its CA is provided as an external file": {
existingKubeConfig: configWithSameClusterCaByExternalFile,
kubeConfig: config,
expectedError: false,
},
}
for name, test := range tests {