github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #75939 from xichengliudui/conversion-constants

Browse Source 
Define common sentences as constants
This commit is contained in:
Kubernetes Prow Robot 2019-04-01 10:03:25 -07:00 committed by GitHub
commit 255a73ffc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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"
kubeDNSUpstreamNameservers = "upstreamNameservers"
kubeDNSFederation = "federations"
unableToDecodeCoreDNS = "unable to decode CoreDNS"
)
// 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 {
coreDNSConfigMap := &v1.ConfigMap{}
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
@ -231,7 +232,7 @@ func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, clien
coreDNSClusterRoles := &rbac.ClusterRole{}
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
@ -241,7 +242,7 @@ func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, clien
coreDNSClusterRolesBinding := &rbac.ClusterRoleBinding{}
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
@ -251,7 +252,7 @@ func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, clien
coreDNSServiceAccount := &v1.ServiceAccount{}
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
@ -261,7 +262,7 @@ func createCoreDNSAddon(deploymentBytes, serviceBytes, configBytes []byte, clien
coreDNSDeployment := &apps.Deployment{}
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