0df7427dc4
This PS add Barbican support, and moves all potentially container specific logic into the service start script from the api manifests. Also fixes a permissions issue with the nova-api, which incorrectly had the NET_ADMIN capability. Change-Id: I18fc1ea5d7aa70ea7dabb829361a3da57e905100
106 lines
4.2 KiB
YAML
106 lines
4.2 KiB
YAML
# Copyright 2017 The Openstack-Helm Authors.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
{{- $envAll := . }}
|
|
{{- $dependencies := .Values.dependencies.server }}
|
|
{{- $mounts_neutron_server := .Values.mounts.neutron_server.neutron_server }}
|
|
{{- $mounts_neutron_server_init := .Values.mounts.neutron_server.init_container }}
|
|
apiVersion: apps/v1beta1
|
|
kind: Deployment
|
|
metadata:
|
|
name: neutron-server
|
|
spec:
|
|
replicas: {{ .Values.replicas.server }}
|
|
revisionHistoryLimit: {{ .Values.upgrades.revision_history }}
|
|
strategy:
|
|
type: {{ .Values.upgrades.pod_replacement_strategy }}
|
|
{{ if eq .Values.upgrades.pod_replacement_strategy "RollingUpdate" }}
|
|
rollingUpdate:
|
|
maxUnavailable: {{ .Values.upgrades.rolling_update.max_unavailable }}
|
|
maxSurge: {{ .Values.upgrades.rolling_update.max_surge }}
|
|
{{ end }}
|
|
template:
|
|
metadata:
|
|
labels:
|
|
app: neutron-server
|
|
annotations:
|
|
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
|
|
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
|
|
pod.beta.kubernetes.io/init-containers: '[
|
|
{{ tuple $envAll $dependencies $mounts_neutron_server_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 10 }}
|
|
]'
|
|
spec:
|
|
nodeSelector:
|
|
{{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
|
|
terminationGracePeriodSeconds: {{ .Values.termination_grace_period.server.timeout | default "30" }}
|
|
containers:
|
|
- name: neutron-server
|
|
image: {{ .Values.images.server }}
|
|
imagePullPolicy: {{ .Values.images.pull_policy }}
|
|
{{- if .Values.resources.enabled }}
|
|
resources:
|
|
limits:
|
|
cpu: {{ .Values.resources.server.limits.cpu | quote }}
|
|
memory: {{ .Values.resources.server.limits.memory | quote }}
|
|
requests:
|
|
cpu: {{ .Values.resources.server.requests.cpu | quote }}
|
|
memory: {{ .Values.resources.server.requests.memory | quote }}
|
|
{{- end }}
|
|
command:
|
|
- bash
|
|
- /tmp/neutron-server.sh
|
|
- start
|
|
lifecycle:
|
|
preStop:
|
|
exec:
|
|
command:
|
|
- bash
|
|
- /tmp/neutron-server.sh
|
|
- stop
|
|
ports:
|
|
- containerPort: {{ .Values.network.server.port }}
|
|
readinessProbe:
|
|
tcpSocket:
|
|
port: {{ .Values.network.server.port }}
|
|
volumeMounts:
|
|
- name: neutron-bin
|
|
mountPath: /tmp/neutron-server.sh
|
|
subPath: neutron-server.sh
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/neutron.conf
|
|
subPath: neutron.conf
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/plugins/ml2/ml2_conf.ini
|
|
subPath: ml2_conf.ini
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/api-paste.ini
|
|
subPath: api-paste.ini
|
|
readOnly: true
|
|
- name: neutron-etc
|
|
mountPath: /etc/neutron/policy.json
|
|
subPath: policy.json
|
|
readOnly: true
|
|
{{ if $mounts_neutron_server.volumeMounts }}{{ toYaml $mounts_neutron_server.volumeMounts | indent 12 }}{{ end }}
|
|
volumes:
|
|
- name: neutron-bin
|
|
configMap:
|
|
name: neutron-bin
|
|
- name: neutron-etc
|
|
configMap:
|
|
name: neutron-etc
|
|
{{ if $mounts_neutron_server.volumes }}{{ toYaml $mounts_neutron_server.volumes | indent 8 }}{{ end }}
|