Improve compatibility with Openshift (#1424)

This commit is contained in:
Ta-Ching Chen
2019-11-21 16:56:53 +08:00
committed by GitHub
parent af10579be9
commit 04654ca465
4 changed files with 23 additions and 4 deletions
@@ -534,10 +534,8 @@ spec:
] ]
ports: ports:
- containerPort: 4222 - containerPort: 4222
hostPort: 4222
protocol: TCP protocol: TCP
- containerPort: 4223 - containerPort: 4223
hostPort: 4223
protocol: TCP protocol: TCP
readinessProbe: readinessProbe:
httpGet: httpGet:
@@ -45,6 +45,10 @@ spec:
- name: container-log - name: container-log
mountPath: /var/log/ mountPath: /var/log/
readOnly: false readOnly: false
{{- if .Values.logger.enableSecurityContext }}
securityContext:
privileged: true
{{- end }}
containers: containers:
- name: logger - name: logger
{{ if .Values.repository }} {{ if .Values.repository }}
@@ -68,6 +72,10 @@ spec:
- name: docker-log - name: docker-log
mountPath: /var/lib/docker/containers mountPath: /var/lib/docker/containers
readOnly: true readOnly: true
{{- if .Values.logger.enableSecurityContext }}
securityContext:
privileged: true
{{- end }}
- name: fluentbit - name: fluentbit
{{- if .Values.repository }} {{- if .Values.repository }}
image: "{{ .Values.logger.fluentdImageRepository }}/{{ .Values.logger.fluentdImage }}:{{ .Values.logger.fluentdImageTag }}" image: "{{ .Values.logger.fluentdImageRepository }}/{{ .Values.logger.fluentdImage }}:{{ .Values.logger.fluentdImageTag }}"
@@ -96,6 +104,10 @@ spec:
key: password key: password
- name: LOG_PATH - name: LOG_PATH
value: /var/log/fission/*.log value: /var/log/fission/*.log
{{- if .Values.logger.enableSecurityContext }}
securityContext:
privileged: true
{{- end }}
volumeMounts: volumeMounts:
- name: container-log - name: container-log
mountPath: /var/log/ mountPath: /var/log/
+7
View File
@@ -57,6 +57,13 @@ logger:
fluentdImageRepository: index.docker.io fluentdImageRepository: index.docker.io
fluentdImage: fluent/fluent-bit fluentdImage: fluent/fluent-bit
fluentdImageTag: 1.0.4 fluentdImageTag: 1.0.4
## Fluent-bit writes/reads it’s own sqlite database to record a history of tracked
## files and a state of offsets, this is very useful to resume a state if the ser-
## vice is restarted. For Kubernetes environment with constraints like OpenShift,
## the containers are limited to write hostPath volume. Hence, we have to enable
## security context and set privileged to true.
enableSecurityContext: false
## Router config ## Router config
router: router:
+4 -2
View File
@@ -198,8 +198,8 @@ build_charts() {
do do
# https://github.com/kubernetes/helm/issues/1732 # https://github.com/kubernetes/helm/issues/1732
helm init --client-only helm init --client-only
helm package -u $c/ helm package -u $c/
mv *.tgz $BUILDDIR/charts/ mv *.tgz $BUILDDIR/charts/
done done
popd popd
} }
@@ -226,6 +226,8 @@ build_yamls() {
helm template ${c} -n ${releaseName} --namespace fission --set analytics=false,analyticsNonHelmInstall=true,serviceType=NodePort,routerServiceType=NodePort > ${c}-${version}-minikube.yaml helm template ${c} -n ${releaseName} --namespace fission --set analytics=false,analyticsNonHelmInstall=true,serviceType=NodePort,routerServiceType=NodePort > ${c}-${version}-minikube.yaml
# for environments that support LoadBalancer # for environments that support LoadBalancer
helm template ${c} -n ${releaseName} --namespace fission --set analytics=false,analyticsNonHelmInstall=true > ${c}-${version}.yaml helm template ${c} -n ${releaseName} --namespace fission --set analytics=false,analyticsNonHelmInstall=true > ${c}-${version}.yaml
# for OpenShift
helm template ${c} -n ${releaseName} --namespace fission --set analytics=false,analyticsNonHelmInstall=true,logger.enableSecurityContext=true,prometheus.enabled=false > ${c}-${version}-openshift.yaml
# copy yaml files to build directory # copy yaml files to build directory
mv *.yaml ${BUILDDIR}/yamls/ mv *.yaml ${BUILDDIR}/yamls/