github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Strip tokens from kubeadm-config config map

Browse Source
This commit is contained in:
fabriziopandini 2017-10-07 14:40:48 +02:00
parent 2d1626028e
commit c266f764ec
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/app/phases/uploadconfig/uploadconfig.go
View File

@ -40,6 +40,9 @@ func UploadConfiguration(cfg *kubeadmapi.MasterConfiguration, client clientset.I
externalcfg := &kubeadmapiext.MasterConfiguration{}
api.Scheme.Convert(cfg, externalcfg, nil)
// Removes sensitive info from the data that will be stored in the config map
externalcfg.Token = ""
cfgYaml, err := yaml.Marshal(*externalcfg)
if err != nil {
return err

5
cmd/kubeadm/app/phases/uploadconfig/uploadconfig_test.go
View File

@ -64,6 +64,7 @@ func TestUploadConfiguration(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
cfg := &kubeadmapi.MasterConfiguration{
KubernetesVersion: "1.7.3",
Token: "1234567",
}
client := clientsetfake.NewSimpleClientset()
if tt.errOnCreate != nil {
@ -108,6 +109,10 @@ func TestUploadConfiguration(t *testing.T) {
if decodedCfg.KubernetesVersion != cfg.KubernetesVersion {
t.Errorf("Decoded value doesn't match, decoded = %#v, expected = %#v", decodedCfg.KubernetesVersion, cfg.KubernetesVersion)
}
if decodedCfg.Token != "" {
t.Errorf("Decoded value contains token (sensitive info), decoded = %#v, expected = empty", decodedCfg.Token)
}
}
})
}