зеркало из https://github.com/Azure/aks-engine.git
fix dns regression (#843)
This commit is contained in:
Anthony Howe
GitHub
Родитель
5c8ab76c57
Коммит
01db4f63dc
|
|
@ -0,0 +1,103 @@
|
|||
apiVersion: v1
|
||||
kind: ReplicationController
|
||||
metadata:
|
||||
labels:
|
||||
kubernetes.io/cluster-service: "true"
|
||||
k8s-app: kube-dns
|
||||
version: v19
|
||||
name: kube-dns-v19
|
||||
namespace: kube-system
|
||||
spec:
|
||||
replicas: 2
|
||||
selector:
|
||||
k8s-app: kube-dns
|
||||
version: v19
|
||||
template:
|
||||
metadata:
|
||||
annotations:
|
||||
scheduler.alpha.kubernetes.io/critical-pod: ""
|
||||
scheduler.alpha.kubernetes.io/tolerations: "[{\"key\":\"CriticalAddonsOnly\",\"operator\":\"Exists\"}]"
|
||||
labels:
|
||||
k8s-app: kube-dns
|
||||
kubernetes.io/cluster-service: "true"
|
||||
version: v19
|
||||
spec:
|
||||
containers:
|
||||
- args:
|
||||
- "--domain=cluster.local."
|
||||
- "--dns-port=10053"
|
||||
image: <kubernetesKubeDNSSpec>
|
||||
livenessProbe:
|
||||
failureThreshold: 5
|
||||
httpGet:
|
||||
path: "/healthz-kubedns"
|
||||
port: 8080
|
||||
scheme: HTTP
|
||||
initialDelaySeconds: 60
|
||||
successThreshold: 1
|
||||
timeoutSeconds: 5
|
||||
name: kubedns
|
||||
ports:
|
||||
- containerPort: 10053
|
||||
name: dns-local
|
||||
protocol: UDP
|
||||
- containerPort: 10053
|
||||
name: dns-tcp-local
|
||||
protocol: TCP
|
||||
readinessProbe:
|
||||
httpGet:
|
||||
path: "/readiness"
|
||||
port: 8081
|
||||
scheme: HTTP
|
||||
initialDelaySeconds: 30
|
||||
timeoutSeconds: 5
|
||||
resources:
|
||||
limits:
|
||||
memory: 170Mi
|
||||
requests:
|
||||
cpu: 100m
|
||||
memory: 70Mi
|
||||
- args:
|
||||
- "--cache-size=1000"
|
||||
- "--no-resolv"
|
||||
- "--server=127.0.0.1#10053"
|
||||
- "--log-facility=-"
|
||||
image: <kubernetesDNSMasqSpec>
|
||||
name: dnsmasq
|
||||
ports:
|
||||
- containerPort: 53
|
||||
name: dns
|
||||
protocol: UDP
|
||||
- containerPort: 53
|
||||
name: dns-tcp
|
||||
protocol: TCP
|
||||
- args:
|
||||
- "--cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1 >/dev/null"
|
||||
- "--url=/healthz-dnsmasq"
|
||||
- "--cmd=nslookup kubernetes.default.svc.cluster.local 127.0.0.1:10053 >/dev/null"
|
||||
- "--url=/healthz-kubedns"
|
||||
- "--port=8080"
|
||||
- "--quiet"
|
||||
image: <kubernetesExecHealthzSpec>
|
||||
livenessProbe:
|
||||
failureThreshold: 5
|
||||
httpGet:
|
||||
path: "/healthz-dnsmasq"
|
||||
port: 8080
|
||||
scheme: HTTP
|
||||
initialDelaySeconds: 60
|
||||
successThreshold: 1
|
||||
timeoutSeconds: 5
|
||||
name: healthz
|
||||
ports:
|
||||
- containerPort: 8080
|
||||
protocol: TCP
|
||||
resources:
|
||||
limits:
|
||||
memory: 50Mi
|
||||
requests:
|
||||
cpu: 10m
|
||||
memory: 50Mi
|
||||
dnsPolicy: Default
|
||||
nodeSelector:
|
||||
beta.kubernetes.io/os: linux
|
||||
|
|
@ -95,9 +95,9 @@ var KubeImages = map[api.OrchestratorVersion]map[string]string{
|
|||
"exechealthz": "exechealthz-amd64:1.2",
|
||||
"addonresizer": "addon-resizer:1.6",
|
||||
"heapster": "heapster:v1.2.0",
|
||||
"dns": "k8s-dns-kube-dns-amd64:1.13.0",
|
||||
"addonmanager": "kube-addon-manager-amd64:v6.4",
|
||||
"dnsmasq": "k8s-dns-dnsmasq-amd64:1.13.0",
|
||||
"dns": "kubedns-amd64:1.7",
|
||||
"addonmanager": "kube-addon-manager-amd64:v6.2",
|
||||
"dnsmasq": "kube-dnsmasq-amd64:1.3",
|
||||
"pause": "pause-amd64:3.0",
|
||||
"windowszip": "v1.5.7intwinnat.zip",
|
||||
},
|
||||
|
|
@ -108,9 +108,9 @@ var KubeImages = map[api.OrchestratorVersion]map[string]string{
|
|||
"exechealthz": "exechealthz-amd64:1.2",
|
||||
"addonresizer": "addon-resizer:1.6",
|
||||
"heapster": "heapster:v1.2.0",
|
||||
"dns": "k8s-dns-kube-dns-amd64:1.13.0",
|
||||
"addonmanager": "kube-addon-manager-amd64:v6.4",
|
||||
"dnsmasq": "k8s-dns-dnsmasq-amd64:1.13.0",
|
||||
"dns": "kubedns-amd64:1.7",
|
||||
"addonmanager": "kube-addon-manager-amd64:v6.2",
|
||||
"dnsmasq": "kube-dnsmasq-amd64:1.3",
|
||||
"pause": "pause-amd64:3.0",
|
||||
"windowszip": "v1.5.3intwinnat.zip",
|
||||
},
|
||||
|
|
|
|||
|
|
@ -105,6 +105,17 @@ var kubernetesAddonYamls = map[string]string{
|
|||
"MASTER_ADDON_DEFAULT_STORAGE_CLASS_B64_GZIP_STR": "kubernetesmasteraddons-default-storage-class.yaml",
|
||||
}
|
||||
|
||||
var kubernetesAddonYamls15 = map[string]string{
|
||||
"MASTER_ADDON_HEAPSTER_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-heapster-deployment.yaml",
|
||||
"MASTER_ADDON_HEAPSTER_SERVICE_B64_GZIP_STR": "kubernetesmasteraddons-heapster-service.yaml",
|
||||
"MASTER_ADDON_KUBE_DNS_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-kube-dns-deployment1.5.yaml",
|
||||
"MASTER_ADDON_KUBE_DNS_SERVICE_B64_GZIP_STR": "kubernetesmasteraddons-kube-dns-service.yaml",
|
||||
"MASTER_ADDON_KUBE_PROXY_DAEMONSET_B64_GZIP_STR": "kubernetesmasteraddons-kube-proxy-daemonset.yaml",
|
||||
"MASTER_ADDON_KUBERNETES_DASHBOARD_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-kubernetes-dashboard-deployment.yaml",
|
||||
"MASTER_ADDON_KUBERNETES_DASHBOARD_SERVICE_B64_GZIP_STR": "kubernetesmasteraddons-kubernetes-dashboard-service.yaml",
|
||||
"MASTER_ADDON_DEFAULT_STORAGE_CLASS_B64_GZIP_STR": "kubernetesmasteraddons-default-storage-class.yaml",
|
||||
}
|
||||
|
||||
var calicoAddonYamls = map[string]string{
|
||||
"MASTER_ADDON_CALICO_CONFIGMAP_B64_GZIP_STR": "kubernetesmasteraddons-calico-configmap.yaml",
|
||||
"MASTER_ADDON_CALICO_DAEMONSET_B64_GZIP_STR": "kubernetesmasteraddons-calico-daemonset.yaml",
|
||||
|
|
@ -642,7 +653,14 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) map[str
|
|||
str = strings.Replace(str, placeholder, addonTextContents, -1)
|
||||
}
|
||||
|
||||
for placeholder, filename := range kubernetesAddonYamls {
|
||||
var addonYamls map[string]string
|
||||
if profile.OrchestratorProfile.OrchestratorVersion == api.Kubernetes153 ||
|
||||
profile.OrchestratorProfile.OrchestratorVersion == api.Kubernetes157 {
|
||||
addonYamls = kubernetesAddonYamls15
|
||||
} else {
|
||||
addonYamls = kubernetesAddonYamls
|
||||
}
|
||||
for placeholder, filename := range addonYamls {
|
||||
addonTextContents := getBase64CustomScript(filename)
|
||||
str = strings.Replace(str, placeholder, addonTextContents, -1)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@
|
|||
// ../../parts/kubernetesmasteraddons-heapster-deployment.yaml
|
||||
// ../../parts/kubernetesmasteraddons-heapster-service.yaml
|
||||
// ../../parts/kubernetesmasteraddons-kube-dns-deployment.yaml
|
||||
// ../../parts/kubernetesmasteraddons-kube-dns-deployment1.5.yaml
|
||||
// ../../parts/kubernetesmasteraddons-kube-dns-service.yaml
|
||||
// ../../parts/kubernetesmasteraddons-kube-proxy-daemonset.yaml
|
||||
// ../../parts/kubernetesmasteraddons-kubernetes-dashboard-deployment.yaml
|
||||
|
|
@ -846,6 +847,26 @@ func kubernetesmasteraddonsKubeDnsDeploymentYaml() (*asset, error) {
|
|||
return a, nil
|
||||
}
|
||||
|
||||
var _kubernetesmasteraddonsKubeDnsDeployment15Yaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x56\xdf\x6f\xdb\x36\x10\x7e\xf7\x5f\x71\xd0\x5e\x27\x45\x6e\x91\x35\x23\xe6\x02\x43\x52\xac\xc0\xd0\xce\x98\xb3\xbd\xcc\x7b\xa0\xc9\x4b\x44\x84\x22\x19\xde\xd1\x88\x3b\xec\x7f\x1f\x24\x3b\x16\xad\x3a\x99\x53\x0c\x43\xf9\x64\xdc\xcf\xcf\xf7\xdd\x7d\x90\x0c\xe6\x77\x8c\x64\xbc\x13\xb0\x9e\x4e\xee\x8c\xd3\x02\x7e\xc5\x60\x8d\x92\x6c\xbc\xbb\xf4\x8e\xa3\xb7\x16\xe3\xa4\x45\x96\x5a\xb2\x14\x13\x00\x2b\x57\x68\xa9\xfb\x05\x70\x97\x56\x18\x1d\x32\x52\x65\xfc\x99\xb2\x89\x18\x63\x49\x18\xd7\x46\xa1\x80\x82\x63\xc2\x62\x1b\x79\x41\xa5\x0c\x41\xf4\x29\xa5\x76\xd4\x5b\xd7\x43\xff\xef\x27\x00\x4e\xb6\x38\x44\x94\x83\x91\x82\x54\x8f\x1e\xda\x10\x63\x3b\xa1\x80\xaa\x03\x11\xb7\x80\x49\xc0\xab\x09\x00\xa1\x45\xc5\x3e\x8a\xd3\x9b\x32\xb6\xc1\x4a\xc6\x6d\x4a\xfe\x4f\xbb\x27\x9d\xf3\xdc\x8f\x83\x1e\x4d\x00\xa4\x1a\xd4\xc9\x62\xac\xa4\x0d\x8d\xac\x46\x63\x88\x86\x8d\x92\xb6\x0c\x5e\x0b\x28\x8a\x13\xd3\xd8\x5b\x8c\xbb\x4e\x50\xfc\xf1\xd7\xb2\xb8\xc3\xcd\xb2\x10\xcb\xe2\x72\x57\xf0\x47\xad\xbd\xa3\x5f\x9c\xdd\x2c\x8b\x6f\x97\x85\x0f\x5d\xbc\x8f\x7d\xcc\xbb\x07\x43\x4c\xcb\xe2\xef\x3f\x1f\xfb\xe5\x3c\x3d\x3d\x8c\x97\xb1\x78\x64\x7c\x00\x8f\x4c\x74\x4f\x79\xc7\xd2\x38\x8c\xfb\xc6\x25\xc8\x78\x9b\xc1\x28\xa1\x28\x4b\xed\x5b\x69\xdc\x6c\xd7\xaa\xb2\x5e\x49\x5b\x15\xa3\x18\x47\x65\xf0\x91\x67\xd3\xba\x3e\x7f\x3d\x38\x4d\x2b\x6f\x51\xc0\x0f\x03\xea\x9f\xd3\x0a\xaf\x3e\x2e\x16\x01\xd5\xdb\x7d\x98\x35\x6b\x74\x48\x34\x8f\x7e\x85\x43\x7b\x80\x1b\x69\x6c\x8a\x78\xdd\x44\xa4\xc6\x5b\x2d\xe0\x3c\xf3\x36\xcc\xe1\x27\xe4\x3c\x01\x20\x48\x6e\x04\x14\x67\x0d\x4a\xcb\xcd\xa7\xb2\x6b\xad\x1d\x15\x87\x41\x3e\xb2\x80\x8b\xfa\xa2\x3e\x30\x77\xa4\x77\x5b\xfd\xfe\xfa\x7a\x9e\x39\x8c\x33\x6c\xa4\xbd\x42\x2b\x37\x0b\x54\xde\x69\x12\xf0\x5d\x9e\x4a\x49\x29\x24\xca\x70\x4e\x33\x2f\x9b\x16\x7d\xe2\x7d\xea\xf0\x1f\x86\x23\xca\x39\xee\xd0\x1d\xb0\xb0\x67\x6a\xde\xe3\xee\x87\x9c\xd5\xdf\x56\xe9\x38\xe8\xc9\xc9\x3c\x21\x7a\xf6\xca\x5b\x01\xbf\x5d\xcd\xbf\xa4\x20\xab\xf0\x4c\xd1\xeb\xcb\xa1\x68\x44\xa9\xcd\x51\x12\x9f\xa5\x69\x9f\xf6\x04\x41\xd3\x2f\x26\xe8\x75\x7d\x12\x05\x11\xc9\xa7\xa8\x90\x72\x7c\xd6\xb4\x86\xe9\x10\x71\x8b\xad\x8f\x1b\x01\xd3\x37\xf5\x07\x93\x79\x22\xde\x27\xa4\x71\xb4\x0a\xa9\x9f\x6b\x7b\xb4\x46\x56\xe2\xe8\xcd\x29\xa9\x1a\x2c\xc9\x7c\xc2\xee\xa2\xea\xd1\xb5\x39\x5f\x76\xa8\xed\x7a\x64\xef\x54\x00\xe3\x6c\xfa\xea\x4d\x55\x57\x75\x35\xfd\x66\x74\x8d\x7d\x90\xf5\xb7\xe5\x8d\x54\xc6\x1a\xde\xcc\xca\xe7\x4e\xf5\xea\xe3\xe2\x83\xa4\xfb\xc3\x53\xdd\xaf\x46\x2b\xe9\xfe\xe4\x8d\x3d\xbe\x5d\x2f\x5f\xd4\xa7\xb7\xf4\x5f\xf6\xf3\xf8\x94\x5b\x3d\x73\x64\xbd\xbf\x4b\x21\x17\x56\x8d\x37\x32\x59\xae\x68\xad\xaa\x03\xd9\x83\xfd\x68\xe1\xed\x99\xc6\xf5\x99\x4b\xd6\x8e\xe6\x9b\xa2\x9d\xed\xc5\x67\x37\xa7\xe2\x3f\xeb\x2b\x7a\x4a\x4f\xec\xfe\x99\xf4\xf5\x21\xbd\x4e\x77\xd2\x37\xb2\xdf\x27\x83\xfc\xdc\x3e\xbc\x7b\x40\xf5\x7e\x5b\xfa\xff\x93\xef\xcf\x26\x08\x5f\x9d\x7c\xef\xa0\x9e\x7c\x0c\x23\xdc\x4f\xc9\xe9\x0b\x65\xe9\xfc\x05\xaa\x74\x5c\x94\xb2\x0a\xda\xd1\xdc\x5b\xa3\x36\x02\xae\xb6\x4b\xb9\x73\x38\xaf\x71\x71\xf0\xdd\xd6\xbd\x15\xf2\xf8\x0b\xc9\x93\x00\x6b\x5c\x7a\xf8\x27\x00\x00\xff\xff\x8e\xfc\x3a\x78\xba\x0a\x00\x00")
|
||||
|
||||
func kubernetesmasteraddonsKubeDnsDeployment15YamlBytes() ([]byte, error) {
|
||||
return bindataRead(
|
||||
_kubernetesmasteraddonsKubeDnsDeployment15Yaml,
|
||||
"kubernetesmasteraddons-kube-dns-deployment1.5.yaml",
|
||||
)
|
||||
}
|
||||
|
||||
func kubernetesmasteraddonsKubeDnsDeployment15Yaml() (*asset, error) {
|
||||
bytes, err := kubernetesmasteraddonsKubeDnsDeployment15YamlBytes()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
info := bindataFileInfo{name: "kubernetesmasteraddons-kube-dns-deployment1.5.yaml", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)}
|
||||
a := &asset{bytes: bytes, info: info}
|
||||
return a, nil
|
||||
}
|
||||
|
||||
var _kubernetesmasteraddonsKubeDnsServiceYaml = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x7c\x50\xc1\x4a\x03\x31\x10\xbd\xe7\x2b\x86\xde\x53\xbb\x88\x20\x73\xb5\x17\x11\xa4\x50\xf5\x9e\xcd\xbe\x43\xd8\x6c\x12\x32\x93\x82\x7f\x2f\x71\xbb\xa0\xa0\x25\x97\xbc\x37\xef\xbd\x79\x8c\x2b\xe1\x03\x55\x42\x4e\x4c\x97\xc1\xcc\x21\x4d\x4c\x67\xd4\x4b\xf0\x30\x0b\xd4\x4d\x4e\x1d\x1b\xa2\xe8\x46\x44\xe9\x3f\xa2\xf9\x51\xac\x2b\x85\x69\x6e\x23\xec\x94\x64\x65\xdb\x88\x9a\xa0\x90\x7d\xc8\x77\x3e\x36\x51\x54\x2b\x6b\x16\xd3\x4e\x6b\xc3\xee\x0f\x65\x72\x0b\x98\x5e\xda\x88\xe3\xeb\xd9\x10\xad\xf8\x47\x74\x27\xa4\x38\xbf\xb1\xf2\x29\x8a\xc5\x48\x81\xef\x7d\xae\x9b\x9e\x4f\x4c\xc3\x61\xdf\xdf\x70\x30\x44\x25\x57\xfd\xee\x6b\xaf\x89\x5b\xcf\x3e\x60\x7a\xb8\x5f\x41\xcd\x9a\x7d\x8e\x4c\xef\xc7\xd3\x6f\xb1\x55\x5f\x6e\x19\xde\x9e\xba\x41\x10\xe1\x35\xd7\xff\x2e\xf3\x15\x00\x00\xff\xff\x19\x94\x2e\x4a\x61\x01\x00\x00")
|
||||
|
||||
func kubernetesmasteraddonsKubeDnsServiceYamlBytes() ([]byte, error) {
|
||||
|
|
@ -1394,6 +1415,7 @@ var _bindata = map[string]func() (*asset, error){
|
|||
"kubernetesmasteraddons-heapster-deployment.yaml": kubernetesmasteraddonsHeapsterDeploymentYaml,
|
||||
"kubernetesmasteraddons-heapster-service.yaml": kubernetesmasteraddonsHeapsterServiceYaml,
|
||||
"kubernetesmasteraddons-kube-dns-deployment.yaml": kubernetesmasteraddonsKubeDnsDeploymentYaml,
|
||||
"kubernetesmasteraddons-kube-dns-deployment1.5.yaml": kubernetesmasteraddonsKubeDnsDeployment15Yaml,
|
||||
"kubernetesmasteraddons-kube-dns-service.yaml": kubernetesmasteraddonsKubeDnsServiceYaml,
|
||||
"kubernetesmasteraddons-kube-proxy-daemonset.yaml": kubernetesmasteraddonsKubeProxyDaemonsetYaml,
|
||||
"kubernetesmasteraddons-kubernetes-dashboard-deployment.yaml": kubernetesmasteraddonsKubernetesDashboardDeploymentYaml,
|
||||
|
|
@ -1496,6 +1518,7 @@ var _bintree = &bintree{nil, map[string]*bintree{
|
|||
"kubernetesmasteraddons-heapster-deployment.yaml": {kubernetesmasteraddonsHeapsterDeploymentYaml, map[string]*bintree{}},
|
||||
"kubernetesmasteraddons-heapster-service.yaml": {kubernetesmasteraddonsHeapsterServiceYaml, map[string]*bintree{}},
|
||||
"kubernetesmasteraddons-kube-dns-deployment.yaml": {kubernetesmasteraddonsKubeDnsDeploymentYaml, map[string]*bintree{}},
|
||||
"kubernetesmasteraddons-kube-dns-deployment1.5.yaml": {kubernetesmasteraddonsKubeDnsDeployment15Yaml, map[string]*bintree{}},
|
||||
"kubernetesmasteraddons-kube-dns-service.yaml": {kubernetesmasteraddonsKubeDnsServiceYaml, map[string]*bintree{}},
|
||||
"kubernetesmasteraddons-kube-proxy-daemonset.yaml": {kubernetesmasteraddonsKubeProxyDaemonsetYaml, map[string]*bintree{}},
|
||||
"kubernetesmasteraddons-kubernetes-dashboard-deployment.yaml": {kubernetesmasteraddonsKubernetesDashboardDeploymentYaml, map[string]*bintree{}},
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
},
|
||||
{
|
||||
"cluster_definition": "keyvaultcerts/swarmmode.json",
|
||||
"location": "westeurope"
|
||||
"location": "westus"
|
||||
},
|
||||
{
|
||||
"cluster_definition": "kubernetesversions/kubernetes1.5.3.json",
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче