This repository has been archived by the owner on Jan 11, 2023. It is now read-only.
Kubernetes: --max-pods=30 should be Azure CNI-only #3543
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: 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:
Approvers can indicate their approval by writing |
ghost
assigned 
|
This logic should probably also be reflected in acs-engine/pkg/api/convertertoagentpoolonlyapi.go Lines 489 to 498 in 5d2bedd |
Codecov Report
@@ Coverage Diff @@
## master #3543 +/- ##
==========================================
+ Coverage 55.48% 55.48% +<.01%
==========================================
Files 105 105
Lines 16047 16048 +1
==========================================
+ Hits 8903 8904 +1
Misses 6393 6393
Partials 751 751 |
|
Thank you @donaldguy, I agree! |
JunSun17
reviewed
Jul 25, 2018
| if networkProfile == nil || networkProfile.NetworkPlugin == v20180331.Kubenet { | ||
| maxPods = DefaultKubernetesMaxPodsKubenet | ||
| } else { | ||
| if networkProfile.NetworkPlugin == v20180331.Azure { |
There was a problem hiding this comment.
Can you change to networkProfile != nil && networkProfile.NetworkPlugin == v20180331.Azure, to avoid npe.
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) ...
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it: Instead of defaulting to --max-pods to 30 (the exceptional case) and then overriding to 110 (the more general case), it's easier to set to 110 by default and override to 30 when Azure CNI.
Which issue this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close that issue when PR gets merged): fixes #Special notes for your reviewer:
If applicable:
Release note: