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

Fix missing flags in staticWindowsAPIServerConfig #3239

Closed
wants to merge 1 commit into from
Closed

Fix missing flags in staticWindowsAPIServerConfig #3239

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
23 changes: 9 additions & 14 deletions pkg/acsengine/defaults-apiserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,27 +36,15 @@ func setAPIServerConfig(cs *api.ContainerService) {
"--v": "4",
}

// Windows apiserver config overrides
// TODO placeholder for specific config overrides for Windows clusters
staticWindowsAPIServerConfig := make(map[string]string)
for key, val := range staticLinuxAPIServerConfig {
staticWindowsAPIServerConfig[key] = val
}

// Default apiserver config
defaultAPIServerConfig := map[string]string{
"--audit-log-maxage": "30",
"--audit-log-maxbackup": "10",
"--audit-log-maxsize": "100",
}

// Data Encryption at REST configuration
if helpers.IsTrueBoolPointer(o.KubernetesConfig.EnableDataEncryptionAtRest) {
staticLinuxAPIServerConfig["--experimental-encryption-provider-config"] = "/etc/kubernetes/encryption-config.yaml"
}

// Data Encryption at REST with external KMS configuration
if helpers.IsTrueBoolPointer(o.KubernetesConfig.EnableEncryptionWithExternalKms) {
// Data Encryption at REST or encryption with external KMS configuration
if helpers.IsTrueBoolPointer(o.KubernetesConfig.EnableDataEncryptionAtRest) || helpers.IsTrueBoolPointer(o.KubernetesConfig.EnableEncryptionWithExternalKms) {
staticLinuxAPIServerConfig["--experimental-encryption-provider-config"] = "/etc/kubernetes/encryption-config.yaml"
}

Expand Down Expand Up @@ -120,6 +108,13 @@ func setAPIServerConfig(cs *api.ContainerService) {
}
}

// Windows apiserver config overrides
// TODO placeholder for specific config overrides for Windows clusters
staticWindowsAPIServerConfig := make(map[string]string)
for key, val := range staticLinuxAPIServerConfig {
staticWindowsAPIServerConfig[key] = val
}

// We don't support user-configurable values for the following,
// so any of the value assignments below will override user-provided values
var overrideAPIServerConfig map[string]string
Expand Down