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

generic k8s config interfaces cleanup #2033

Merged
merged 1 commit into from
Jan 10, 2018
Merged

generic k8s config interfaces cleanup #2033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions parts/k8s/kubernetesmastercustomdata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,10 @@ MASTER_ARTIFACTS_CONFIG_PLACEHOLDER
{{end}}
{{if UseCloudControllerManager }}
sed -i "s|<kubernetesCcmImageSpec>|{{WrapAsVariable "kubernetesCcmImageSpec"}}|g" "/etc/kubernetes/manifests/cloud-controller-manager.yaml"
sed -i "s|<kubernetesCloudControllerManagerConfig>|{{GetCloudControllerManagerConfigKeyVals .OrchestratorProfile.KubernetesConfig}}|g" "/etc/kubernetes/manifests/cloud-controller-manager.yaml"
sed -i "s|<kubernetesCloudControllerManagerConfig>|{{GetK8sRuntimeConfigKeyVals .OrchestratorProfile.KubernetesConfig.CloudControllerManagerConfig}}|g" "/etc/kubernetes/manifests/cloud-controller-manager.yaml"
{{end}}
sed -i "s|<kubernetesControllerManagerConfig>|{{GetControllerManagerConfigKeyVals .OrchestratorProfile.KubernetesConfig}}|g" "/etc/kubernetes/manifests/kube-controller-manager.yaml"
sed -i "s|<kubernetesAPIServerConfig>|{{GetAPIServerConfigKeyVals .OrchestratorProfile.KubernetesConfig}}|g" "/etc/kubernetes/manifests/kube-apiserver.yaml"
sed -i "s|<kubernetesControllerManagerConfig>|{{GetK8sRuntimeConfigKeyVals .OrchestratorProfile.KubernetesConfig.ControllerManagerConfig}}|g" "/etc/kubernetes/manifests/kube-controller-manager.yaml"
sed -i "s|<kubernetesAPIServerConfig>|{{GetK8sRuntimeConfigKeyVals .OrchestratorProfile.KubernetesConfig.APIServerConfig}}|g" "/etc/kubernetes/manifests/kube-apiserver.yaml"
sed -i "s|<kubernetesAPIServerIP>|{{WrapAsVariable "kubernetesAPIServerIP"}}|g" "/etc/kubernetes/manifests/kube-apiserver.yaml"
{{ if .HasAadProfile }}
VAR_AAD_TENANT_ID={{WrapAsVariable "aadTenantId"}}
Expand Down
43 changes: 3 additions & 40 deletions pkg/acsengine/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,56 +861,19 @@ func (t *TemplateGenerator) getTemplateFuncMap(cs *api.ContainerService) templat
}
return buf.String()
},
"GetControllerManagerConfigKeyVals": func(kc *api.KubernetesConfig) string {
controllerManagerConfig := kc.ControllerManagerConfig
"GetK8sRuntimeConfigKeyVals": func(config map[string]string) string {
// Order by key for consistency
keys := []string{}
for key := range controllerManagerConfig {
for key := range config {
keys = append(keys, key)
}
sort.Strings(keys)
var buf bytes.Buffer
for _, key := range keys {
buf.WriteString(fmt.Sprintf("\"%s=%s\", ", key, controllerManagerConfig[key]))
buf.WriteString(fmt.Sprintf("\\\"%s=%s\\\", ", key, config[key]))
}
return strings.TrimSuffix(buf.String(), ", ")
},
"GetCloudControllerManagerConfigKeyVals": func(kc *api.KubernetesConfig) string {
cloudControllerManagerConfig := kc.CloudControllerManagerConfig
// Order by key for consistency
keys := []string{}
for key := range cloudControllerManagerConfig {
keys = append(keys, key)
}
sort.Strings(keys)
var buf bytes.Buffer
for _, key := range keys {
buf.WriteString(fmt.Sprintf("\\\"%s=%s\\\", ", key, cloudControllerManagerConfig[key]))
}
return strings.TrimSuffix(buf.String(), ", ")
},
"GetAPIServerConfigKeyVals": func(kc *api.KubernetesConfig) string {
apiServerConfig := kc.APIServerConfig
// Order by key for consistency
keys := []string{}
for key := range apiServerConfig {
keys = append(keys, key)
}
sort.Strings(keys)
var buf bytes.Buffer
for _, key := range keys {
buf.WriteString(fmt.Sprintf("\\\"%s=%s\\\", ", key, apiServerConfig[key]))
}
return strings.TrimSuffix(buf.String(), ", ")
},
// temporary until we genericise cloud controller manager config
"GetCloudControllerManagerRouteReconciliationPeriod": func(kc *api.KubernetesConfig) string {
controllerManagerConfig := cs.Properties.OrchestratorProfile.KubernetesConfig.ControllerManagerConfig
if kc.ControllerManagerConfig != nil {
controllerManagerConfig = kc.ControllerManagerConfig
}
return controllerManagerConfig["--route-reconciliation-period"]
},
"RequiresFakeAgentOutput": func() bool {
return cs.Properties.OrchestratorProfile.OrchestratorType == api.Kubernetes
},
Expand Down