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

fix: stop using ServiceNodeExclusion feature gate after it is GA #4466

Merged
merged 1 commit into from
Jun 15, 2021
Merged

fix: stop using ServiceNodeExclusion feature gate after it is GA #4466

merged 1 commit into from
Jun 15, 2021

Conversation

chewong
Copy link

@chewong chewong commented Jun 15, 2021

Signed-off-by: Ernest Wong chuwon@microsoft.com

Reason for Change:

Fixes test failure in https://testgrid.k8s.io/sig-windows-master-release#aks-engine-windows-containerd-master

Issue Fixed:

Credit Where Due:

Does this change contain code from or inspired by another project?

  • No
  • Yes

If "Yes," did you notify that project's maintainers and provide attribution?

  • No
  • Yes

Requirements:

Notes:

Signed-off-by: Ernest Wong <chuwon@microsoft.com>
@codecov
Copy link

codecov bot commented Jun 15, 2021

Codecov Report

Merging #4466 (5513fa5) into master (60828c7) will increase coverage by 0.00%.
The diff coverage is 72.43%.

Impacted file tree graph

@@           Coverage Diff            @@
##           master    #4466    +/-   ##
========================================
  Coverage   72.04%   72.05%            
========================================
  Files         141      141            
  Lines       21631    21765   +134     
========================================
+ Hits        15584    15682    +98     
- Misses       5096     5131    +35     
- Partials      951      952     +1     
Impacted Files Coverage Δ
cmd/rotate_certs.go 11.03% <0.00%> (ø)
cmd/upgrade.go 35.92% <0.00%> (ø)
pkg/api/common/versions.go 96.37% <ø> (ø)
pkg/api/types.go 92.85% <ø> (ø)
pkg/api/vlabs/types.go 73.04% <ø> (ø)
pkg/engine/templates_generated.go 43.31% <ø> (ø)
pkg/engine/template_generator.go 66.37% <11.53%> (-2.17%) ⬇️
cmd/get_logs.go 49.57% <30.43%> (-1.79%) ⬇️
cmd/addpool.go 17.97% <100.00%> (ø)
pkg/api/addons.go 98.01% <100.00%> (ø)
... and 6 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0b3df0e...5513fa5. Read the comment docs.

@@ -81,7 +82,10 @@ func (cs *ContainerService) setControllerManagerConfig() {
}

// Enables Node Exclusion from Services (toggled on agent nodes by the alpha.service-controller.kubernetes.io/exclude-balancer label).
addDefaultFeatureGates(o.KubernetesConfig.ControllerManagerConfig, o.OrchestratorVersion, "1.9.0", "ServiceNodeExclusion=true")
// ServiceNodeExclusion feature gate is GA in 1.19, removed in 1.22 (xref: https://github.com/kubernetes/kubernetes/pull/100776)
if !common.IsKubernetesVersionGe(o.OrchestratorVersion, "1.19.0") {
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: little awkward to read but looks like we don't have a LessThan function

Copy link
Member

Choose a reason for hiding this comment

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

yeah this is the common pattern for less than

Copy link
Member

Choose a reason for hiding this comment

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

/lgtm

@jsturtevant
Copy link
Contributor

/lgtm

@chewong chewong requested a review from jackfrancis June 15, 2021 16:02
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 Jun 15, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chewong, jackfrancis, jsturtevant, 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,jsturtevant,mboersma]

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

@jsturtevant jsturtevant merged commit 8ea7a3c into Azure:master Jun 15, 2021
@chewong chewong deleted the ServiceNodeExclusion branch June 16, 2021 15:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants