зеркало из https://github.com/Azure/acs-engine.git
move k8s specific params to params_k8s.go (#4156)
This commit is contained in:
Tariq Ibrahim
Jack Francis
Родитель
32d46a1206
Коммит
b78249233b
|
|
@ -4,30 +4,6 @@
|
|||
"parameters": {
|
||||
{{range .AgentPoolProfiles}}{{template "agentparams.t" .}},{{end}}
|
||||
{{if .HasWindows}}
|
||||
"kubeBinariesSASURL": {
|
||||
"metadata": {
|
||||
"description": "The download url for kubernetes windows binaries package that is created by scripts/build-windows-k8s.sh"
|
||||
},
|
||||
"type": "string"
|
||||
},
|
||||
"windowsKubeBinariesURL": {
|
||||
"metadata": {
|
||||
"description": "The download url for kubernetes windows binaries produce by Kubernetes. This contains only the node binaries (example: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#node-binaries-1)"
|
||||
},
|
||||
"type": "string"
|
||||
},
|
||||
"kubeBinariesVersion": {
|
||||
"metadata": {
|
||||
"description": "Kubernetes windows binaries version"
|
||||
},
|
||||
"type": "string"
|
||||
},
|
||||
"windowsTelemetryGUID": {
|
||||
"metadata": {
|
||||
"description": "The GUID to set in windows agent to collect telemetry data."
|
||||
},
|
||||
"type": "string"
|
||||
},
|
||||
{{template "windowsparams.t"}},
|
||||
{{end}}
|
||||
{{template "masterparams.t" .}},
|
||||
|
|
|
|||
|
|
@ -1,3 +1,29 @@
|
|||
{{if or IsKubernetes IsOpenShift}}
|
||||
"kubeBinariesSASURL": {
|
||||
"metadata": {
|
||||
"description": "The download url for kubernetes windows binaries package that is created by scripts/build-windows-k8s.sh"
|
||||
},
|
||||
"type": "string"
|
||||
},
|
||||
"windowsKubeBinariesURL": {
|
||||
"metadata": {
|
||||
"description": "The download url for kubernetes windows binaries produce by Kubernetes. This contains only the node binaries (example: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#node-binaries-1)"
|
||||
},
|
||||
"type": "string"
|
||||
},
|
||||
"kubeBinariesVersion": {
|
||||
"metadata": {
|
||||
"description": "Kubernetes windows binaries version"
|
||||
},
|
||||
"type": "string"
|
||||
},
|
||||
"windowsTelemetryGUID": {
|
||||
"metadata": {
|
||||
"description": "The GUID to set in windows agent to collect telemetry data."
|
||||
},
|
||||
"type": "string"
|
||||
},
|
||||
{{end}}
|
||||
"windowsAdminUsername": {
|
||||
"type": "string",
|
||||
"metadata": {
|
||||
|
|
|
|||
|
|
@ -229,27 +229,6 @@ func getParameters(cs *api.ContainerService, generatorCode string, acsengineVers
|
|||
|
||||
addValue(parametersMap, "windowsDockerVersion", properties.WindowsProfile.GetWindowsDockerVersion())
|
||||
|
||||
if properties.OrchestratorProfile.IsKubernetes() || properties.OrchestratorProfile.IsOpenShift() {
|
||||
k8sVersion := properties.OrchestratorProfile.OrchestratorVersion
|
||||
|
||||
if properties.OrchestratorProfile.KubernetesConfig != nil {
|
||||
|
||||
// Kubernetes packages as zip file as created by scripts/build-windows-k8s.sh
|
||||
// will be removed in future release as if gets phased out (https://github.com/Azure/acs-engine/issues/3851)
|
||||
kubeBinariesSASURL := properties.OrchestratorProfile.KubernetesConfig.CustomWindowsPackageURL
|
||||
if kubeBinariesSASURL == "" {
|
||||
kubeBinariesSASURL = cloudSpecConfig.KubernetesSpecConfig.KubeBinariesSASURLBase + api.K8sComponentsByVersionMap[k8sVersion]["windowszip"]
|
||||
}
|
||||
addValue(parametersMap, "kubeBinariesSASURL", kubeBinariesSASURL)
|
||||
|
||||
// Kubernetes node binaries as packaged by upstream kubernetes
|
||||
// example at https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#node-binaries-1
|
||||
addValue(parametersMap, "windowsKubeBinariesURL", properties.OrchestratorProfile.KubernetesConfig.WindowsNodeBinariesURL)
|
||||
|
||||
addValue(parametersMap, "kubeBinariesVersion", k8sVersion)
|
||||
addValue(parametersMap, "windowsTelemetryGUID", cloudSpecConfig.KubernetesSpecConfig.WindowsTelemetryGUID)
|
||||
}
|
||||
}
|
||||
for i, s := range properties.WindowsProfile.Secrets {
|
||||
addValue(parametersMap, fmt.Sprintf("windowsKeyVaultID%d", i), s.SourceVault.ID)
|
||||
for j, c := range s.VaultCertificates {
|
||||
|
|
|
|||
|
|
@ -20,10 +20,13 @@ func assignKubernetesParameters(properties *api.Properties, parametersMap params
|
|||
|
||||
if orchestratorProfile.IsKubernetes() ||
|
||||
orchestratorProfile.IsOpenShift() {
|
||||
k8sComponents := api.K8sComponentsByVersionMap[orchestratorProfile.OrchestratorVersion]
|
||||
|
||||
k8sVersion := orchestratorProfile.OrchestratorVersion
|
||||
k8sComponents := api.K8sComponentsByVersionMap[k8sVersion]
|
||||
kubernetesConfig := orchestratorProfile.KubernetesConfig
|
||||
|
||||
if kubernetesConfig != nil {
|
||||
|
||||
if helpers.IsTrueBoolPointer(kubernetesConfig.UseCloudControllerManager) {
|
||||
kubernetesCcmSpec := kubernetesConfig.KubernetesImageBase + k8sComponents["ccm"]
|
||||
if kubernetesConfig.CustomCcmImage != "" {
|
||||
|
|
@ -245,7 +248,7 @@ func assignKubernetesParameters(properties *api.Properties, parametersMap params
|
|||
}
|
||||
}
|
||||
}
|
||||
if common.IsKubernetesVersionGe(properties.OrchestratorProfile.OrchestratorVersion, "1.12.0") {
|
||||
if common.IsKubernetesVersionGe(k8sVersion, "1.12.0") {
|
||||
addValue(parametersMap, "kubernetesCoreDNSSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+k8sComponents["coredns"])
|
||||
} else {
|
||||
addValue(parametersMap, "kubernetesKubeDNSSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+k8sComponents["kube-dns"])
|
||||
|
|
@ -299,6 +302,23 @@ func assignKubernetesParameters(properties *api.Properties, parametersMap params
|
|||
}
|
||||
|
||||
addValue(parametersMap, "enableAggregatedAPIs", kubernetesConfig.EnableAggregatedAPIs)
|
||||
|
||||
if properties.HasWindows() {
|
||||
// Kubernetes packages as zip file as created by scripts/build-windows-k8s.sh
|
||||
// will be removed in future release as if gets phased out (https://github.com/Azure/acs-engine/issues/3851)
|
||||
kubeBinariesSASURL := kubernetesConfig.CustomWindowsPackageURL
|
||||
if kubeBinariesSASURL == "" {
|
||||
kubeBinariesSASURL = cloudSpecConfig.KubernetesSpecConfig.KubeBinariesSASURLBase + k8sComponents["windowszip"]
|
||||
}
|
||||
addValue(parametersMap, "kubeBinariesSASURL", kubeBinariesSASURL)
|
||||
|
||||
// Kubernetes node binaries as packaged by upstream kubernetes
|
||||
// example at https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG-1.11.md#node-binaries-1
|
||||
addValue(parametersMap, "windowsKubeBinariesURL", kubernetesConfig.WindowsNodeBinariesURL)
|
||||
|
||||
addValue(parametersMap, "kubeBinariesVersion", k8sVersion)
|
||||
addValue(parametersMap, "windowsTelemetryGUID", cloudSpecConfig.KubernetesSpecConfig.WindowsTelemetryGUID)
|
||||
}
|
||||
}
|
||||
|
||||
if kubernetesConfig == nil ||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче