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

fix: only configAddons if addons enabled #2774

Merged
merged 1 commit into from
Feb 24, 2020

Conversation

jackfrancis
Copy link
Member

Reason for Change:

This PR fixes an anomolous invocation of configAddons during CSE, which only exists according to a particular set of conditions. E.g.:

+ time_metric ConfigAddons configAddons
+ local name start end diff tags
+ name=ConfigAddons
+ shift
++ apmz time unixnano
+ start=1582571554614609524
+ configAddons
/opt/azure/containers/provision.sh: line 69: configAddons: command not found

Issue Fixed:

Requirements:

Notes:

@jackfrancis
Copy link
Member Author

The new condition in cse_main.sh pairs with this in cse_config.sh:

https://github.com/Azure/aks-engine/blob/master/parts/k8s/cloud-init/artifacts/cse_config.sh#L444

@codecov
Copy link

codecov bot commented Feb 24, 2020

Codecov Report

Merging #2774 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #2774   +/-   ##
=======================================
  Coverage   72.35%   72.35%           
=======================================
  Files         137      137           
  Lines       25341    25341           
=======================================
  Hits        18335    18335           
  Misses       5949     5949           
  Partials     1057     1057

Copy link
Member

@mboersma mboersma 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 Feb 24, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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

@jackfrancis jackfrancis merged commit 09fd4c3 into Azure:master Feb 24, 2020
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.

3 participants