openstack/openstack-helm
Code Issues Proposed changes

Merge "Nova: novnc proxy cleanup"

Browse Source
This commit is contained in:
Jenkins 2017-07-10 13:15:58 +00:00 committed by Gerrit Code Review
commit d94804571e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/templates/deployment-novncproxy.yaml
View File

@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{ if eq .Values.console.console_kind "novnc" }}
{{- $envAll := . }}
{{ if eq .Values.console.console_kind "novnc" }}
{{- $dependencies := .Values.dependencies.novncproxy }}
{{- $mounts_nova_novncproxy := .Values.mounts.nova_novncproxy.nova_novncproxy }}
{{- $mounts_nova_novncproxy_init := .Values.mounts.nova_novncproxy.init_novncproxy }}
@ -28,17 +28,16 @@ spec:
template:
metadata:
labels:
app: nova-novncproxy
{{ tuple $envAll "nova" "novnc-proxy" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
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" }}
spec:
affinity:
{{ tuple $envAll "nova" "novnc-proxy" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
nodeSelector:
{{ .Values.labels.novncproxy.node_selector_key }}: {{ .Values.labels.novncproxy.node_selector_value }}
securityContext:
runAsUser: 0
hostNetwork: true
hostPID: true
dnsPolicy: ClusterFirst
initContainers:
{{ tuple $envAll $dependencies $mounts_nova_novncproxy_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}

3
nova/templates/service-novncproxy.yaml
View File

@ -12,6 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
{{- $envAll := . }}
{{ if eq .Values.console.console_kind "novnc" }}
---
apiVersion: v1
@ -28,7 +29,7 @@ spec:
nodePort: {{ .Values.network.novncproxy.node_port.port }}
{{ end }}
selector:
app: nova-novncproxy
{{ tuple $envAll "nova" "novnc-proxy" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
{{ if .Values.network.novncproxy.node_port.enabled }}
type: NodePort
{{ end }}