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

chore: use Azure CCM for k8s 1.16 and later #2161

Merged
merged 18 commits into from
Nov 13, 2019

Conversation

mboersma
Copy link
Member

@mboersma mboersma commented Oct 15, 2019

Reason for Change:
Switches to the out-of-tree cloud provider components if useCloudControllerManager is enabled and the Kubernetes version is 1.16.x or later. These components are considered alpha status currently but intended to become the default by 1.17 final release (early December!).

Issue Fixed:
Fixes #1915

Requirements:

Notes:
The cloud-controller-manager is deployed as a static pod manifest as it already was, and the cloud-node-manager is deployed as an addon. This is odd but I would argue the best we can do, but I'm open to feedback.

@mboersma
Copy link
Member Author

Let's revisit this after #2191 merges because I anticipate some (small) refactorings needed.

@mboersma mboersma force-pushed the azure-cloud-controller-manager branch from af7ae25 to f9d851e Compare October 29, 2019 18:20
@mboersma mboersma changed the title chore: use Azure CCM for k8s 1.17 and later chore: use Azure CCM for k8s 1.16 and later Oct 30, 2019
@mboersma mboersma force-pushed the azure-cloud-controller-manager branch from f1de322 to c8233a5 Compare October 30, 2019 20:34
@codecov
Copy link

codecov bot commented Oct 30, 2019

Codecov Report

Merging #2161 into master will increase coverage by <.01%.
The diff coverage is 77.58%.

@@            Coverage Diff            @@
##           master   #2161      +/-   ##
=========================================
+ Coverage    71.6%   71.6%   +<.01%     
=========================================
  Files         142     142              
  Lines       24817   24863      +46     
=========================================
+ Hits        17770   17804      +34     
- Misses       5911    5923      +12     
  Partials     1136    1136

Copy link
Member

@feiskyer feiskyer left a comment

Choose a reason for hiding this comment

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

/lgtm

Thanks a lot.

@acs-bot acs-bot added the lgtm label Oct 31, 2019
@mboersma mboersma added this to the v0.44.0 milestone Oct 31, 2019
@jackfrancis jackfrancis moved this from In progress to Under Review in backlog Oct 31, 2019
@mboersma mboersma force-pushed the azure-cloud-controller-manager branch from c8233a5 to d1de290 Compare October 31, 2019 21:36
@acs-bot acs-bot removed the lgtm label Oct 31, 2019
@mboersma mboersma force-pushed the azure-cloud-controller-manager branch from d1de290 to 05e2a3c Compare November 5, 2019 21:03
@feiskyer
Copy link
Member

feiskyer commented Nov 6, 2019

@mboersma any updates on this?

@mboersma mboersma force-pushed the azure-cloud-controller-manager branch from 05e2a3c to 5a12f90 Compare November 6, 2019 16:29
@mboersma
Copy link
Member Author

mboersma commented Nov 6, 2019

@feiskyer I think it's ready to merge, just trying to get CI to agree and looking for reviews from the AKS Engine team.

@mboersma
Copy link
Member Author

mboersma commented Nov 6, 2019

CI reports that we may be exceeding custom data max length for 1.17 clusters on this PR. :-(

@mboersma mboersma force-pushed the azure-cloud-controller-manager branch from a2d5c49 to 0d0cd72 Compare November 8, 2019 00:12
@acs-bot acs-bot added size/XXL and removed size/L labels Nov 8, 2019
@mboersma mboersma force-pushed the azure-cloud-controller-manager branch from 0d0cd72 to 1b54c10 Compare November 11, 2019 17:41
@mboersma mboersma force-pushed the azure-cloud-controller-manager branch from 4b659a5 to 7ab1bc3 Compare November 12, 2019 23:01
Copy link
Member

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

We want:

  • addons_test.go UT to validate the expected cloud-node-manager addon default behaviors
  • validate.go foo to throw an error if cloud-node-manager addon is explicitly enabled, but isn't supported by an appropriate cluster config (CCM disabled, running the wrong version of k8s, etc)

Copy link
Member

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

lgtm pending the requested UT

code looks good, bon courage!

@acs-bot acs-bot removed the size/L label Nov 13, 2019
@@ -3056,11 +3100,7 @@ func TestSetAddonsConfig(t *testing.T) {
Enabled: to.BoolPtr(false),
},
{
Name: AzureFileCSIDriverAddonName,
Copy link
Member Author

Choose a reason for hiding this comment

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

This was a duplicated pair of entries introduced in an earlier PR.

@@ -3323,11 +3363,7 @@ func TestSetAddonsConfig(t *testing.T) {
Enabled: to.BoolPtr(false),
},
{
Name: AzureFileCSIDriverAddonName,
Copy link
Member Author

Choose a reason for hiding this comment

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

Same as above: duplicate entries removed.

@feiskyer
Copy link
Member

/lgtm

@acs-bot acs-bot added the lgtm label Nov 13, 2019
Copy link
Member

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

/lgtm

@acs-bot acs-bot merged commit 1f6b3ea into Azure:master Nov 13, 2019
backlog automation moved this from Under Review to Done Nov 13, 2019
@acs-bot
Copy link

acs-bot commented Nov 13, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: feiskyer, jackfrancis, mboersma

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 [jackfrancis,mboersma]

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

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
No open projects
backlog
  
Done
Development

Successfully merging this pull request may close these issues.

Switch to cloud-provider-azure for cloud-controller-manager image
4 participants