github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 19:23:40 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Skip kube-dns tests if coredns is installed"

Browse Source
This commit is contained in:
Paco Xu 2023-09-20 21:04:54 +08:00 committed by GitHub
parent fd5f36e6a0
commit 7cfdb792d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/addons/dns/kube-dns/kube-dns.yaml.base
View File

@ -65,7 +65,6 @@ metadata:
k8s-app: kube-dns k8s-app: kube-dns
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/name: "KubeDNS"
spec: spec:
# replicas: not specified here: # replicas: not specified here:
# 1. In order to make Addon Manager do not reconcile this replicas parameter. # 1. In order to make Addon Manager do not reconcile this replicas parameter.

13
cluster/addons/dns/kube-dns/kube-dns.yaml.in
View File

@ -30,7 +30,7 @@ metadata:
spec: spec:
selector: selector:
k8s-app: kube-dns k8s-app: kube-dns
clusterIP: {{ pillar['dns_server'] }} clusterIP: dns_server
ports: ports:
- name: dns - name: dns
port: 53 port: 53
@ -65,7 +65,6 @@ metadata:
k8s-app: kube-dns k8s-app: kube-dns
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/name: "KubeDNS"
spec: spec:
# replicas: not specified here: # replicas: not specified here:
# 1. In order to make Addon Manager do not reconcile this replicas parameter. # 1. In order to make Addon Manager do not reconcile this replicas parameter.
@ -122,7 +121,7 @@ spec:
# guaranteed class. Currently, this container falls into the # guaranteed class. Currently, this container falls into the
# "burstable" category so the kubelet doesn't backoff from restarting it. # "burstable" category so the kubelet doesn't backoff from restarting it.
limits: limits:
memory: {{ pillar['dns_memory_limit'] }} memory: 'dns_memory_limit'
requests: requests:
cpu: 100m cpu: 100m
memory: 70Mi memory: 70Mi
@ -145,7 +144,7 @@ spec:
initialDelaySeconds: 3 initialDelaySeconds: 3
timeoutSeconds: 5 timeoutSeconds: 5
args: args:
- --domain={{ pillar['dns_domain'] }}. - --domain=dns_domain.
- --dns-port=10053 - --dns-port=10053
- --config-dir=/kube-dns-config - --config-dir=/kube-dns-config
- --v=2 - --v=2
@ -192,7 +191,7 @@ spec:
- --no-negcache - --no-negcache
- --dns-loop-detect - --dns-loop-detect
- --log-facility=- - --log-facility=-
- --server=/{{ pillar['dns_domain'] }}/127.0.0.1#10053 - --server=/dns_domain/127.0.0.1#10053
- --server=/in-addr.arpa/127.0.0.1#10053 - --server=/in-addr.arpa/127.0.0.1#10053
- --server=/ip6.arpa/127.0.0.1#10053 - --server=/ip6.arpa/127.0.0.1#10053
ports: ports:
@ -231,8 +230,8 @@ spec:
args: args:
- --v=2 - --v=2
- --logtostderr - --logtostderr
- --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.{{ pillar['dns_domain'] }},5,SRV - --probe=kubedns,127.0.0.1:10053,kubernetes.default.svc.dns_domain,5,SRV
- --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.{{ pillar['dns_domain'] }},5,SRV - --probe=dnsmasq,127.0.0.1:53,kubernetes.default.svc.dns_domain,5,SRV
ports: ports:
- containerPort: 10054 - containerPort: 10054
name: metrics name: metrics

1
cluster/addons/dns/kube-dns/kube-dns.yaml.sed
View File

@ -65,7 +65,6 @@ metadata:
k8s-app: kube-dns k8s-app: kube-dns
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
kubernetes.io/name: "KubeDNS"
spec: spec:
# replicas: not specified here: # replicas: not specified here:
# 1. In order to make Addon Manager do not reconcile this replicas parameter. # 1. In order to make Addon Manager do not reconcile this replicas parameter.

15
test/e2e/autoscaling/dns_autoscaling.go
View File

@ -41,8 +41,8 @@ import (
// Constants used in dns-autoscaling test. // Constants used in dns-autoscaling test.
const ( const (
DNSdefaultTimeout = 5 * time.Minute DNSdefaultTimeout = 5 * time.Minute
ClusterAddonLabelKey = "kubernetes.io/name" ClusterAddonLabelKey = "k8s-app"
DNSLabelName = "KubeDNS" DNSLabelName = "kube-dns"
DNSAutoscalerLabelName = "kube-dns-autoscaler" DNSAutoscalerLabelName = "kube-dns-autoscaler"
) )
@ -57,19 +57,16 @@ var _ = SIGDescribe("DNS horizontal autoscaling", func() {
var DNSParams3 DNSParamsLinear var DNSParams3 DNSParamsLinear
ginkgo.BeforeEach(func(ctx context.Context) { ginkgo.BeforeEach(func(ctx context.Context) {
e2eskipper.SkipUnlessProviderIs("gce", "gke")
c = f.ClientSet c = f.ClientSet
nodes, err := e2enode.GetReadySchedulableNodes(ctx, c) nodes, err := e2enode.GetReadySchedulableNodes(ctx, c)
framework.ExpectNoError(err) framework.ExpectNoError(err)
nodeCount := len(nodes.Items) nodeCount := len(nodes.Items)
ginkgo.By("Collecting original replicas count and DNS scaling params") ginkgo.By("Collecting original replicas count and DNS scaling params")
originDNSReplicasCount, err = getDNSReplicas(ctx, c) originDNSReplicasCount, err = getDNSReplicas(ctx, c)
if err != nil { framework.ExpectNoError(err)
if strings.Contains(err.Error(), "expected 1 DNS deployment") && originDNSReplicasCount == 0 {
e2eskipper.Skipf(err.Error())
}
framework.Failf("unexpected error: %v", err)
}
pcm, err := fetchDNSScalingConfigMap(ctx, c) pcm, err := fetchDNSScalingConfigMap(ctx, c)
framework.ExpectNoError(err) framework.ExpectNoError(err)
@ -314,7 +311,7 @@ func getDNSReplicas(ctx context.Context, c clientset.Interface) (int, error) {
return 0, err return 0, err
} }
if len(deployments.Items) != 1 { if len(deployments.Items) != 1 {
return len(deployments.Items), fmt.Errorf("expected 1 DNS deployment, got %v", len(deployments.Items)) return 0, fmt.Errorf("expected 1 DNS deployment, got %v", len(deployments.Items))
} }
deployment := deployments.Items[0] deployment := deployments.Items[0]