rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-12 04:03:01 +00:00
Code Issues Releases Wiki Activity

linting fixes

Browse Source
This commit is contained in:
moelsayed 2017-11-08 02:32:55 +02:00
parent eed7152d1a
commit bfae4c15d4
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/addons.go
View File

@ -9,15 +9,13 @@ import (
) )
const ( const (
ClusterDnsServerIPEnvName = "RKE_DNS_SERVER" ClusterDNSServerIPEnvName = "RKE_DNS_SERVER"
ClusterDomainEnvName = "RKE_CLUSTER_DOMAIN" ClusterDomainEnvName = "RKE_CLUSTER_DOMAIN"
) )
func (c *Cluster) DeployK8sAddOns() error { func (c *Cluster) DeployK8sAddOns() error {
if err := c.deployKubeDNS(); err != nil { err := c.deployKubeDNS()
return err return err
}
return nil
} }
func (c *Cluster) deployKubeDNS() error { func (c *Cluster) deployKubeDNS() error {
@ -27,7 +25,7 @@ func (c *Cluster) deployKubeDNS() error {
env := []string{ env := []string{
fmt.Sprintf("%s=%s", pki.KubeAdminConfigENVName, c.Certificates[pki.KubeAdminCommonName].Config), fmt.Sprintf("%s=%s", pki.KubeAdminConfigENVName, c.Certificates[pki.KubeAdminCommonName].Config),
fmt.Sprintf("%s=%s", ClusterDnsServerIPEnvName, c.ClusterDnsServer), fmt.Sprintf("%s=%s", ClusterDNSServerIPEnvName, c.ClusterDNSServer),
fmt.Sprintf("%s=%s", ClusterDomainEnvName, c.ClusterDomain), fmt.Sprintf("%s=%s", ClusterDomainEnvName, c.ClusterDomain),
} }

4
cluster/cluster.go
View File

@ -24,7 +24,7 @@ type Cluster struct {
ClusterDomain string ClusterDomain string
NetworkPlugin string `yaml:"network_plugin"` NetworkPlugin string `yaml:"network_plugin"`
ClusterCIDR string ClusterCIDR string
ClusterDnsServer string ClusterDNSServer string
} }
const ( const (
@ -69,7 +69,7 @@ func ParseConfig(clusterFile string) (*Cluster, error) {
} }
c.ClusterDomain = c.Services.Kubelet.ClusterDomain c.ClusterDomain = c.Services.Kubelet.ClusterDomain
c.ClusterCIDR = c.Services.KubeController.ClusterCIDR c.ClusterCIDR = c.Services.KubeController.ClusterCIDR
c.ClusterDnsServer = c.Services.Kubelet.ClusterDnsServer c.ClusterDNSServer = c.Services.Kubelet.ClusterDNSServer
return c, nil return c, nil
} }

4
cmd/cluster.go
View File

@ -79,12 +79,12 @@ func ClusterUp(clusterFile, authType string) (string, string, string, string, er
err = kubeCluster.DeployNetworkPlugin() err = kubeCluster.DeployNetworkPlugin()
if err != nil { if err != nil {
return ApiURL, caCrt, clientCert, clientKey, err return APIURL, caCrt, clientCert, clientKey, err
} }
err = kubeCluster.DeployK8sAddOns() err = kubeCluster.DeployK8sAddOns()
if err != nil { if err != nil {
return ApiURL, caCrt, clientCert, clientKey, err return APIURL, caCrt, clientCert, clientKey, err
} }
err = kubeCluster.SaveClusterState(clusterFile) err = kubeCluster.SaveClusterState(clusterFile)

2
services/kubelet.go
View File

@ -26,7 +26,7 @@ func buildKubeletConfig(host hosts.Host, kubeletService Kubelet, isMaster bool)
"--cgroup-driver=cgroupfs", "--cgroup-driver=cgroupfs",
"--cgroups-per-qos=True", "--cgroups-per-qos=True",
"--enforce-node-allocatable=", "--enforce-node-allocatable=",
"--cluster-dns=" + kubeletService.ClusterDnsServer, "--cluster-dns=" + kubeletService.ClusterDNSServer,
"--network-plugin=cni", "--network-plugin=cni",
"--cni-conf-dir=/etc/cni/net.d", "--cni-conf-dir=/etc/cni/net.d",
"--cni-bin-dir=/opt/cni/bin", "--cni-bin-dir=/opt/cni/bin",

2
services/types.go
View File

@ -28,7 +28,7 @@ type Kubelet struct {
Image string `yaml:"image"` Image string `yaml:"image"`
ClusterDomain string `yaml:"cluster_domain"` ClusterDomain string `yaml:"cluster_domain"`
InfraContainerImage string `yaml:"infra_container_image"` InfraContainerImage string `yaml:"infra_container_image"`
ClusterDnsServer string `yaml:"cluster_dns_server"` ClusterDNSServer string `yaml:"cluster_dns_server"`
} }
type Kubeproxy struct { type Kubeproxy struct {