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.

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

Add the Juju charms to Kubernetes #7195

Merged
merged 35 commits into from
Apr 30, 2015
Merged

Conversation

mbruzek
Copy link
Contributor

@mbruzek mbruzek commented Apr 22, 2015

This is a follow up to the original Juju pull request:
#5414

In accordance with @erictune's suggestion we are adding the charms and a bundle to keep in better sync with the kubernetes project.

cluster/kube-up.sh will deploy the local charms and the bundle from the kubernetes repository and stand up a cluster.

We have done a lot of work to update the cluster/juju/util.sh to the v0.15.0 release that changed the API and a lot of changes:

  • Added the Juju charms to cluster/juju/charms directory.
  • Added a Juju bundle to cluster/juju/bundles directory.
  • Changing cluster/juju/util.sh script uses the bundle to deploy the charms from the kubernetes repository.
  • Updated the charms and bundle to work with v0.15.0 changes.
  • Updated the charms to use v1beta3 which is default in v0.15.0.

We are still seeing some issues with the validate-cluster.sh script ('Error: no resource "cs" has been defined') but I don't think that is related to our changes in this pull request. Manual testing shows that we can create objects in the kubernetes cluster.

Matt Bruzek and others added 30 commits April 17, 2015 17:20
Implemented a feature of kube-down
Corrected a bug on bootstrap of Juju environment.
Change cadvisor port and point kubelet to find it
 - use absolute path for kube_root (fixes JUJU_REPOSITORY directory creation issue) - shortcircuit status polling (for rerunning kubeup)
 - more granular polling iterations
Script and bundle tweaks
- Formatted for consistency
- Used different variables for juju directory
…harms

Resolved conflicts in:
	cluster/juju/util.sh
@googlebot
Copy link

We found a Contributor License Agreement for you (the sender of this pull request) and all commit authors, but as best as we can tell these commits were authored by someone else. If that's the case, please add them to this pull request and have them confirm that they're okay with these commits being contributed to Google. If we're mistaken and you did author these commits, just reply here to confirm.

@erictune
Copy link
Member

@whitmo needs to state on this PR that he intended for his commits to be on this PR, otherwise, our CLA robot is confused.

@whitmo
Copy link

whitmo commented Apr 27, 2015

@erictune Is stating here good enough? I also filled in the personal CLA from my user account (and will make sure further commits come from my canonical address).

@erictune
Copy link
Member

LGTM. I don't know why CLAbot is not happy, but seems like this PR is covered.

@erictune
Copy link
Member

automated build says it doesn't like your boilerplate.

$ ./hack/verify-boilerplate.sh
Boilerplate header is wrong for: cluster/juju/charms/trusty/kubernetes-master/files/create_kubernetes_tar.sh
Boilerplate header is wrong for: cluster/juju/charms/trusty/kubernetes-master/scripts/guestbook.sh
Boilerplate header is wrong for: cluster/juju/charms/trusty/kubernetes/files/create_kubernetes_tar.sh
The command "./hack/verify-boilerplate.sh" failed and exited with 1 during .

I think all the shell scripts need to have Google copyright at the top.

@mbruzek
Copy link
Contributor Author

mbruzek commented Apr 30, 2015

@erictune Sorry about that, those were scripts we no longer use so I removed them.

erictune added a commit that referenced this pull request Apr 30, 2015
Add the Juju charms to Kubernetes
@erictune erictune merged commit dddf414 into kubernetes:master Apr 30, 2015
@erictune
Copy link
Member

thanks for the contribution and for your patience!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants