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

refactor: remove unsupported orchestrators #3965

Merged
merged 4 commits into from
Nov 14, 2020

Conversation

mboersma
Copy link
Member

Reason for Change:

Removes references to the Swarm, Swarm mode, Mesos, and DC/OS orchestrator types to simplify the AKS Engine codebase.

This code was already effectively dead, but was being retained out of an abundance of caution in order not to break AKS' vendoring needs. That is no longer a concern.

Issue Fixed:

Refs #2500

Credit Where Due:

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

  • No
  • Yes

Requirements:

Notes:

Let me know if I should make separate PRs for each commit instead to make it more digestible.

There is further refactoring for simplicity that can be done here, probably starting with removal of GenerateTemplate and any remaining switch statements where the only case is Kubernetes now. This seems like enough to review, however.

@jackfrancis
Copy link
Member

cc @xuto2

@mboersma mboersma force-pushed the cruft-removal branch 4 times, most recently from 7501121 to c360b52 Compare November 4, 2020 16:23
@codecov
Copy link

codecov bot commented Nov 4, 2020

Codecov Report

Merging #3965 (248d010) into master (3fa95be) will decrease coverage by 0.65%.
The diff coverage is 85.71%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3965      +/-   ##
==========================================
- Coverage   73.72%   73.06%   -0.66%     
==========================================
  Files         147      145       -2     
  Lines       23177    21856    -1321     
==========================================
- Hits        17087    15969    -1118     
+ Misses       4976     4849     -127     
+ Partials     1114     1038      -76     
Impacted Files Coverage Δ
pkg/api/common/const.go 100.00% <ø> (+60.00%) ⬆️
pkg/api/common/versions.go 97.38% <ø> (+1.00%) ⬆️
pkg/api/converterfromapi.go 95.65% <ø> (+0.78%) ⬆️
pkg/api/convertertoapi.go 93.49% <ø> (-1.11%) ⬇️
pkg/api/defaults-custom-cloud-profile.go 85.24% <ø> (-0.47%) ⬇️
pkg/api/mocks.go 100.00% <ø> (ø)
pkg/api/types.go 92.82% <ø> (-0.89%) ⬇️
pkg/api/vlabs/types.go 72.53% <ø> (-1.30%) ⬇️
pkg/engine/params.go 63.63% <ø> (-2.83%) ⬇️
pkg/engine/template_generator.go 67.59% <0.00%> (-13.88%) ⬇️
... and 12 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 3fa95be...248d010. Read the comment docs.

@mboersma
Copy link
Member Author

mboersma commented Nov 5, 2020

I think we might be exceeding the custom data size limit with the 1_20_docker_e2e config: CI fails there consistently in this PR.

Copy link
Member

@jackfrancis jackfrancis 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 Nov 13, 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 04f7ff8 into Azure:master Nov 14, 2020
@mboersma mboersma deleted the cruft-removal branch November 17, 2020 16:23
@mboersma mboersma mentioned this pull request Nov 20, 2020
8 tasks
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.

None yet

3 participants