github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Define common sentences as constants

Browse Source 
update pull request

update pull request

update pull request

update pull request

update pull request

update pull request
This commit is contained in:
aaa 2019-03-21 15:08:49 -04:00
parent 997d5182d0
commit 112da093ed
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/kubeadm/app/phases/addons/dns/dns.go
View File

@ -45,6 +45,7 @@ const (
kubeDNSStubDomain = "stubDomains" kubeDNSStubDomain = "stubDomains"
kubeDNSUpstreamNameservers = "upstreamNameservers" kubeDNSUpstreamNameservers = "upstreamNameservers"
kubeDNSFederation = "federations" kubeDNSFederation = "federations"
unableToDecodeCoreDNS = "unable to decode CoreDNS"
) )
// DeployedDNSAddon returns the type of DNS addon currently deployed // DeployedDNSAddon returns the type of DNS addon currently deployed
@ -221,7 +222,7 @@ func coreDNSAddon(cfg *kubeadmapi.ClusterConfiguration, client clientset.Interfa
func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, client clientset.Interface) error { func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, client clientset.Interface) error {
coreDNSConfigMap := &v1.ConfigMap{} coreDNSConfigMap := &v1.ConfigMap{}
if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), configBytes, coreDNSConfigMap); err != nil { if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), configBytes, coreDNSConfigMap); err != nil {
return errors.Wrap(err, "unable to decode CoreDNS configmap") return errors.Wrapf(err, "%s ConfigMap", unableToDecodeCoreDNS)
} }
// Create the ConfigMap for CoreDNS or retain it in case it already exists // Create the ConfigMap for CoreDNS or retain it in case it already exists
@ -231,7 +232,7 @@ func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, clien
coreDNSClusterRoles := &rbac.ClusterRole{} coreDNSClusterRoles := &rbac.ClusterRole{}
if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), []byte(CoreDNSClusterRole), coreDNSClusterRoles); err != nil { if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), []byte(CoreDNSClusterRole), coreDNSClusterRoles); err != nil {
return errors.Wrap(err, "unable to decode CoreDNS clusterroles") return errors.Wrapf(err, "%s ClusterRole", unableToDecodeCoreDNS)
} }
// Create the Clusterroles for CoreDNS or update it in case it already exists // Create the Clusterroles for CoreDNS or update it in case it already exists
@ -241,7 +242,7 @@ func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, clien
coreDNSClusterRolesBinding := &rbac.ClusterRoleBinding{} coreDNSClusterRolesBinding := &rbac.ClusterRoleBinding{}
if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), []byte(CoreDNSClusterRoleBinding), coreDNSClusterRolesBinding); err != nil { if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), []byte(CoreDNSClusterRoleBinding), coreDNSClusterRolesBinding); err != nil {
return errors.Wrap(err, "unable to decode CoreDNS clusterrolebindings") return errors.Wrapf(err, "%s ClusterRoleBinding", unableToDecodeCoreDNS)
} }
// Create the Clusterrolebindings for CoreDNS or update it in case it already exists // Create the Clusterrolebindings for CoreDNS or update it in case it already exists
@ -251,7 +252,7 @@ func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, clien
coreDNSServiceAccount := &v1.ServiceAccount{} coreDNSServiceAccount := &v1.ServiceAccount{}
if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), []byte(CoreDNSServiceAccount), coreDNSServiceAccount); err != nil { if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), []byte(CoreDNSServiceAccount), coreDNSServiceAccount); err != nil {
return errors.Wrap(err, "unable to decode CoreDNS serviceaccount") return errors.Wrapf(err, "%s ServiceAccount", unableToDecodeCoreDNS)
} }
// Create the ConfigMap for CoreDNS or update it in case it already exists // Create the ConfigMap for CoreDNS or update it in case it already exists
@ -261,7 +262,7 @@ func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, clien
coreDNSDeployment := &apps.Deployment{} coreDNSDeployment := &apps.Deployment{}
if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), deploymentBytes, coreDNSDeployment); err != nil { if err := kuberuntime.DecodeInto(clientsetscheme.Codecs.UniversalDecoder(), deploymentBytes, coreDNSDeployment); err != nil {
return errors.Wrap(err, "unable to decode CoreDNS deployment") return errors.Wrapf(err, "%s Deployment", unableToDecodeCoreDNS)
} }
// Create the Deployment for CoreDNS or update it in case it already exists // Create the Deployment for CoreDNS or update it in case it already exists