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

Kubernetes: Remove Windows-specific foo for control plane config #3240

Merged
merged 2 commits into from
Jun 20, 2018

Conversation

jackfrancis
Copy link
Member

@jackfrancis jackfrancis commented Jun 8, 2018

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:

  • apiserver
  • controller-manager
  • kube-scheduler
  • cloud-controller-manager

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): fixes #3219

Special notes for your reviewer:

If applicable:

  • documentation
  • unit tests
  • tested backward compatibility (ie. deploy with previous version, upgrade with this branch)

Release note:

Kubernetes: Remove Windows-specific foo for control plane config

}

// 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"
Copy link
Member

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

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, thanks! and done

@acs-bot acs-bot added size/L and removed size/M labels Jun 8, 2018
Copy link
Contributor

@CecileRobertMichon CecileRobertMichon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@PatrickLang
Copy link
Contributor

/lgtm

No concerns from me. None of these components are on the roadmap for a Windows port. Removing unused code is good.

@acs-bot
Copy link

acs-bot commented Jun 11, 2018

[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:
  • OWNERS [CecileRobertMichon,jackfrancis]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jackfrancis jackfrancis merged commit b7dc0ca into Azure:master Jun 20, 2018
@ghost ghost removed the in progress label Jun 20, 2018
@jackfrancis jackfrancis deleted the windows-apiserver-config branch June 20, 2018 00:12
PaulCharlton added a commit to ElementAnalytics/acs-engine that referenced this pull request Jun 20, 2018
* '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)
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

staticWindowsAPIServerConfig is missing some flags
5 participants