wip See if newer test cases are causing Travis timeouts

Author: kfr2

pkg/model/cluster_test.go

@@ -1418,65 +1418,67 @@ kubeDns:
 				},
 			},
 		},
-		{
-			conf: `
-kubeDns:
-  nodeLocalResolver: true
-  dnsmasq:
-    coreDNSLocal:
-      enabled: true
-      resources:
-        requests:
-          cpu: "100m"
-          memory: "2000Mi"
-        limits:
-          cpu: ""
-          memory: ""
-    cacheSize: 500
-    dnsForwardMax: 100
-    negTTL: 10
-`,
-			kubeDns: api.KubeDns{
-				Provider:          "coredns",
-				NodeLocalResolver: true,
-				DNSMasq: api.DNSMasq{
-					CoreDNSLocal: api.CoreDNSLocal{
-						Enabled: true,
-						ComputeResources: api.ComputeResources{
-							Requests: api.ResourceQuota{
-								Cpu:    "100m",
-								Memory: "2000Mi",
-							},
-							Limits: api.ResourceQuota{
-								Cpu:    "",
-								Memory: "",
-							},
-						},
-					},
-					CacheSize:     500,
-					DNSForwardMax: 100,
-					NegTTL:        10,
-				},
-				DeployToControllers:          false,
-				AntiAffinityAvailabilityZone: false,
-				TTL:                          30,
-				Autoscaler: api.KubeDnsAutoscaler{
-					CoresPerReplica: 256,
-					NodesPerReplica: 16,
-					Min:             2,
-				},
-				DnsDeploymentResources: api.ComputeResources{
-					Requests: api.ResourceQuota{
-						Memory: "70Mi",
-						Cpu:    "100m",
-					},
-					Limits: api.ResourceQuota{
-						Memory: "170Mi",
-						Cpu:    "200m",
-					},
-				},
-			},
-		},
+		/*
+		   		{
+		   			conf: `
+		   kubeDns:
+		     nodeLocalResolver: true
+		     dnsmasq:
+		       coreDNSLocal:
+		         enabled: true
+		         resources:
+		           requests:
+		             cpu: "100m"
+		             memory: "2000Mi"
+		           limits:
+		             cpu: ""
+		             memory: ""
+		       cacheSize: 500
+		       dnsForwardMax: 100
+		       negTTL: 10
+		   `,
+		   			kubeDns: api.KubeDns{
+		   				Provider:          "coredns",
+		   				NodeLocalResolver: true,
+		   				DNSMasq: api.DNSMasq{
+		   					CoreDNSLocal: api.CoreDNSLocal{
+		   						Enabled: true,
+		   						ComputeResources: api.ComputeResources{
+		   							Requests: api.ResourceQuota{
+		   								Cpu:    "100m",
+		   								Memory: "2000Mi",
+		   							},
+		   							Limits: api.ResourceQuota{
+		   								Cpu:    "",
+		   								Memory: "",
+		   							},
+		   						},
+		   					},
+		   					CacheSize:     500,
+		   					DNSForwardMax: 100,
+		   					NegTTL:        10,
+		   				},
+		   				DeployToControllers:          false,
+		   				AntiAffinityAvailabilityZone: false,
+		   				TTL:                          30,
+		   				Autoscaler: api.KubeDnsAutoscaler{
+		   					CoresPerReplica: 256,
+		   					NodesPerReplica: 16,
+		   					Min:             2,
+		   				},
+		   				DnsDeploymentResources: api.ComputeResources{
+		   					Requests: api.ResourceQuota{
+		   						Memory: "70Mi",
+		   						Cpu:    "100m",
+		   					},
+		   					Limits: api.ResourceQuota{
+		   						Memory: "170Mi",
+		   						Cpu:    "200m",
+		   					},
+		   				},
+		   			},
+		   		},
+		*/
 		{
 			conf: `
 kubeDns:
@@ -1670,54 +1672,56 @@ kubeDns:
 				ExtraCoreDNSConfig: "rewrite name substring demo.app.org app.default.svc.cluster.local",
 			},
 		},
-		{
-			conf: `
-kubeDns:
-  provider: coredns
-  additionalZoneCoreDNSConfig: global:53 { forward . 1.2.3.4 }
-`,
-			kubeDns: api.KubeDns{
-				Provider:          "coredns",
-				NodeLocalResolver: false,
-				DNSMasq: api.DNSMasq{
-					CoreDNSLocal: api.CoreDNSLocal{
-						Enabled: false,
-						ComputeResources: api.ComputeResources{
-							Requests: api.ResourceQuota{
-								Cpu:    "50m",
-								Memory: "100Mi",
-							},
-							Limits: api.ResourceQuota{
-								Cpu:    "50m",
-								Memory: "100Mi",
-							},
-						},
-					},
-					CacheSize:     50000,
-					DNSForwardMax: 500,
-					NegTTL:        60,
-				},
-				DeployToControllers:          false,
-				AntiAffinityAvailabilityZone: false,
-				TTL:                          30,
-				Autoscaler: api.KubeDnsAutoscaler{
-					CoresPerReplica: 256,
-					NodesPerReplica: 16,
-					Min:             2,
-				},
-				DnsDeploymentResources: api.ComputeResources{
-					Requests: api.ResourceQuota{
-						Memory: "70Mi",
-						Cpu:    "100m",
-					},
-					Limits: api.ResourceQuota{
-						Memory: "170Mi",
-						Cpu:    "200m",
-					},
-				},
-				AdditionalZoneCoreDNSConfig: "global:53 { forward . 1.2.3.4 }",
-			},
-		},
+		/*
+		   		{
+		   			conf: `
+		   kubeDns:
+		     provider: coredns
+		     additionalZoneCoreDNSConfig: global:53 { forward . 1.2.3.4 }
+		   `,
+		   			kubeDns: api.KubeDns{
+		   				Provider:          "coredns",
+		   				NodeLocalResolver: false,
+		   				DNSMasq: api.DNSMasq{
+		   					CoreDNSLocal: api.CoreDNSLocal{
+		   						Enabled: false,
+		   						ComputeResources: api.ComputeResources{
+		   							Requests: api.ResourceQuota{
+		   								Cpu:    "50m",
+		   								Memory: "100Mi",
+		   							},
+		   							Limits: api.ResourceQuota{
+		   								Cpu:    "50m",
+		   								Memory: "100Mi",
+		   							},
+		   						},
+		   					},
+		   					CacheSize:     50000,
+		   					DNSForwardMax: 500,
+		   					NegTTL:        60,
+		   				},
+		   				DeployToControllers:          false,
+		   				AntiAffinityAvailabilityZone: false,
+		   				TTL:                          30,
+		   				Autoscaler: api.KubeDnsAutoscaler{
+		   					CoresPerReplica: 256,
+		   					NodesPerReplica: 16,
+		   					Min:             2,
+		   				},
+		   				DnsDeploymentResources: api.ComputeResources{
+		   					Requests: api.ResourceQuota{
+		   						Memory: "70Mi",
+		   						Cpu:    "100m",
+		   					},
+		   					Limits: api.ResourceQuota{
+		   						Memory: "170Mi",
+		   						Cpu:    "200m",
+		   					},
+		   				},
+		   				AdditionalZoneCoreDNSConfig: "global:53 { forward . 1.2.3.4 }",
+		   			},
+		   		},
+		*/
 	}
 
 	for _, conf := range validConfigs {