Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

add coredns image reference to components versions map #3998

Merged
merged 4 commits into from
Oct 13, 2018
Merged

add coredns image reference to components versions map #3998

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f438ab
add coredns image reference to components map
jackfrancis Oct 12, 2018
82d9a13
conditional params errata
jackfrancis Oct 12, 2018
ee9cea1
forgot the key part
jackfrancis Oct 12, 2018
8bb96a4
valid coredns image under k8s.gcr.io/ repo
jackfrancis Oct 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions parts/k8s/kubernetesparams.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,15 +625,17 @@
"cloudProviderRateLimitBucket": 0
}
},
"kubernetesKubeDNSSpec": {
{{if IsKubernetesVersionGe "1.12.0"}}
"kubernetesCoreDNSSpec": {
"metadata": {
"description": "The container spec for kubedns-amd64."
"description": "The container spec for coredns"
},
"type": "string"
},
"kubernetesCoreDNSSpec": {
{{else}}
"kubernetesKubeDNSSpec": {
"metadata": {
"description": "The container spec for coredns"
"description": "The container spec for kubedns-amd64."
},
"type": "string"
},
Expand All @@ -643,6 +645,7 @@
},
"type": "string"
},
{{end}}
{{if not IsOpenShift}}
"dockerEngineDownloadRepo": {
"defaultValue": "https://aptdocker.azureedge.net/repo",
Expand Down
10 changes: 7 additions & 3 deletions pkg/acsengine/params_k8s.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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"])
Expand Down Expand Up @@ -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,
Expand Down
16 changes: 9 additions & 7 deletions pkg/api/k8s_versions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down
15 changes: 8 additions & 7 deletions pkg/api/k8s_versions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down Expand Up @@ -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"],
Expand Down