Skip to content

Commit

Permalink
Merge pull request kubernetes#40108 from MrHohn/addon-ensure-exist
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue

Supports 'ensure exist' class addon in Addon-manager

Fixes kubernetes#39561, fixes kubernetes#37047 and fixes kubernetes#36411. Depends on kubernetes#40057.

This PR splits cluster addons into two categories:
- Reconcile: Addons that need to be reconciled (`kube-dns` for instance).
- EnsureExists: Addons that need to be exist but changeable (`default-storage-class`).

The behavior for the 'EnsureExists' class addon would be:
- Create it if not exist.
- Users could do any modification they want, addon-manager will not reconcile it.
- If it is deleted, addon-manager will recreate it with the given template.
- It will not be updated/clobbered during upgrade.

As Brian pointed out in [kubernetes#37048/comment](kubernetes#37048 (comment)), this may not be the best solution for addon-manager. Though kubernetes#39561 needs to be fixed in 1.6 and we might not have enough bandwidth to do a big surgery.

@mikedanese @thockin 

cc @kubernetes/sig-cluster-lifecycle-misc 

---

Tasks for this PR:
- [x] Supports 'ensure exist' class addon and switch to use new labels in addon-manager.
- [x] Updates READMEs regarding the new behavior of addon-manager.
- [x] Updated `test/e2e/addon_update.go` to match the new behavior.
- [x] Go through all current addons and apply the new labels on them regarding what they need.
- [x] Bump addon-manager and update its template files.
  • Loading branch information
Kubernetes Submit Queue authored Feb 25, 2017
2 parents 21b046d + 5faa43b commit 7517541
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions cluster/addons/storage-class/openstack/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ metadata:
storageclass.beta.kubernetes.io/is-default-class: "true"
labels:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: EnsureExists
provisioner: kubernetes.io/cinder

0 comments on commit 7517541

Please sign in to comment.