mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-10-29 04:39:16 +00:00
810e9e107f
Fix boilerplates, comments in the code and make the output of kubeadm more user-friendly
Start using HostPKIPath and KubernetesDir everywhere in the code, so they can be changed for real
More robust kubeadm reset code now.
Removed old glog-things from app.Run()
Renamed /etc/kubernetes/cloud-config.json to /etc/kubernetes/cloud-config since it shouldn't be a json file
Simplification of the code
Less verbose output from master/pki.go
Cleaned up dead code
Start a small logging/output framework:
- fmt.Println("[the-stage-here] Capital first letter of this message. Tell the user what the current state is")
- fmt.Printf("[the-stage-here] Capital first letter. Maybe a [%v] in the end if an error should be displayed. Always ends with \n")
- fmt.Errorf("Never starts with []. Includes a short error message plus the underlying error in [%v]. Never ends with \n")
65 lines
2.1 KiB
Go
65 lines
2.1 KiB
Go
/*
|
|
Copyright 2016 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package master
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"os"
|
|
"path"
|
|
|
|
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
|
|
kubeadmutil "k8s.io/kubernetes/cmd/kubeadm/app/util"
|
|
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
|
|
"k8s.io/kubernetes/pkg/util/uuid"
|
|
)
|
|
|
|
func generateTokenIfNeeded(s *kubeadmapi.Secrets) error {
|
|
ok, err := kubeadmutil.UseGivenTokenIfValid(s)
|
|
// TODO(phase1+) @krousey: I know it won't happen with the way it is currently implemented, but this doesn't handle case where ok is true and err is non-nil.
|
|
if !ok {
|
|
if err != nil {
|
|
return err
|
|
}
|
|
err = kubeadmutil.GenerateToken(s)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
fmt.Printf("[tokens] Generated token: %q\n", s.GivenToken)
|
|
} else {
|
|
fmt.Println("[tokens] Accepted provided token")
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func CreateTokenAuthFile(s *kubeadmapi.Secrets) error {
|
|
tokenAuthFilePath := path.Join(kubeadmapi.GlobalEnvParams.HostPKIPath, "tokens.csv")
|
|
if err := generateTokenIfNeeded(s); err != nil {
|
|
return fmt.Errorf("failed to generate token(s) [%v]", err)
|
|
}
|
|
if err := os.MkdirAll(kubeadmapi.GlobalEnvParams.HostPKIPath, 0700); err != nil {
|
|
return fmt.Errorf("failed to create directory %q [%v]", kubeadmapi.GlobalEnvParams.HostPKIPath, err)
|
|
}
|
|
serialized := []byte(fmt.Sprintf("%s,kubeadm-node-csr,%s,system:kubelet-bootstrap\n", s.BearerToken, uuid.NewUUID()))
|
|
// DumpReaderToFile create a file with mode 0600
|
|
if err := cmdutil.DumpReaderToFile(bytes.NewReader(serialized), tokenAuthFilePath); err != nil {
|
|
return fmt.Errorf("failed to save token auth file (%q) [%v]", tokenAuthFilePath, err)
|
|
}
|
|
return nil
|
|
}
|