mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-12 05:21:58 +00:00
Rename v180AndAboveKubeDNSDeployment to KubeDNSDeployment
This commit is contained in:
parent
2ef8157644
commit
9d4021b80f
@ -94,7 +94,7 @@ func TestCompileManifests(t *testing.T) {
|
|||||||
expected bool
|
expected bool
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
manifest: v180AndAboveKubeDNSDeployment,
|
manifest: KubeDNSDeployment,
|
||||||
data: struct{ ImageRepository, Arch, Version, DNSBindAddr, DNSProbeAddr, DNSDomain, MasterTaintKey string }{
|
data: struct{ ImageRepository, Arch, Version, DNSBindAddr, DNSProbeAddr, DNSDomain, MasterTaintKey string }{
|
||||||
ImageRepository: "foo",
|
ImageRepository: "foo",
|
||||||
Arch: "foo",
|
Arch: "foo",
|
||||||
|
@ -17,8 +17,8 @@ limitations under the License.
|
|||||||
package dns
|
package dns
|
||||||
|
|
||||||
const (
|
const (
|
||||||
// v180AndAboveKubeDNSDeployment is the kube-dns Deployment manifest for the kube-dns manifest for v1.7+
|
// KubeDNSDeployment is the kube-dns Deployment manifest for the kube-dns manifest for v1.7+
|
||||||
v180AndAboveKubeDNSDeployment = `
|
KubeDNSDeployment = `
|
||||||
apiVersion: apps/v1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
|
@ -46,7 +46,7 @@ func GetDNSVersion(kubeVersion *version.Version, dns string) string {
|
|||||||
func GetKubeDNSManifest(kubeVersion *version.Version) string {
|
func GetKubeDNSManifest(kubeVersion *version.Version) string {
|
||||||
// v1.8.0+ has only one known YAML manifest spec, just return that here
|
// 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
|
// 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
|
// GetCoreDNSManifest returns the right CoreDNS YAML manifest for a specific k8s version
|
||||||
|
Loading…
Reference in New Issue
Block a user