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

fix: use ctr to remove containerd containers #3144

Merged
merged 1 commit into from
May 21, 2020
Merged

fix: use ctr to remove containerd containers #3144

merged 1 commit into from
May 21, 2020

Conversation

ksubrmnn
Copy link
Contributor

Reason for Change:

Clean up containerd containers on restart so that Kubelet can correctly deploy new containers

Issue Fixed:

Requirements:

Notes:
Waiting on test

@ksubrmnn ksubrmnn requested a review from marosset April 24, 2020 22:21
@codecov
Copy link

codecov bot commented Apr 24, 2020 •
edited

Codecov Report

Merging #3144 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #3144   +/-   ##
=======================================
  Coverage   72.01%   72.01%           
=======================================
  Files         147      147           
  Lines       25491    25491           
=======================================
  Hits        18357    18357           
  Misses       5995     5995           
  Partials     1139     1139
Impacted Files Coverage Δ
pkg/engine/templates_generated.go 43.53% <ø> (ø)

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 058b1dc...1b2d787. Read the comment docs.

jackfrancis
jackfrancis reviewed Apr 28, 2020
View reviewed changes
test/e2e/kubernetes/kubernetes_test.go Outdated
@@ -154,6 +156,16 @@ var _ = BeforeSuite(func() {
dnsAddonName = common.CoreDNSAddonName
}
Expect(dnsAddonName).NotTo(Equal(""))

var client *armhelpers.AzureClient
env, err := azure.EnvironmentFromName("AzurePublicCloud") // TODO get this programmatically
Copy link
Member

Choose a reason for hiding this comment

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

@jadarsie remind me, are you using this test runner in Azure stack? If so we might want to skip this new foo in Azure Stack contexts

@acs-bot acs-bot added size/L and removed size/M labels Apr 29, 2020
@ksubrmnn ksubrmnn force-pushed the reset branch 9 times, most recently from 48d49b2 to 7b4ba64 Compare May 5, 2020 20:35
@ksubrmnn ksubrmnn changed the title WIP fix: use ctr to remove containerd containers fix: use ctr to remove containerd containers May 5, 2020
jackfrancis
jackfrancis previously approved these changes May 5, 2020
View reviewed changes
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

marosset
marosset reviewed May 5, 2020
View reviewed changes
test/e2e/runner.go Outdated Show resolved Hide resolved
@mboersma mboersma added this to In progress in backlog via automation May 6, 2020
marosset
marosset reviewed May 12, 2020
View reviewed changes
test/e2e/config/config.go Outdated Show resolved Hide resolved
marosset
marosset approved these changes May 21, 2020
View reviewed changes
Copy link
Contributor

@marosset marosset left a comment

Choose a reason for hiding this comment

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

/lgtm

backlog automation moved this from In progress to Review in progress May 21, 2020
@acs-bot acs-bot added the lgtm label May 21, 2020
@acs-bot
Copy link

acs-bot commented May 21, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ksubrmnn, marosset

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ksubrmnn ksubrmnn merged commit 369f5c7 into Azure:master May 21, 2020
backlog automation moved this from Review in progress to Done May 21, 2020
@jadarsie jadarsie mentioned this pull request May 29, 2020
Merged
4 tasks
@fmotrifork fmotrifork mentioned this pull request Jun 8, 2020
Merged
penggu pushed a commit to penggu/aks-engine that referenced this pull request Oct 28, 2020
@ksubrmnn @penggu
fix: use ctr to remove containerd containers (Azure#3144)
69336fc
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@marosset marosset marosset approved these changes

@jackfrancis jackfrancis jackfrancis left review comments

Assignees

@marosset marosset

Labels
approved lgtm size/L windows
Projects
No open projects
backlog
  
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@ksubrmnn @acs-bot @jackfrancis @marosset @mboersma