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

remove docker dependency from hyperkube extract #3296

Merged
merged 2 commits into from
Jun 18, 2018

Conversation

jessfraz
Copy link
Contributor

doing this in parts til I find the dns issue in #2973

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
@ghost ghost assigned jessfraz Jun 18, 2018
@ghost ghost added the in progress label Jun 18, 2018
@jessfraz
Copy link
Contributor Author

jessfraz commented Jun 18, 2018

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
@codecov
Copy link

codecov bot commented Jun 18, 2018

Codecov Report

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

@@           Coverage Diff           @@
##           master    #3296   +/-   ##
=======================================
  Coverage   52.87%   52.87%           
=======================================
  Files         104      104           
  Lines       15714    15714           
=======================================
  Hits         8308     8308           
  Misses       6671     6671           
  Partials      735      735

Copy link
Contributor

@CecileRobertMichon CecileRobertMichon 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 acs-bot added the lgtm label Jun 18, 2018
@acs-bot
Copy link

acs-bot commented Jun 18, 2018

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CecileRobertMichon, jessfraz

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

@acs-bot acs-bot merged commit 2b88659 into Azure:master Jun 18, 2018
@ghost ghost removed the in progress label Jun 18, 2018
@jessfraz jessfraz deleted the remove-hyperkube-extract branch June 18, 2018 22:00
@jessfraz
Copy link
Contributor Author

thanks @CecileRobertMichon

PaulCharlton added a commit to ElementAnalytics/acs-engine that referenced this pull request Jun 20, 2018
* 'master' of https://github.com/Azure/acs-engine: (44 commits)
  remove duplicate ebtables (Azure#3308)
  Kubernetes: Remove Windows-specific foo for control plane config (Azure#3240)
  add k8s 1.8.14 (Azure#3303)
  run /usr/lib/apt/apt.systemd.daily in background (Azure#3304)
  add annotation to secrets field (Azure#3292)
  fix(oms): pull oms directly from docker (Azure#3294)
  ensure params vals are bool, with test (Azure#3285)
  udpate to latest 16.04 LTS image (Azure#3286)
  Enable openshift e2e tests on centos (Azure#2910)
  remove docker dependency from hyperkube extract (Azure#3296)
  remove pathological test (Azure#3291)
  Refactor validateDNSPrefix function in one place (Azure#3276)
  remove unnecessary nil check (Azure#3290)
  Fixing panic issue in Validate when properties are nil (Azure#3242)
  Updating the omsagent yaml file to include new changes for node zero dependency (Azure#3277)
  revert Azure CNI to 1.0.4 (Azure#3289)
  Add e2e test for openshift vnet (Azure#3274)
  Support upgrading a Kubernetes cluster that contains Virtual Machine Scale Sets (Azure#3223)
  Set extension for custom DNS (Azure#3264)
  don't exit CSE on apt.systemd.daily error (Azure#3278)
  ...
@karataliu
Copy link
Contributor

karataliu commented Jul 24, 2018

Why removing condition 'if [[ "$CONTAINER_RUNTIME" == "clear-containers" ]] || [[ "$CONTAINER_RUNTIME" == "containerd" ]]; from 'installContainerd'?

If user is using another runtime, is it supposed to download containerd binary?

@karataliu
Copy link
Contributor

Seems 'img pull' has some dependency on it, shall we turn to 'docker pull' if runtime is set to docker?

@jessfraz
Copy link
Contributor Author

it has a dep on runc which docker does as well so its relative, there is no point in having a different command that is only tested under certain scenarios it would give more likely hood for failure

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.

4 participants