github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix package / struct naming after core refactoring.

pull/6/head
Atanas Mirchev 2016-09-22 14:47:23 +02:00 committed by Ilya Dmitrichenko
parent 832d83efaa
commit ab3b2d579f
No known key found for this signature in database
GPG Key ID: E7889175A6C0CEB9
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/master/addons.go
View File

@ -26,7 +26,7 @@ import (
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/resource" "k8s.io/kubernetes/pkg/api/resource"
clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset" clientset "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
ipallocator "k8s.io/kubernetes/pkg/registry/service/ipallocator" ipallocator "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
"k8s.io/kubernetes/pkg/util/intstr" "k8s.io/kubernetes/pkg/util/intstr"
) )

8
cmd/kubeadm/app/master/pki.go
View File

@ -23,7 +23,7 @@ import (
"path" "path"
kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/api" kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/api"
ipallocator "k8s.io/kubernetes/pkg/registry/service/ipallocator" ipallocator "k8s.io/kubernetes/pkg/registry/core/service/ipallocator"
certutil "k8s.io/kubernetes/pkg/util/cert" certutil "k8s.io/kubernetes/pkg/util/cert"
) )
@ -33,7 +33,7 @@ func newCertificateAuthority() (*rsa.PrivateKey, *x509.Certificate, error) {
return nil, nil, fmt.Errorf("unable to create private key [%s]", err) return nil, nil, fmt.Errorf("unable to create private key [%s]", err)
} }
config := certutil.CertConfig{ config := certutil.Config{
CommonName: "kubernetes", CommonName: "kubernetes",
} }
@ -66,7 +66,7 @@ func newServerKeyAndCert(s *kubeadmapi.KubeadmConfig, caCert *x509.Certificate,
altNames.IPs = append(altNames.IPs, internalAPIServerVirtualIP) altNames.IPs = append(altNames.IPs, internalAPIServerVirtualIP)
altNames.DNSNames = append(altNames.DNSNames, internalAPIServerFQDN...) altNames.DNSNames = append(altNames.DNSNames, internalAPIServerFQDN...)
config := certutil.CertConfig{ config := certutil.Config{
CommonName: "kube-apiserver", CommonName: "kube-apiserver",
AltNames: altNames, AltNames: altNames,
} }
@ -84,7 +84,7 @@ func newClientKeyAndCert(caCert *x509.Certificate, caKey *rsa.PrivateKey) (*rsa.
return nil, nil, fmt.Errorf("unable to create private key [%s]", err) return nil, nil, fmt.Errorf("unable to create private key [%s]", err)
} }
config := certutil.CertConfig{ config := certutil.Config{
CommonName: "kubernetes-admin", CommonName: "kubernetes-admin",
} }
cert, err := certutil.NewSignedCert(config, key, caCert, caKey) cert, err := certutil.NewSignedCert(config, key, caCert, caKey)