Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use --dns-domain for k8s API server cert generation #1589

Merged
merged 2 commits into from
Jun 15, 2017
Merged

use --dns-domain for k8s API server cert generation #1589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
72fee3e
use --dns-domain for k8s API server cert
shaneramey Jun 14, 2017
ba423e0
fix gofmt errors
shaneramey Jun 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/minikube/cmd/start.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func runStart(cmd *cobra.Command, args []string) {
}

fmt.Println("Setting up certs...")
if err := cluster.SetupCerts(host.Driver, kubernetesConfig.APIServerName); err != nil {
if err := cluster.SetupCerts(host.Driver, kubernetesConfig.APIServerName, kubernetesConfig.DNSDomain); err != nil {
glog.Errorln("Error configuring authentication: ", err)
cmdUtil.MaybeReportErrorAndExit(err)
}
Expand Down Expand Up @@ -292,7 +292,7 @@ func init() {
startCmd.Flags().StringArrayVar(&dockerEnv, "docker-env", nil, "Environment variables to pass to the Docker daemon. (format: key=value)")
startCmd.Flags().StringArrayVar(&dockerOpt, "docker-opt", nil, "Specify arbitrary flags to pass to the Docker daemon. (format: key=value)")
startCmd.Flags().String(apiServerName, constants.APIServerName, "The apiserver name which is used in the generated certificate for localkube/kubernetes. This can be used if you want to make the apiserver available from outside the machine")
startCmd.Flags().String(dnsDomain, "", "The cluster dns domain name used in the kubernetes cluster")
startCmd.Flags().String(dnsDomain, constants.ClusterDNSDomain, "The cluster dns domain name used in the kubernetes cluster")
startCmd.Flags().StringSliceVar(&insecureRegistry, "insecure-registry", nil, "Insecure Docker registries to pass to the Docker daemon")
startCmd.Flags().StringSliceVar(&registryMirror, "registry-mirror", nil, "Registry mirrors to pass to the Docker daemon")
startCmd.Flags().String(kubernetesVersion, constants.DefaultKubernetesVersion, "The kubernetes version that the minikube VM will use (ex: v1.2.3) \n OR a URI which contains a localkube binary (ex: https://storage.googleapis.com/minikube/k8sReleases/v1.3.0/localkube-linux-amd64)")
Expand Down
4 changes: 2 additions & 2 deletions pkg/minikube/cluster/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ func localkubeURIWasSpecified(config KubernetesConfig) bool {
}

// SetupCerts gets the generated credentials required to talk to the APIServer.
func SetupCerts(d drivers.Driver, apiServerName string) error {
func SetupCerts(d drivers.Driver, apiServerName string, clusterDnsDomain string) error {
localPath := constants.GetMinipath()
ipStr, err := d.GetIP()
if err != nil {
Expand All @@ -260,7 +260,7 @@ func SetupCerts(d drivers.Driver, apiServerName string) error {
caKey := filepath.Join(localPath, "ca.key")
publicPath := filepath.Join(localPath, "apiserver.crt")
privatePath := filepath.Join(localPath, "apiserver.key")
if err := GenerateCerts(caCert, caKey, publicPath, privatePath, ip, apiServerName); err != nil {
if err := GenerateCerts(caCert, caKey, publicPath, privatePath, ip, apiServerName, clusterDnsDomain); err != nil {
return errors.Wrap(err, "Error generating certs")
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/minikube/cluster/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ func TestSetupCerts(t *testing.T) {
tempDir := tests.MakeTempDir()
defer os.RemoveAll(tempDir)

if err := SetupCerts(d, constants.APIServerName); err != nil {
if err := SetupCerts(d, constants.APIServerName, constants.ClusterDNSDomain); err != nil {
t.Fatalf("Error starting cluster: %s", err)
}

Expand Down
4 changes: 2 additions & 2 deletions pkg/minikube/cluster/credentials.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ var (
internalIP = net.ParseIP(util.DefaultServiceClusterIP)
)

func GenerateCerts(caCert, caKey, pub, priv string, ip net.IP, name string) error {
func GenerateCerts(caCert, caKey, pub, priv string, ip net.IP, name string, dnsDomain string) error {
if !(util.CanReadFile(caCert) && util.CanReadFile(caKey)) {
if err := util.GenerateCACert(caCert, caKey, name); err != nil {
return errors.Wrap(err, "Error generating certificate")
}
}

ips := []net.IP{ip, internalIP}
if err := util.GenerateSignedCert(pub, priv, ips, util.GetAlternateDNS(util.DefaultDNSDomain), caCert, caKey); err != nil {
if err := util.GenerateSignedCert(pub, priv, ips, util.GetAlternateDNS(dnsDomain), caCert, caKey); err != nil {
return errors.Wrap(err, "Error generating signed cert")
}
return nil
Expand Down
5 changes: 3 additions & 2 deletions pkg/minikube/constants/constants.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ import (

// APIServerPort is the port that the API server should listen on.
const (
APIServerPort = 8443
APIServerName = "minikubeCA"
APIServerPort = 8443
APIServerName = "minikubeCA"
ClusterDNSDomain = "cluster.local"
)

const MinikubeHome = "MINIKUBE_HOME"
Expand Down