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 addon manager and dashboard to the iso. #128

Merged
merged 2 commits into from
May 29, 2016

Conversation

dlorenc
Copy link
Contributor

@dlorenc dlorenc commented May 28, 2016

No description provided.

@dlorenc dlorenc force-pushed the addons branch 3 times, most recently from e35cf39 to 612c0c4 Compare May 28, 2016 18:26
@dlorenc
Copy link
Contributor Author

dlorenc commented May 28, 2016

Output with this running:
$ kubectl get pods --all-namespaces
NAMESPACE NAME READY STATUS RESTARTS AGE
kube-system kube-addon-manager-127.0.0.1 1/1 Running 0 30s
kube-system kubernetes-dashboard-txpah 1/1 Running 0 7s

@dlorenc
Copy link
Contributor Author

dlorenc commented May 28, 2016

I'll cut the release after this goes in.

@@ -0,0 +1,23 @@
apiVersion: v1
Copy link
Member

Choose a reason for hiding this comment

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

This file is already present in deploy/static-pods/addon-manager, please copy that one to avoid duplication

Copy link
Member

Choose a reason for hiding this comment

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

Ah, didn't notice the volume mounting difference between the two.
Then you may move this to deploy/iso/addon-manager.yaml or deploy/iso/static-pods/addon-manager.yaml

Also, please move deploy/static-pods/addon-manager.yaml to deploy/docker/static-pods/addon-manager.yaml

@dlorenc
Copy link
Contributor Author

dlorenc commented May 29, 2016

Moved the files as requested.

hostNetwork: true
containers:
- name: kube-addon-manager
image: gcr.io/google-containers/kube-addon-manager:v1
Copy link
Member

Choose a reason for hiding this comment

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

It should be gcr.io/google-containers/kube-addon-manager-amd64:v2
(I made the image with some bugfixes, e.g. allow daemonsets and a kubectl deprecation bugfix...)

@dlorenc
Copy link
Contributor Author

dlorenc commented May 29, 2016

Changed the image name.

@luxas
Copy link
Member

luxas commented May 29, 2016

LGTM

@luxas luxas merged commit 38a7e05 into kubernetes:master May 29, 2016
@dlorenc dlorenc deleted the addons branch June 1, 2016 01:25
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.

3 participants