Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AWS Debian Jessie Support #21237

Merged
merged 6 commits into from
Feb 24, 2016
Merged

AWS Debian Jessie Support #21237

merged 6 commits into from
Feb 24, 2016

Conversation

justinsb
Copy link
Member

Fixes the bootstrap script & Salt scripts to add support for Debian Jessie:

  • Don't try to install the linux-image-extra package, not available on Debian, and only needed as a workaround for an Ubuntu problem with aufs
  • Add a block to the Salt script for installation of Docker, to recognize Debian Jessie and install the correct package (they are packaged per-distro)

@justinsb justinsb added this to the v1.2 milestone Feb 15, 2016
@justinsb
Copy link
Member Author

These are the common pieces of Debian support, whether we choose to make Wily or Debian the default, and whether we choose to do an AMI or not.

@k8s-github-robot k8s-github-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 15, 2016
@k8s-github-robot
Copy link

Labelling this PR as size/S

@k8s-bot
Copy link

k8s-bot commented Feb 15, 2016

GCE e2e test build/test passed for commit e81c4b0c7f818f2f1b517b6180c0b032056630a3.

@brendandburns
Copy link
Contributor

@justinsb is this a dup? There are similar salt changes elsewhere...

@justinsb
Copy link
Member Author

I don't think it's a dup (?). Nothing merged anyway; we do have similar changes for other distros because the Docker install is per-distro. But it is perfectly possible this overlaps with someone else's PR or even one of my own - is there one in particular you're thinking of?

@justinsb
Copy link
Member Author

@k8s-bot unit test this github flake #21188

@k8s-github-robot
Copy link

PR needs rebase

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 19, 2016
@brendandburns brendandburns added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 19, 2016
@brendandburns
Copy link
Contributor

LGTM, but needs rebase.

@k8s-github-robot
Copy link

PR changed after LGTM, removing LGTM.

@k8s-github-robot k8s-github-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Feb 20, 2016
@k8s-bot
Copy link

k8s-bot commented Feb 20, 2016

GCE e2e build/test failed for commit 46afc672fca985a942115f2e5c0a90b41a2518c4.

@justinsb
Copy link
Member Author

@k8s-bot test this github flake #21491

@justinsb
Copy link
Member Author

@brendandburns apparently we're moving to Docker 1.9.1 for 1.2, so I have to bump each of the Docker versions. This one needed a rebase anyway, so I did it first...

@k8s-bot
Copy link

k8s-bot commented Feb 20, 2016

GCE e2e test build/test passed for commit 46afc672fca985a942115f2e5c0a90b41a2518c4.

@justinsb justinsb added the priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. label Feb 20, 2016
@brendandburns brendandburns added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 22, 2016
@k8s-github-robot
Copy link

@k8s-bot test this

Tests are more than 48 hours old. Re-running tests.

@k8s-bot
Copy link

k8s-bot commented Feb 22, 2016

GCE e2e test build/test passed for commit 46afc672fca985a942115f2e5c0a90b41a2518c4.

@k8s-github-robot
Copy link

PR needs rebase

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 23, 2016
@justinsb
AWS Debian: Only install linux-image-extra on Ubuntu
91eb370 
It isn't available (and hopefully not needed) on Debian
@k8s-github-robot
Copy link

PR changed after LGTM, removing LGTM.

@k8s-github-robot k8s-github-robot removed lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Feb 23, 2016
@k8s-github-robot
Copy link

Labelling this PR as size/M

@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Feb 23, 2016
@k8s-bot
Copy link

k8s-bot commented Feb 23, 2016

GCE e2e test build/test passed for commit 0234c3bbc171c1831c42f00610f6107d2618c39a.

@justinsb
AWS Jessie: Find image by name
aa57beb 
This means we don't have to code the AMI ids for each region.
@k8s-bot
Copy link

k8s-bot commented Feb 23, 2016

GCE e2e test build/test passed for commit aa57beb.

@justinsb
AWS Jessie image: preinstall docker 1.9.1
41e2a4b 
Given the problems with docker's installation, we should be baking it
into the image.
@justinsb
AWS kube-up: Bump to the latest Jessie image, allow overriding
7f3bbe1 
Jessie image can be selected by name using AWS_IMAGE_NAME. This is a
little easier than specifying the AMI ID.
@justinsb
AWS kube-up: Stop docker before moving /mnt/docker
5d7ed4d 
On Jessie, we now preinstall Docker.  Before moving /mnt/docker, make
sure we stop the docker service.
@k8s-bot
Copy link

k8s-bot commented Feb 24, 2016

GCE e2e test build/test passed for commit 5d7ed4d.

@justinsb
Copy link
Member Author

@brendandburns can we get this merged? If we go back to docker 1.8 then I'll just rewind them all

@brendandburns brendandburns added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 24, 2016
@brendandburns
Copy link
Contributor

@a-robinson build cop for the day...

@a-robinson
Copy link
Contributor

submit-queue is struggling today, merging manually

a-robinson added a commit that referenced this pull request Feb 24, 2016
@a-robinson
Merge pull request #21237 from justinsb/aws_jessie_support
cbcc258 
AWS Debian Jessie Support
@a-robinson a-robinson merged commit cbcc258 into kubernetes:master Feb 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@brendandburns brendandburns

Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.2
Development

Successfully merging this pull request may close these issues.
7 participants
@justinsb @k8s-github-robot @k8s-bot @brendandburns @a-robinson @k8s-teamcity-mesosphere @googlebot