Skip to content
This repository has been archived by the owner on Apr 17, 2019. It is now read-only.

kubernetes-addons: cluster/saltbase/salt/kube-addons changed to cluster/addons/addon-manager #927

Conversation

ingvagabund
Copy link
Contributor

cluster/saltbase/salt/kube-addons/namespace.yaml -> cluster/addons/addon-manager/namespace.yaml

@ingvagabund
Copy link
Contributor Author

Caused by kubernetes/kubernetes#23600

@ingvagabund ingvagabund force-pushed the fix-kubernetes-addons-namespace-yaml-localtion branch from d9b4426 to e1dadec Compare May 9, 2016 06:26
@ingvagabund ingvagabund changed the title kubernetes-addons: namespace.yaml file changes its location WIP: kubernetes-addons: namespace.yaml file and other changed their location May 9, 2016
@ingvagabund
Copy link
Contributor Author

Entire directory has changed: cluster/saltbase/salt/kube-addons -> cluster/addons/addon-manager

@ingvagabund ingvagabund changed the title WIP: kubernetes-addons: namespace.yaml file and other changed their location WIP: kubernetes-addons: cluster/saltbase/salt/kube-addons changed to cluster/addons/addon-manager May 9, 2016
cluster/saltbase/salt/kube-addons/namespace.yaml -> cluster/addons/addon-manager/namespace.yaml
@ingvagabund ingvagabund force-pushed the fix-kubernetes-addons-namespace-yaml-localtion branch from e1dadec to de841e9 Compare May 9, 2016 07:02
@gitschaub
Copy link
Contributor

+1, this works for me thanks for the patch

@eparis
Copy link
Contributor

eparis commented May 9, 2016

@ingvagabund let me know when you do not think this is a WIP

@ingvagabund ingvagabund changed the title WIP: kubernetes-addons: cluster/saltbase/salt/kube-addons changed to cluster/addons/addon-manager kubernetes-addons: cluster/saltbase/salt/kube-addons changed to cluster/addons/addon-manager May 9, 2016
@ingvagabund
Copy link
Contributor Author

@eparis right now

@eparis eparis merged commit 1439a11 into kubernetes-retired:master May 9, 2016
@@ -13,7 +13,7 @@

- name: Make sure the system services namespace exists
get_url:
url=https://raw.githubusercontent.com/GoogleCloudPlatform/kubernetes/master/cluster/saltbase/salt/kube-addons/namespace.yaml
url=https://raw.githubusercontent.com/kubernetes/kubernetes/master/{{ kube_addons_download_source_dir }}/namespace.yaml
dest="{{ kube_config_dir }}/addons/"
Copy link
Contributor

Choose a reason for hiding this comment

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

dest is hard coding to /opt/namespace.yaml in kube-addons.sh, it need to adjust accordingly.

https://github.com/kubernetes/kubernetes/blob/master/cluster/addons/addon-manager/kube-addons.sh#L68

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mikedanese , WDYT? Maybe kube-addons.sh.j2 and replace the /opt/namespace.yaml with {{ kube-addons-namespace-location }}/namespace.yaml or similar buzzword?

Copy link
Contributor

Choose a reason for hiding this comment

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

Why can't you just run addon manager in a static pod? that file exists inside gcr.io/google-containers/kube-addon-manager

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I have no idea. Maybe, it is "just" a coincidence and the /opt/namespace.yaml path is correct.

stephenrlouie pushed a commit to stephenrlouie/contrib that referenced this pull request May 13, 2016
…es-retired#927)

cluster/saltbase/salt/kube-addons/namespace.yaml -> cluster/addons/addon-manager/namespace.yaml
@ingvagabund ingvagabund deleted the fix-kubernetes-addons-namespace-yaml-localtion branch August 22, 2016 08:52
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.

6 participants