Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

fix(tiller): allow tiller resources to be edited by users #1319

Merged
merged 1 commit into from
Aug 23, 2017
Merged

fix(tiller): allow tiller resources to be edited by users #1319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions parts/kubernetesmasteraddons-tiller-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ metadata:
namespace: kube-system
labels:
kubernetes.io/cluster-service: "true"
Copy link
Member

Choose a reason for hiding this comment

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

Don't we want to remove this deprecated label?

Copy link
Member

Choose a reason for hiding this comment

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

@lachie83 do you approve of retaining the kubernetes.io/cluster-service: "true" label with the introduction of addonmanager.kubernetes.io/mode=EnsureExists?

Copy link
Contributor Author

@seanknox seanknox Aug 23, 2017 •
edited
Loading

Choose a reason for hiding this comment

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

@jackfrancis @lachie83 If they're both present, addonmanager.kubernetes.io/mode=EnsureExists will take precedence. If only kubernetes.io/cluster-service: "true" is present then addon-manager will treat it as addonmanager.kubernetes.io/mode=Reconcile.

Lachie suggested removing the deprecation in another PR which is OK by me. That said, I think it's a lot clearer to remove the deprecated label and use the actual, used value for new clusters.

addonmanager.kubernetes.io/mode: "EnsureExists"
---
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRoleBinding
metadata:
name: tiller
labels:
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: "EnsureExists"
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: ClusterRole
Expand All @@ -28,6 +30,7 @@ metadata:
app: helm
name: tiller
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: "EnsureExists"
name: tiller-deploy
namespace: kube-system
spec:
Expand All @@ -47,6 +50,7 @@ metadata:
app: helm
name: tiller
kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: "EnsureExists"
name: tiller-deploy
namespace: kube-system
spec:
Expand Down