Skip to content

Commit a848a1d

Browse files
authored
fix: speed up provisioning even more by 10s with localdns enabled (#8338)
1 parent 44399f6 commit a848a1d

4 files changed

Lines changed: 8 additions & 0 deletions

File tree

e2e/vmss.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -749,6 +749,7 @@ func extractLogsFromVMLinux(ctx context.Context, s *Scenario, vm *ScenarioVM) er
749749
"cluster-provision.log": "sudo cat /var/log/azure/cluster-provision.log",
750750
"kubelet.log": "sudo journalctl -u kubelet",
751751
"aks-log-collector.log": "sudo journalctl -u aks-log-collector",
752+
"localdns.log": "sudo journalctl -u localdns",
752753
"cluster-provision-cse-output.log": "sudo cat /var/log/azure/cluster-provision-cse-output.log",
753754
"sysctl-out.log": "sudo sysctl -a",
754755
"waagent.log": "sudo cat /var/log/waagent.log",

parts/linux/cloud-init/artifacts/cse_cmd.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,4 +192,5 @@ LOCALDNS_MEMORY_LIMIT="{{GetLocalDNSMemoryLimitInMB}}"
192192
LOCALDNS_GENERATED_COREFILE="{{GetGeneratedLocalDNSCoreFile}}"
193193
PRE_PROVISION_ONLY="{{GetPreProvisionOnly}}"
194194
CSE_TIMEOUT="{{GetCSETimeout}}"
195+
SKIP_WAAGENT_HOLD="{{GetSkipWaAgentHold}}"
195196
/usr/bin/nohup /bin/bash -c "/bin/bash /opt/azure/containers/provision_start.sh"

parts/linux/cloud-init/artifacts/cse_main.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,11 @@ function basePrep {
7171
systemctl restart systemd-timesyncd
7272
fi
7373

74+
# pre-warm coredns by checking its version.
75+
if [ "${SHOULD_ENABLE_LOCALDNS}" = "true" ]; then
76+
nohup /bin/sh -c '/opt/azure/containers/localdns/binary/coredns --version >/dev/null 2>&1' >/dev/null 2>&1 &
77+
fi
78+
7479
# Eval proxy vars to ensure curl commands use proxy if configured.
7580
# e.g. PROXY_VARS=`export HTTPS_PROXY="https://proxy.example.com:8080"; export http_proxy="http://proxy.example.com:8080"; export NO_PROXY="127.0.0.1,localhost";`
7681
# Setting vars in etc environment (configureEtcEnvironment) won't take effect in current shell session.

pkg/agent/baker.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,6 +1303,7 @@ func getContainerServiceFuncMap(config *datamodel.NodeBootstrappingConfiguration
13031303
},
13041304
"GetPreProvisionOnly": func() bool { return config.PreProvisionOnly },
13051305
"GetCSETimeout": func() string { return datamodel.GetCSETimeout(config.CSETimeout) },
1306+
"GetSkipWaAgentHold": func() bool { return config.EnableScriptlessNBCCSECmd },
13061307
"BlockIptables": func() bool {
13071308
return cs.Properties.OrchestratorProfile.KubernetesConfig.BlockIptables
13081309
},

0 commit comments

Comments
 (0)