Azure
/
acs-engine
зеркало из https://github.com/Azure/acs-engine.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

add coredns image reference to components versions map (#3998)

This commit is contained in:
Jack Francis 2018-10-13 10:41:35 -07:00 коммит произвёл GitHub
Родитель 5b9ced926f
Коммит 4a3686c95f
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 33 добавлений и 23 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

15
parts/k8s/kubernetesparams.t
Просмотреть файл

@ -625,24 +625,27 @@
"cloudProviderRateLimitBucket": 0
}
},
"kubernetesKubeDNSSpec": {
"metadata": {
"description": "The container spec for kubedns-amd64."
},
"type": "string"
},
{{if IsKubernetesVersionGe "1.12.0"}}
"kubernetesCoreDNSSpec": {
"metadata": {
"description": "The container spec for coredns"
},
"type": "string"
},
{{else}}
"kubernetesKubeDNSSpec": {
"metadata": {
"description": "The container spec for kubedns-amd64."
},
"type": "string"
},
"kubernetesDNSMasqSpec": {
"metadata": {
"description": "The container spec for kube-dnsmasq-amd64."
},
"type": "string"
},
{{end}}
{{if not IsOpenShift}}
"dockerEngineDownloadRepo": {
"defaultValue": "https://aptdocker.azureedge.net/repo",

10
pkg/acsengine/params_k8s.go
Просмотреть файл

@ -8,6 +8,7 @@ import (
"time"
"github.com/Azure/acs-engine/pkg/api"
"github.com/Azure/acs-engine/pkg/api/common"
"github.com/Azure/acs-engine/pkg/helpers"
)
@ -45,7 +46,6 @@ func assignKubernetesParameters(properties *api.Properties, parametersMap params
addValue(parametersMap, "kubernetesHyperkubeSpec", kubernetesHyperkubeSpec)
addValue(parametersMap, "kubernetesAddonManagerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+k8sComponents["addonmanager"])
addValue(parametersMap, "kubernetesAddonResizerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+k8sComponents["addonresizer"])
addValue(parametersMap, "kubernetesDNSMasqSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+k8sComponents["dnsmasq"])
addValue(parametersMap, "kubernetesExecHealthzSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+k8sComponents["exechealthz"])
addValue(parametersMap, "kubernetesDNSSidecarSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+k8sComponents["k8s-dns-sidecar"])
addValue(parametersMap, "kubernetesHeapsterSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+k8sComponents["heapster"])
@ -246,8 +246,12 @@ func assignKubernetesParameters(properties *api.Properties, parametersMap params
}
}
}
addValue(parametersMap, "kubernetesCoreDNSSpec", "coredns/coredns:1.2.2")
addValue(parametersMap, "kubernetesKubeDNSSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+k8sComponents["dns"])
if common.IsKubernetesVersionGe(properties.OrchestratorProfile.OrchestratorVersion, "1.12.0") {
addValue(parametersMap, "kubernetesCoreDNSSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+k8sComponents["coredns"])
} else {
addValue(parametersMap, "kubernetesKubeDNSSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+k8sComponents["kube-dns"])
addValue(parametersMap, "kubernetesDNSMasqSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+k8sComponents["dnsmasq"])
}
addValue(parametersMap, "kubernetesPodInfraContainerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+k8sComponents["pause"])
addValue(parametersMap, "cloudproviderConfig", api.CloudProviderConfig{
CloudProviderBackoff: kubernetesConfig.CloudProviderBackoff,

16
pkg/api/k8s_versions.go
Просмотреть файл

@ -15,6 +15,7 @@ var k8sComponentVersions = map[string]map[string]string{
"addon-resizer": "addon-resizer:1.8.1",
"heapster": "heapster-amd64:v1.5.3",
"metrics-server": "metrics-server-amd64:v0.2.1",
"coredns": "coredns:1.2.2",
"kube-dns": "k8s-dns-kube-dns-amd64:1.14.13",
"addon-manager": "kube-addon-manager-amd64:v8.7",
"dnsmasq": "k8s-dns-dnsmasq-nanny-amd64:1.14.10",
@ -295,7 +296,8 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
"addonresizer": k8sComponentVersions["1.12"]["addon-resizer"],
"heapster": k8sComponentVersions["1.12"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.12"]["metrics-server"],
"dns": k8sComponentVersions["1.12"]["kube-dns"],
"coredns": k8sComponentVersions["1.12"]["coredns"],
"kube-dns": k8sComponentVersions["1.12"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.12"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.12"]["dnsmasq"],
"pause": k8sComponentVersions["1.12"]["pause"],
@ -331,7 +333,7 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
"addonresizer": k8sComponentVersions["1.11"]["addon-resizer"],
"heapster": k8sComponentVersions["1.11"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.11"]["metrics-server"],
"dns": k8sComponentVersions["1.11"]["kube-dns"],
"kube-dns": k8sComponentVersions["1.11"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.11"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.11"]["dnsmasq"],
"pause": k8sComponentVersions["1.11"]["pause"],
@ -367,7 +369,7 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
"addonresizer": k8sComponentVersions["1.10"]["addon-resizer"],
"heapster": k8sComponentVersions["1.10"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.10"]["metrics-server"],
"dns": k8sComponentVersions["1.10"]["kube-dns"],
"kube-dns": k8sComponentVersions["1.10"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.10"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.10"]["dnsmasq"],
"pause": k8sComponentVersions["1.10"]["pause"],
@ -403,7 +405,7 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
"addonresizer": k8sComponentVersions["1.9"]["addon-resizer"],
"heapster": k8sComponentVersions["1.9"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.9"]["metrics-server"],
"dns": k8sComponentVersions["1.9"]["kube-dns"],
"kube-dns": k8sComponentVersions["1.9"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.9"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.9"]["dnsmasq"],
"pause": k8sComponentVersions["1.9"]["pause"],
@ -438,7 +440,7 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
"addonresizer": k8sComponentVersions["1.8"]["addon-resizer"],
"heapster": k8sComponentVersions["1.8"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.8"]["metrics-server"],
"dns": k8sComponentVersions["1.8"]["kube-dns"],
"kube-dns": k8sComponentVersions["1.8"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.8"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.8"]["dnsmasq"],
"pause": k8sComponentVersions["1.8"]["pause"],
@ -469,7 +471,7 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
"addonresizer": k8sComponentVersions["1.7"]["addon-resizer"],
"heapster": k8sComponentVersions["1.7"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.7"]["metrics-server"],
"dns": k8sComponentVersions["1.7"]["kube-dns"],
"kube-dns": k8sComponentVersions["1.7"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.7"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.7"]["dnsmasq"],
"pause": k8sComponentVersions["1.7"]["pause"],
@ -500,7 +502,7 @@ func getK8sVersionComponents(version string, overrides map[string]string) map[st
"addonresizer": k8sComponentVersions["1.6"]["addon-resizer"],
"heapster": k8sComponentVersions["1.6"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.6"]["metrics-server"],
"dns": k8sComponentVersions["1.6"]["kube-dns"],
"kube-dns": k8sComponentVersions["1.6"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.6"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.6"]["dnsmasq"],
"pause": k8sComponentVersions["1.6"]["pause"],

15
pkg/api/k8s_versions_test.go
Просмотреть файл

@ -20,7 +20,8 @@ func TestGetK8sVersionComponents(t *testing.T) {
"addonresizer": k8sComponentVersions["1.12"]["addon-resizer"],
"heapster": k8sComponentVersions["1.12"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.12"]["metrics-server"],
"dns": k8sComponentVersions["1.12"]["kube-dns"],
"coredns": k8sComponentVersions["1.12"]["coredns"],
"kube-dns": k8sComponentVersions["1.12"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.12"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.12"]["dnsmasq"],
"pause": k8sComponentVersions["1.12"]["pause"],
@ -66,7 +67,7 @@ func TestGetK8sVersionComponents(t *testing.T) {
"addonresizer": k8sComponentVersions["1.11"]["addon-resizer"],
"heapster": k8sComponentVersions["1.11"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.11"]["metrics-server"],
"dns": k8sComponentVersions["1.11"]["kube-dns"],
"kube-dns": k8sComponentVersions["1.11"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.11"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.11"]["dnsmasq"],
"pause": k8sComponentVersions["1.11"]["pause"],
@ -112,7 +113,7 @@ func TestGetK8sVersionComponents(t *testing.T) {
"addonresizer": k8sComponentVersions["1.10"]["addon-resizer"],
"heapster": k8sComponentVersions["1.10"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.10"]["metrics-server"],
"dns": k8sComponentVersions["1.10"]["kube-dns"],
"kube-dns": k8sComponentVersions["1.10"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.10"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.10"]["dnsmasq"],
"pause": k8sComponentVersions["1.10"]["pause"],
@ -158,7 +159,7 @@ func TestGetK8sVersionComponents(t *testing.T) {
"addonresizer": k8sComponentVersions["1.9"]["addon-resizer"],
"heapster": k8sComponentVersions["1.9"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.9"]["metrics-server"],
"dns": k8sComponentVersions["1.9"]["kube-dns"],
"kube-dns": k8sComponentVersions["1.9"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.9"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.9"]["dnsmasq"],
"pause": k8sComponentVersions["1.9"]["pause"],
@ -203,7 +204,7 @@ func TestGetK8sVersionComponents(t *testing.T) {
"addonresizer": k8sComponentVersions["1.8"]["addon-resizer"],
"heapster": k8sComponentVersions["1.8"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.8"]["metrics-server"],
"dns": k8sComponentVersions["1.8"]["kube-dns"],
"kube-dns": k8sComponentVersions["1.8"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.8"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.8"]["dnsmasq"],
"pause": k8sComponentVersions["1.8"]["pause"],
@ -243,7 +244,7 @@ func TestGetK8sVersionComponents(t *testing.T) {
"addonresizer": k8sComponentVersions["1.7"]["addon-resizer"],
"heapster": k8sComponentVersions["1.7"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.7"]["metrics-server"],
"dns": k8sComponentVersions["1.7"]["kube-dns"],
"kube-dns": k8sComponentVersions["1.7"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.7"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.7"]["dnsmasq"],
"pause": k8sComponentVersions["1.7"]["pause"],
@ -285,7 +286,7 @@ func TestGetK8sVersionComponents(t *testing.T) {
"addonresizer": k8sComponentVersions["1.9"]["addon-resizer"],
"heapster": k8sComponentVersions["1.9"]["heapster"],
DefaultMetricsServerAddonName: k8sComponentVersions["1.9"]["metrics-server"],
"dns": k8sComponentVersions["1.9"]["kube-dns"],
"kube-dns": k8sComponentVersions["1.9"]["kube-dns"],
"addonmanager": k8sComponentVersions["1.9"]["addon-manager"],
"dnsmasq": k8sComponentVersions["1.9"]["dnsmasq"],
"pause": k8sComponentVersions["1.9"]["pause"],