Rename v180AndAboveKubeDNSDeployment to KubeDNSDeployment

This commit is contained in:
Di Xu 2018-05-16 21:46:45 +08:00
parent 2ef8157644
commit 9d4021b80f
3 changed files with 4 additions and 4 deletions

View File

@ -94,7 +94,7 @@ func TestCompileManifests(t *testing.T) {
expected bool
}{
{
manifest: v180AndAboveKubeDNSDeployment,
manifest: KubeDNSDeployment,
data: struct{ ImageRepository, Arch, Version, DNSBindAddr, DNSProbeAddr, DNSDomain, MasterTaintKey string }{
ImageRepository: "foo",
Arch: "foo",

View File

@ -17,8 +17,8 @@ limitations under the License.
package dns
const (
// v180AndAboveKubeDNSDeployment is the kube-dns Deployment manifest for the kube-dns manifest for v1.7+
v180AndAboveKubeDNSDeployment = `
// KubeDNSDeployment is the kube-dns Deployment manifest for the kube-dns manifest for v1.7+
KubeDNSDeployment = `
apiVersion: apps/v1
kind: Deployment
metadata:

View File

@ -46,7 +46,7 @@ func GetDNSVersion(kubeVersion *version.Version, dns string) string {
func GetKubeDNSManifest(kubeVersion *version.Version) string {
// v1.8.0+ has only one known YAML manifest spec, just return that here
// In the future when the kube-dns version is bumped at HEAD; add conditional logic to return the right manifest
return v180AndAboveKubeDNSDeployment
return KubeDNSDeployment
}
// GetCoreDNSManifest returns the right CoreDNS YAML manifest for a specific k8s version