This repository has been archived by the owner on Jan 11, 2023. It is now read-only.
Add Rescheduler addon #1780
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| apiVersion: extensions/v1beta1 | ||
| kind: Deployment | ||
| metadata: | ||
| name: rescheduler | ||
| namespace: kube-system | ||
| labels: | ||
| k8s-app: rescheduler | ||
| kubernetes.io/cluster-service: "true" | ||
| addonmanager.kubernetes.io/mode: Reconcile | ||
| spec: | ||
| replicas: 1 | ||
| selector: | ||
| matchLabels: | ||
| k8s-app: rescheduler | ||
| template: | ||
| metadata: | ||
| labels: | ||
| k8s-app: rescheduler | ||
| annotations: | ||
| scheduler.alpha.kubernetes.io/critical-pod: '' | ||
| spec: | ||
| containers: | ||
| - image: <kubernetesReschedulerSpec> | ||
| name: rescheduler | ||
| resources: | ||
| requests: | ||
| cpu: <kubernetesReschedulerCPURequests> | ||
| memory: <kubernetesReschedulerCPULimit> | ||
| limits: | ||
| cpu: <kubernetesReschedulerCPULimit> | ||
| memory: <kubernetesReschedulerMemoryLimit> | ||
| command: | ||
| - sh | ||
| - -c | ||
| - '/rescheduler' | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -85,6 +85,10 @@ const ( | |
| DefaultOrchestratorName = "k8s" | ||
| // DefaultEtcdDiskSize specifies the default size for Kubernetes master etcd disk volumes in GB | ||
| DefaultEtcdDiskSize = "128" | ||
| // DefaultReschedulerImage defines the rescheduler deployment version on Kubernetes Clusters | ||
| DefaultReschedulerImage = "rescheduler:v0.3.1" | ||
|
There was a problem hiding this comment. Is the right version to use as default? There was a problem hiding this comment. 0.3.1 is the latest tag here |
||
| // DefaultReschedulerAddonName is the name of the rescheduler addon deployment | ||
| DefaultReschedulerAddonName = "rescheduler" | ||
| ) | ||
|
|
||
| const ( | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -121,6 +121,7 @@ var kubernetesAddonYamls = map[string]string{ | |
| "MASTER_ADDON_KUBERNETES_DASHBOARD_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-kubernetes-dashboard-deployment.yaml", | ||
| "MASTER_ADDON_AZURE_STORAGE_CLASSES_B64_GZIP_STR": "kubernetesmasteraddons-azure-storage-classes.yaml", | ||
| "MASTER_ADDON_TILLER_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-tiller-deployment.yaml", | ||
| "MASTER_ADDON_RESCHEDULER_DEPLOYMENT_B64_GZIP_STR": "kubernetesmasteraddons-kube-rescheduler-deployment.yaml", | ||
| } | ||
|
|
||
| var kubernetesAddonYamls15 = map[string]string{ | ||
|
|
@@ -547,6 +548,7 @@ func getParameters(cs *api.ContainerService, isClassicMode bool, generatorCode s | |
| addValue(parametersMap, "kubernetesDNSMasqSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["dnsmasq"]) | ||
| addValue(parametersMap, "kubernetesExecHealthzSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["exechealthz"]) | ||
| addValue(parametersMap, "kubernetesHeapsterSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["heapster"]) | ||
| addValue(parametersMap, "kubernetesReschedulerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["rescheduler"]) | ||
|
There was a problem hiding this comment. use |
||
| tillerAddon := getAddonByName(properties.OrchestratorProfile.KubernetesConfig.Addons, DefaultTillerAddonName) | ||
| c := getAddonContainersIndexByName(tillerAddon.Containers, DefaultTillerAddonName) | ||
| if c > -1 { | ||
|
|
@@ -570,7 +572,20 @@ func getParameters(cs *api.ContainerService, isClassicMode bool, generatorCode s | |
| if dashboardAddon.Containers[c].Image != "" { | ||
| addValue(parametersMap, "kubernetesDashboardSpec", dashboardAddon.Containers[c].Image) | ||
| } else { | ||
| addValue(parametersMap, "kubernetesDashboardSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion][DefaultDashboardAddonName]) | ||
|
There was a problem hiding this comment. @jackfrancis is there a reason why this wasn't using the name var? is it okay that I changed it? (1/3) |
||
| } | ||
| } | ||
| reschedulerAddon := getAddonByName(properties.OrchestratorProfile.KubernetesConfig.Addons, DefaultReschedulerAddonName) | ||
| c = getAddonContainersIndexByName(reschedulerAddon.Containers, DefaultReschedulerAddonName) | ||
| if c > -1 { | ||
| addValue(parametersMap, "kubernetesReschedulerCPURequests", reschedulerAddon.Containers[c].CPURequests) | ||
| addValue(parametersMap, "kubernetesReschedulerCPULimit", reschedulerAddon.Containers[c].CPULimits) | ||
| addValue(parametersMap, "kubernetesReschedulerMemoryRequests", reschedulerAddon.Containers[c].MemoryRequests) | ||
| addValue(parametersMap, "kubernetesReschedulerMemoryLimit", reschedulerAddon.Containers[c].MemoryLimits) | ||
| if reschedulerAddon.Containers[c].Image != "" { | ||
| addValue(parametersMap, "kubernetesReschedulerSpec", dashboardAddon.Containers[c].Image) | ||
| } else { | ||
| addValue(parametersMap, "kubernetesReschedulerSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion][DefaultReschedulerAddonName]) | ||
| } | ||
| } | ||
| addValue(parametersMap, "kubernetesKubeDNSSpec", cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase+KubeConfigs[k8sVersion]["dns"]) | ||
|
|
@@ -962,6 +977,9 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat | |
| if !profile.OrchestratorProfile.KubernetesConfig.IsDashboardEnabled() { | ||
| delete(addonYamls, "MASTER_ADDON_KUBERNETES_DASHBOARD_DEPLOYMENT_B64_GZIP_STR") | ||
| } | ||
| if !profile.OrchestratorProfile.KubernetesConfig.IsReschedulerEnabled() { | ||
| delete(addonYamls, "MASTER_ADDON_RESCHEDULER_DEPLOYMENT_B64_GZIP_STR") | ||
| } | ||
| for placeholder, filename := range addonYamls { | ||
| addonTextContents := getBase64CustomScript(filename) | ||
| str = strings.Replace(str, placeholder, addonTextContents, -1) | ||
|
|
@@ -1175,6 +1193,8 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat | |
| tC := getAddonContainersIndexByName(tillerAddon.Containers, DefaultTillerAddonName) | ||
| dashboardAddon := getAddonByName(cs.Properties.OrchestratorProfile.KubernetesConfig.Addons, DefaultDashboardAddonName) | ||
| dC := getAddonContainersIndexByName(dashboardAddon.Containers, DefaultDashboardAddonName) | ||
| reschedulerAddon := getAddonByName(cs.Properties.OrchestratorProfile.KubernetesConfig.Addons, DefaultReschedulerAddonName) | ||
| rC := getAddonContainersIndexByName(reschedulerAddon.Containers, DefaultReschedulerAddonName) | ||
| switch attr { | ||
| case "kubernetesHyperkubeSpec": | ||
| val = cs.Properties.OrchestratorProfile.KubernetesConfig.KubernetesImageBase + KubeConfigs[k8sVersion]["hyperkube"] | ||
|
|
@@ -1191,7 +1211,7 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat | |
| val = dashboardAddon.Containers[dC].Image | ||
| } | ||
| } else { | ||
| val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion][DefaultDashboardAddonName] | ||
|
There was a problem hiding this comment. @jackfrancis same here (2/3) |
||
| } | ||
| case "kubernetesDashboardCPURequests": | ||
| if dC > -1 { | ||
|
|
@@ -1255,6 +1275,38 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat | |
| } else { | ||
| val = "" | ||
| } | ||
| case "kubernetesReschedulerSpec": | ||
| if rC > -1 { | ||
| if reschedulerAddon.Containers[rC].Image != "" { | ||
| val = reschedulerAddon.Containers[rC].Image | ||
| } | ||
| } else { | ||
| val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion][DefaultReschedulerAddonName] | ||
| } | ||
| case "kubernetesReschedulerCPURequests": | ||
| if rC > -1 { | ||
| val = reschedulerAddon.Containers[rC].CPURequests | ||
| } else { | ||
| val = "" | ||
| } | ||
| case "kubernetesReschedulerMemoryRequests": | ||
| if rC > -1 { | ||
| val = reschedulerAddon.Containers[rC].MemoryRequests | ||
| } else { | ||
| val = "" | ||
| } | ||
| case "kubernetesReschedulerCPULimit": | ||
| if rC > -1 { | ||
| val = reschedulerAddon.Containers[rC].CPULimits | ||
| } else { | ||
| val = "" | ||
| } | ||
| case "kubernetesReschedulerMemoryLimit": | ||
| if rC > -1 { | ||
| val = reschedulerAddon.Containers[rC].MemoryLimits | ||
| } else { | ||
| val = "" | ||
| } | ||
| case "kubernetesKubeDNSSpec": | ||
| val = cloudSpecConfig.KubernetesSpecConfig.KubernetesImageBase + KubeConfigs[k8sVersion]["dns"] | ||
| case "kubernetesPodInfraContainerSpec": | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This needs to be
<kubernetesReschedulerMemoryRequests>There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oops yes thank you!