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

fix an issue where networkPlugin was not defined correctly when using calico or cilium #3271

Merged
merged 5 commits into from
Jul 25, 2018

Conversation

dcasati
Copy link
Contributor

@dcasati dcasati commented Jun 14, 2018

What this PR does / why we need it:
Fixes an issue where networkPlugin wasn't specified and cilium or calico was used as a networkPolicy

This will address the following:

networkPlugin: "cilium",
networkPolicy: "",

networkPlugin: "cilium",
networkPolicy: "cilium",

networkPlugin: "",
networkPolicy: "cilium",

While here, I've also added the initial bits to the current README.md documentation.

Which issue this PR fixes :
fixes #3255

Special notes for your reviewer:

If applicable:

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

Release note:

@acs-bot acs-bot added the size/S label Jun 14, 2018
@codecov
Copy link

codecov bot commented Jun 14, 2018

Codecov Report

Merging #3271 into master will decrease coverage by 2.88%.
The diff coverage is 42.85%.

@@            Coverage Diff            @@
##           master   #3271      +/-   ##
=========================================
- Coverage   55.49%   52.6%   -2.89%     
=========================================
  Files         105     104       -1     
  Lines       16036   15582     -454     
=========================================
- Hits         8899    8197     -702     
- Misses       6380    6653     +273     
+ Partials      757     732      -25

@acs-bot acs-bot added size/M and removed size/S labels Jun 14, 2018
@CecileRobertMichon
Copy link
Contributor

/assign @jackfrancis

@acs-bot
Copy link

acs-bot commented Jul 25, 2018

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dcasati
To fully approve this pull request, please assign additional approvers.
We suggest the following additional approver: jackfrancis

If they are not already assigned, you can assign the PR to them by writing /assign @jackfrancis in a comment when ready.

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@jackfrancis
Copy link
Member

@dcasati I'd like to accept your docs changes (thanks!)

I'm cautious about changing any default network plugin/policy assignments for now, let's see if we can identify tangible combinations that are supposed to work but are not.

@jackfrancis jackfrancis merged commit c8fcc96 into Azure:master Jul 25, 2018
@ghost ghost removed the in progress label Jul 25, 2018
PaulCharlton added a commit to ElementAnalytics/acs-engine that referenced this pull request Jul 26, 2018
* 'master' of https://github.com/Azure/acs-engine: (59 commits)
  Docs: Update user guide list to include Windows, update description of clusters (Azure#3473)
  update to Azure CNI v1.0.10 (Azure#3551)
  Adding 'make dev' equivalent for Windows (Azure#3471)
  print out ubuntu ver in e2e (Azure#3555)
  fix an issue where networkPlugin was not defined correctly when using calico or cilium (Azure#3271)
  Bump ginkgo to a tagged release (Azure#3554)
  Reenable AzureFile tests for Windows on K8s 1.11.1, resolves Azure#3439 (Azure#3496)
  removing rbac error checking from merge fn (Azure#3530)
  Change dns healthcheck to look at external domain (Azure#3282)
  DOCUMENTATION: Fix Documented Default Value for clusterSubnet (Azure#3474)
  Document required manual calico 2.6.3 -> calico 3.1.1 upgrade when upgrading from < 0.17.0-provisioned clusters (Azure#3208)
  revert --image-pull-policy=IfNotPresent for win (Azure#3553)
  --image-pull-policy=IfNotPresent for kubectl run commands (Azure#3552)
  Kubernetes: --max-pods=30 should be Azure CNI-only (Azure#3543)
  disable Azure CNI network monitor addon default (Azure#3550)
  only do az vm list for k8s (Azure#3540)
  Retire Swarm E2E for PR test coverage (Azure#3539)
  retire Azure CDN for container image repository proxying (Azure#3535)
  removed datadisk to allow scale after upgrade (Azure#3482)
  Pump k8s-azure-kms version (Azure#3531)
  ...
PaulCharlton added a commit to ElementAnalytics/acs-engine that referenced this pull request Jul 26, 2018
* master: (59 commits)
  Docs: Update user guide list to include Windows, update description of clusters (Azure#3473)
  update to Azure CNI v1.0.10 (Azure#3551)
  Adding 'make dev' equivalent for Windows (Azure#3471)
  print out ubuntu ver in e2e (Azure#3555)
  fix an issue where networkPlugin was not defined correctly when using calico or cilium (Azure#3271)
  Bump ginkgo to a tagged release (Azure#3554)
  Reenable AzureFile tests for Windows on K8s 1.11.1, resolves Azure#3439 (Azure#3496)
  removing rbac error checking from merge fn (Azure#3530)
  Change dns healthcheck to look at external domain (Azure#3282)
  DOCUMENTATION: Fix Documented Default Value for clusterSubnet (Azure#3474)
  Document required manual calico 2.6.3 -> calico 3.1.1 upgrade when upgrading from < 0.17.0-provisioned clusters (Azure#3208)
  revert --image-pull-policy=IfNotPresent for win (Azure#3553)
  --image-pull-policy=IfNotPresent for kubectl run commands (Azure#3552)
  Kubernetes: --max-pods=30 should be Azure CNI-only (Azure#3543)
  disable Azure CNI network monitor addon default (Azure#3550)
  only do az vm list for k8s (Azure#3540)
  Retire Swarm E2E for PR test coverage (Azure#3539)
  retire Azure CDN for container image repository proxying (Azure#3535)
  removed datadisk to allow scale after upgrade (Azure#3482)
  Pump k8s-azure-kms version (Azure#3531)
  ...
juan-lee pushed a commit that referenced this pull request Aug 1, 2018
juan-lee pushed a commit that referenced this pull request Aug 1, 2018
jackfrancis pushed a commit to jackfrancis/acs-engine that referenced this pull request Aug 3, 2018
jackfrancis pushed a commit to jackfrancis/acs-engine that referenced this pull request Aug 3, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't use cilium if the networkPlugin is not defined or not present in the config file.
4 participants