Merge "Mount zookeeper log dir for contrail containers" into release/2019.2.0
diff --git a/kubernetes/files/kube-addons/contrail/contrail.yaml b/kubernetes/files/kube-addons/contrail/contrail.yaml
index 048221a..ee56429 100644
--- a/kubernetes/files/kube-addons/contrail/contrail.yaml
+++ b/kubernetes/files/kube-addons/contrail/contrail.yaml
@@ -1,5 +1,14 @@
{%- from "kubernetes/map.jinja" import common with context -%}
{%- from "kubernetes/map.jinja" import master with context -%}
+
+{%- if master.network.get('opencontrail',{}).get('version', 4.0) >= 4.1 %}
+ {%- set kafka_path = "/etc/kafka" %}
+ {%- set kafka_path_log = "/var/log/kafka" %}
+
+{%- else %}
+ {%- set kafka_path = "/usr/share/kafka/config" %}
+ {%- set kafka_path_log = "/usr/share/kafka/logs" %}
+{%- endif %}
---
apiVersion: apps/v1beta2
@@ -134,14 +143,14 @@
mountPath: /var/lib/zookeeper
- name: var-lib-zookeeper-myid
mountPath: /var/lib/zookeeper/myid
- - name: usr-share-kafka-config-server-properties
- mountPath: /usr/share/kafka/config/server.properties
- - name: usr-share-kafka-config-consumer-properties
- mountPath: /usr/share/kafka/config/consumer.properties
- - name: usr-share-kafka-config-zookeeper-properties
- mountPath: /usr/share/kafka/config/zookeeper.properties
- - name: usr-share-kafka-logs
- mountPath: /usr/share/kafka/logs
+ - name: kafka-config-server-properties
+ mountPath: {{ kafka_path }}/server.properties
+ - name: kafka-config-consumer-properties
+ mountPath: {{ kafka_path }}/consumer.properties
+ - name: kafka-config-zookeeper-properties
+ mountPath: {{ kafka_path }}/zookeeper.properties
+ - name: kafka-logs
+ mountPath: {{ kafka_path_log }}
- name: etc-zookeeper-conf-zoo-analytics-cfg
mountPath: /etc/zookeeper/conf/zoo.cfg
- name: etc-zookeeper-conf-log4j-properties
@@ -249,21 +258,21 @@
hostPath:
path: /var/lib/zookeeper/myid
type: File
- - name: usr-share-kafka-config-server-properties
+ - name: kafka-config-server-properties
hostPath:
- path: /usr/share/kafka/config/server.properties
+ path: {{ kafka_path }}/server.properties
type: File
- - name: usr-share-kafka-config-consumer-properties
+ - name: kafka-config-consumer-properties
hostPath:
- path: /usr/share/kafka/config/consumer.properties
+ path: {{ kafka_path }}/consumer.properties
type: File
- - name: usr-share-kafka-config-zookeeper-properties
+ - name: kafka-config-zookeeper-properties
hostPath:
- path: /usr/share/kafka/config/zookeeper.properties
+ path: {{ kafka_path }}/zookeeper.properties
type: File
- - name: usr-share-kafka-logs
+ - name: kafka-logs
hostPath:
- path: /usr/share/kafka/logs
+ path: {{ kafka_path_log }}
type: DirectoryOrCreate
- name: etc-zookeeper-conf-zoo-analytics-cfg
hostPath:
diff --git a/kubernetes/files/kube-addons/helm/helm-tiller-deploy.yml b/kubernetes/files/kube-addons/helm/helm-tiller-deploy.yml
index ef8df02..ffd159e 100644
--- a/kubernetes/files/kube-addons/helm/helm-tiller-deploy.yml
+++ b/kubernetes/files/kube-addons/helm/helm-tiller-deploy.yml
@@ -3,7 +3,6 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
- annotations:
labels:
app: helm
name: tiller
@@ -12,10 +11,7 @@
namespace: kube-system
spec:
replicas: 1
- selector:
- matchLabels:
- app: helm
- name: tiller
+ strategy: {}
template:
metadata:
labels:
@@ -27,14 +23,17 @@
{%- endif %}
spec:
{%- if 'RBAC' in master.auth.get('mode', "") %}
+ automountServiceAccountToken: true
serviceAccountName: tiller
{%- endif %}
- tolerations:
- - key: node-role.kubernetes.io/master
- effect: NoSchedule
containers:
- image: {{ common.addons.helm.tiller_image }}
imagePullPolicy: IfNotPresent
+ env:
+ - name: TILLER_NAMESPACE
+ value: kube-system
+ - name: TILLER_HISTORY_MAX
+ value: "0"
resources:
requests:
memory: "128Mi"
@@ -57,6 +56,9 @@
- containerPort: 44134
name: tiller
protocol: TCP
+ - containerPort: 44135
+ name: http
+ protocol: TCP
readinessProbe:
failureThreshold: 3
httpGet:
@@ -68,7 +70,6 @@
successThreshold: 1
timeoutSeconds: 1
resources: {}
- terminationMessagePath: /dev/termination-log
dnsPolicy: ClusterFirst
restartPolicy: Always
securityContext: {}