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

chore: Use prod repos for containerd. #3107

Merged
merged 1 commit into from Apr 22, 2020

Conversation

cpuguy83
Copy link
Member

@cpuguy83 cpuguy83 commented Apr 20, 2020

Reason for Change:

containerd was moved to our prod repos, so let's use that.

Issue Fixed:

Requirements:

Notes:

@codecov
Copy link

codecov bot commented Apr 20, 2020

Codecov Report

Merging #3107 into master will decrease coverage by 0.14%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3107      +/-   ##
==========================================
- Coverage   71.05%   70.90%   -0.15%     
==========================================
  Files         147      147              
  Lines       25671    25509     -162     
==========================================
- Hits        18241    18088     -153     
+ Misses       6294     6291       -3     
+ Partials     1136     1130       -6     
Impacted Files Coverage Δ
pkg/engine/templates_generated.go 37.46% <ø> (-0.30%) ⬇️
pkg/api/common/const.go 0.00% <0.00%> (-40.00%) ⬇️
pkg/api/common/helper.go 74.77% <0.00%> (-0.84%) ⬇️
pkg/api/types.go 94.02% <0.00%> (-0.44%) ⬇️
pkg/api/vlabs/validate.go 79.16% <0.00%> (-0.12%) ⬇️
pkg/api/defaults-custom-cloud-profile.go 85.71% <0.00%> (-0.12%) ⬇️
pkg/api/addons.go 97.73% <0.00%> (-0.11%) ⬇️
pkg/api/converterfromapi.go 93.88% <0.00%> (-0.07%) ⬇️
pkg/api/defaults.go 92.41% <0.00%> (-0.04%) ⬇️
... and 5 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 b74f691...d8521af. Read the comment docs.

@mboersma
Copy link
Member

mboersma commented Apr 21, 2020

I was just trying these commands to see the diff and found some oddity. We should make double-sure this works for 18.04:

 % curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list
deb [arch=amd64] https://packages.microsoft.com/ubuntu/16.04/prod xenial main
% curl https://packages.microsoft.com/config/ubuntu/18.04/prod.list
deb [arch=amd64] https://packages.microsoft.com/ubuntu/18.04/prod bionic main%  
% # Is the trailing "%" char ok when it ends up at /etc/apt/sources.list.d/microsoft-prod.list?

Edit: Nevermind, tested in a container and it's just a lack of EOF, works fine.

mboersma
mboersma previously approved these changes Apr 21, 2020
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

Pending a successful e2e run, of course.

@jackfrancis
Copy link
Member

Error from deployment for kubernetes-southeastasia-53976 in resource group kubernetes-southeastasia-53976:exit status 1
 2020/04/21 18:41:18 Command Output: ERROR: Deployment failed. Correlation ID: a7b0c5c5-5b16-44b3-bc55-15b476434882. {
   "status": "Failed",
   "error": {
     "code": "ResourceDeploymentFailure",
     "message": "The resource operation completed with terminal provisioning state 'Failed'.",
     "details": [
       {
         "code": "VMExtensionProvisioningError",
         "message": "VM has reported a failure when processing extension 'cse-master-0'. Error message: \"Enable failed: failed to execute command: command terminated with exit status=27\n[stdout]\nTue Apr 21 18:33:46 UTC 2020,k8s-master-31250611-0\n\n[stderr]\n\"\r\n\r\nMore information on troubleshooting is available at https://aka.ms/VMExtensionCSELinuxTroubleshoot "
       }
     ]
   }
 }

@jackfrancis
Copy link
Member

/hold

@cpuguy83
Copy link
Member Author

Argh, issue is because prod repo didn't have containerd 1.3.2 (only 1.3.3).
I've gone ahead and pushed that version to the repo now.

containerd was moved to our prod repos, so let's use that.
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

@jackfrancis jackfrancis merged commit 30b74f5 into Azure:master Apr 22, 2020
@cpuguy83 cpuguy83 deleted the use_prod_containerd branch April 22, 2020 19:35
@cpuguy83
Copy link
Member Author

@jackfrancis It seems CI had some issues and couldn't run. Did you run this locally?

@jackfrancis
Copy link
Member

Yes, I ran several jenkins jobs against the branch using a containerd cluster config

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.

None yet

3 participants