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

Kubernetes: Azure CNI network monitor agents configuration errata #3674

Merged
merged 2 commits into from
Aug 16, 2018

Conversation

jackfrancis
Copy link
Member

What this PR does / why we need it: Two fixes:

  • remove reference to etc/kubernetes/addons/ in agent kubelet pre-script
  • enable Azure CNI daemonset to be scheduled on master nodes as well

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

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: Azure CNI network monitor agents configuration errata

@ghost ghost assigned jackfrancis Aug 14, 2018
@ghost ghost added the in progress label Aug 14, 2018
@jackfrancis
Copy link
Member Author

@mhyllander FYI

@codecov
Copy link

codecov bot commented Aug 14, 2018

Codecov Report

Merging #3674 into master will increase coverage by 0.17%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #3674      +/-   ##
==========================================
+ Coverage   55.49%   55.66%   +0.17%     
==========================================
  Files         108      108              
  Lines       16046    16026      -20     
==========================================
+ Hits         8904     8921      +17     
+ Misses       6378     6340      -38     
- Partials      764      765       +1

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

@acs-bot
Copy link

acs-bot commented Aug 15, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon, jackfrancis

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 74fc515 into Azure:master Aug 16, 2018
@jackfrancis jackfrancis deleted the addons-agent-cloud-init branch August 16, 2018 23:55
@ghost ghost removed the in progress label Aug 16, 2018
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.

CSE on agent pool node fails when configuring azure-cni-networkmonitor
3 participants