Skip to content

Commit

Permalink
Rename v180AndAboveKubeDNSDeployment to KubeDNSDeployment
Browse files Browse the repository at this point in the history
  • Loading branch information
dixudx committed May 17, 2018
1 parent 2ef8157 commit 9d4021b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/phases/addons/dns/dns_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions cmd/kubeadm/app/phases/addons/dns/manifests.go
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion cmd/kubeadm/app/phases/addons/dns/versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9d4021b

Please sign in to comment.