-
Notifications
You must be signed in to change notification settings - Fork 558
Kubernetes: Remove Windows-specific foo for control plane config #3240
Kubernetes: Remove Windows-specific foo for control plane config #3240
Conversation
pkg/acsengine/defaults-apiserver.go
Outdated
} | ||
|
||
// Data Encryption at REST with external KMS configuration | ||
if helpers.IsTrueBoolPointer(o.KubernetesConfig.EnableEncryptionWithExternalKms) { | ||
staticLinuxAPIServerConfig["--experimental-encryption-provider-config"] = "/etc/kubernetes/encryption-config.yaml" | ||
staticAPIServerConfig["--experimental-encryption-provider-config"] = "/etc/kubernetes/encryption-config.yaml" |
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.
Can you go ahead and combine these two conditions in an OR? I had it in the other PR
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.
Indeed, thanks! and done
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.
/lgtm
/lgtm No concerns from me. None of these components are on the roadmap for a Windows port. Removing unused code is good. |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: CecileRobertMichon, jackfrancis, PatrickLang The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
* 'master' of https://github.com/Azure/acs-engine: (44 commits) remove duplicate ebtables (Azure#3308) Kubernetes: Remove Windows-specific foo for control plane config (Azure#3240) add k8s 1.8.14 (Azure#3303) run /usr/lib/apt/apt.systemd.daily in background (Azure#3304) add annotation to secrets field (Azure#3292) fix(oms): pull oms directly from docker (Azure#3294) ensure params vals are bool, with test (Azure#3285) udpate to latest 16.04 LTS image (Azure#3286) Enable openshift e2e tests on centos (Azure#2910) remove docker dependency from hyperkube extract (Azure#3296) remove pathological test (Azure#3291) Refactor validateDNSPrefix function in one place (Azure#3276) remove unnecessary nil check (Azure#3290) Fixing panic issue in Validate when properties are nil (Azure#3242) Updating the omsagent yaml file to include new changes for node zero dependency (Azure#3277) revert Azure CNI to 1.0.4 (Azure#3289) Add e2e test for openshift vnet (Azure#3274) Support upgrading a Kubernetes cluster that contains Virtual Machine Scale Sets (Azure#3223) Set extension for custom DNS (Azure#3264) don't exit CSE on apt.systemd.daily error (Azure#3278) ...
What this PR does / why we need it: Since we don't have any support for Windows-backed control plane components, and we don't have any need to discretely configure the control plane if the cluster has Windows nodes, all of the Windows-specific code paths in the following componentry are bogon:
Which issue this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close that issue when PR gets merged): fixes #3219Special notes for your reviewer:
If applicable:
Release note: