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

feat: configurable microsoft apt repository #3698

Merged
merged 1 commit into from Aug 14, 2020

Conversation

jackfrancis
Copy link
Member

Reason for Change:

This PR enables configurable override of the default packages.microsoft.com apt repository for sourcing Ubuntu 16.04-LTS and Ubuntu 18.04-LTS packages.

Issue Fixed:

Fixes #3677

Requirements:

Notes:

@acs-bot acs-bot added the size/L label Aug 13, 2020
@jackfrancis
Copy link
Member Author

@DavidParks8 FYI

@codecov
Copy link

codecov bot commented Aug 13, 2020

Codecov Report

Merging #3698 into master will increase coverage by 0.00%.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3698   +/-   ##
=======================================
  Coverage   73.15%   73.16%           
=======================================
  Files         147      147           
  Lines       25309    25315    +6     
=======================================
+ Hits        18516    18522    +6     
  Misses       5655     5655           
  Partials     1138     1138           
Impacted Files Coverage Δ
pkg/api/vlabs/types.go 71.83% <ø> (ø)
pkg/engine/templates_generated.go 53.42% <ø> (ø)
pkg/api/converterfromapi.go 94.18% <100.00%> (+<0.01%) ⬆️
pkg/api/convertertoapi.go 93.69% <100.00%> (+<0.01%) ⬆️
pkg/api/defaults.go 92.85% <100.00%> (+0.02%) ⬆️
pkg/api/mocks.go 100.00% <100.00%> (ø)
pkg/api/types.go 94.32% <100.00%> (+<0.01%) ⬆️

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 fe19610...d9e6765. Read the comment docs.

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

Just a trivial wording change in tests, feel free to ignore.

properties.MasterProfile.Count = 1
mockCS.setOrchestratorDefaults(false, false)
if properties.OrchestratorProfile.KubernetesConfig.MicrosoftAptRepositoryURL != DefaultMicrosoftAptRepositoryURL {
t.Fatalf("MicrosoftAptRepositoryURL did not have the expected size, got %s, expected %s",
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
t.Fatalf("MicrosoftAptRepositoryURL did not have the expected size, got %s, expected %s",
t.Fatalf("MicrosoftAptRepositoryURL did not have the expected contents, got %s, expected %s",

properties.OrchestratorProfile.KubernetesConfig.MicrosoftAptRepositoryURL = "custom.packages.com"
mockCS.setOrchestratorDefaults(false, false)
if properties.OrchestratorProfile.KubernetesConfig.MicrosoftAptRepositoryURL != "custom.packages.com" {
t.Fatalf("MicrosoftAptRepositoryURL did not have the expected size, got %s, expected custom.packages.com",
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
t.Fatalf("MicrosoftAptRepositoryURL did not have the expected size, got %s, expected custom.packages.com",
t.Fatalf("MicrosoftAptRepositoryURL did not have the expected contents, got %s, expected custom.packages.com",

@@ -89,7 +89,8 @@
"loadBalancerOutboundIPs": 2,
"apiServerConfig": {
"--anonymous-auth": "true"
}
},
"microsoftAptRepositoryURL": "https://packages.microsoft.com"
Copy link
Member

Choose a reason for hiding this comment

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

Are you being explicit about the default here for documentation reasons?

@acs-bot
Copy link

acs-bot commented Aug 14, 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 7b13847 into Azure:master Aug 14, 2020
@jackfrancis jackfrancis deleted the custom-ms-apt branch August 14, 2020 18:23
penggu pushed a commit to penggu/aks-engine that referenced this pull request Oct 28, 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.

configurable packages.microsoft.com apt repository
3 participants