rancher/norman
1
0
Fork 0
mirror of https://github.com/rancher/norman.git synced 2025-09-27 15:44:10 +00:00
Code Issues Releases Wiki Activity

Update to k8s v1.17.0

Browse Source
This commit is contained in:
Darren Shepherd
2020-01-23 09:51:12 -07:00
parent c95753fa57
commit 507d06b83f
407 changed files with 36686 additions and 11935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
vendor/k8s.io/client-go/util/cert/io.go generated vendored
View File

@@ -72,7 +72,22 @@ func WriteCert(certPath string, data []byte) error {
// NewPool returns an x509.CertPool containing the certificates in the given PEM-encoded file.
// Returns an error if the file could not be read, a certificate could not be parsed, or if the file does not contain any certificates
func NewPool(filename string) (*x509.CertPool, error) {
certs, err := CertsFromFile(filename)
pemBlock, err := ioutil.ReadFile(filename)
if err != nil {
return nil, err
}
pool, err := NewPoolFromBytes(pemBlock)
if err != nil {
return nil, fmt.Errorf("error creating pool from %s: %s", filename, err)
}
return pool, nil
}
// NewPoolFromBytes returns an x509.CertPool containing the certificates in the given PEM-encoded bytes.
// Returns an error if the file could not be read, a certificate could not be parsed, or if the file does not contain any certificates
func NewPoolFromBytes(pemBlock []byte) (*x509.CertPool, error) {
certs, err := ParseCertsPEM(pemBlock)
if err != nil {
return nil, err
}