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 kube-dns support to docker-compose #39

Closed
wants to merge 15 commits into from

Conversation

sttts
Copy link

@sttts sttts commented Jun 19, 2015

Following the ubuntu cluster provider this patch adds a deployAddons.sh file.
It seems it's not called right now on cluster up.

Karl Isenberg and others added 12 commits June 16, 2015 17:54
- Avoid breaking stdout captures
- Kubernetes on Mesos will not have any kublets running until pods or services have been created
- Added readme for mesos/docker
- Added docker-compose script
- Add default test-e2e function to cluster/kube-util.sh
- Add overridde test-e2e function to cluster/mesos/docker/util.sh
  to run in a docker container (with access to cluster IPs)
@sttts sttts force-pushed the docker-compose-dns branch from 7f10a4d to 569dbef Compare June 19, 2015 09:41
Following the ubuntu cluster provider this patch add a deployAddons.sh file.
It seems it's not called right now on cluster up.
@sttts sttts force-pushed the docker-compose-dns branch from 569dbef to f48d3ce Compare June 19, 2015 09:46
@sttts sttts force-pushed the docker-compose-dns branch from 60212c6 to ffbad05 Compare June 19, 2015 12:34
@sttts
Copy link
Author

sttts commented Jun 19, 2015

/cc @karlkfi

sed -e "s/{{ pillar\['dns_server'\] }}/${DNS_SERVER_IP}/g" $KUBE_ROOT/cluster/addons/dns/skydns-svc.yaml.in > dns/skydns-svc.yaml

KUBECONFIG=$("${KUBE_ROOT}/cluster/kubectl.sh" config view | base64)
sed -e "s,KUBECONFIG,$KUBECONFIG," dns/skydns-secret.yaml.in > dns/skydns-secret.yaml
Copy link

Choose a reason for hiding this comment

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

Does this actually work? When I do a kubectl config view it redacts the secrets...

$ kubectl config view
apiVersion: v1
clusters:
- cluster:
    server: http://172.17.0.60:8888
  name: mesos/docker
- cluster:
    certificate-authority-data: REDACTED
    server: https://10.245.1.2
  name: vagrant
contexts:
- context:
    cluster: mesos/docker
    user: mesos/docker
  name: mesos/docker
- context:
    cluster: vagrant
    user: vagrant
  name: vagrant
current-context: mesos/docker
kind: Config
preferences: {}
users:
- name: vagrant
  user:
    client-certificate-data: REDACTED
    client-key-data: REDACTED
    password: vagrant
    username: vagrant

Copy link

Choose a reason for hiding this comment

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

needs --raw: kubernetes#7007

Copy link
Author

@sttts sttts Jun 20, 2015 via email

Choose a reason for hiding this comment

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

@karlkfi
Copy link

karlkfi commented Jun 24, 2015

This PR ok to nuke?

@sttts sttts closed this Jun 24, 2015
@sttts sttts deleted the docker-compose-dns branch June 24, 2015 20:06
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.

2 participants