Code Review
/
ta
/
caas-helm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Kubernetes 1.16.0 api reference change
[ta/caas-helm.git]
/
ansible
/
roles
/
helm
/
templates
/
tiller.yml
diff --git
a/ansible/roles/helm/templates/tiller.yml
b/ansible/roles/helm/templates/tiller.yml
index
e5641ff
..
3f914c9
100644
(file)
--- a/
ansible/roles/helm/templates/tiller.yml
+++ b/
ansible/roles/helm/templates/tiller.yml
@@
-14,7
+14,7
@@
See the License for the specific language governing permissions and
limitations under the License.
#}
---
limitations under the License.
#}
---
-apiVersion: apps/v1
beta2
+apiVersion: apps/v1
kind: Deployment
metadata:
name: tiller
kind: Deployment
metadata:
name: tiller
@@
-26,16
+26,10
@@
spec:
{{ caas.kubernetes_component_label }}: tiller
template:
metadata:
{{ caas.kubernetes_component_label }}: tiller
template:
metadata:
- annotations:
- danm.k8s.io/interfaces: |
- [
- {
- "network":"flannel"
- }
- ]
labels:
{{ caas.kubernetes_component_label }}: tiller
spec:
labels:
{{ caas.kubernetes_component_label }}: tiller
spec:
+ priorityClassName: "system-cluster-critical"
dnsPolicy: ClusterFirst
nodeSelector:
nodename: caas_master1
dnsPolicy: ClusterFirst
nodeSelector:
nodename: caas_master1
@@
-49,6
+43,9
@@
spec:
value: "{{ caas.internal_flannel_interface }}"
- name: TILLER_PORT
value: "{{ caas.tiller_port }}"
value: "{{ caas.internal_flannel_interface }}"
- name: TILLER_PORT
value: "{{ caas.tiller_port }}"
+ resources:
+ requests:
+ cpu: "10m"
volumeMounts:
- name: time-mount
mountPath: /etc/localtime
volumeMounts:
- name: time-mount
mountPath: /etc/localtime