openstack/openstack-helm
Code Issues Proposed changes

Nova: novnc proxy cleanup

Browse Source 
This PS updates the novnc proxy manifest to use the labels and
anti-affinity functions introduced to OS-H while it was in review.
It also drops some unrequired privs from the pod.

Change-Id: I24dce2079ac8aed2e05ce03832cefe0e8ca7f595
This commit is contained in:
Pete Birley 2017-07-06 14:44:14 -05:00
parent 568ca0aa62
commit 4f3c48a089
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 # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
{{ if eq .Values.console.console_kind "novnc" }}
{{- $envAll := . }} {{- $envAll := . }}
{{ if eq .Values.console.console_kind "novnc" }}
{{- $dependencies := .Values.dependencies.novncproxy }} {{- $dependencies := .Values.dependencies.novncproxy }}
{{- $mounts_nova_novncproxy := .Values.mounts.nova_novncproxy.nova_novncproxy }} {{- $mounts_nova_novncproxy := .Values.mounts.nova_novncproxy.nova_novncproxy }}
{{- $mounts_nova_novncproxy_init := .Values.mounts.nova_novncproxy.init_novncproxy }} {{- $mounts_nova_novncproxy_init := .Values.mounts.nova_novncproxy.init_novncproxy }}
@ -28,17 +28,16 @@ spec:
template: template:
metadata: metadata:
labels: labels:
app: nova-novncproxy {{ tuple $envAll "nova" "novnc-proxy" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
annotations: annotations:
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
spec: spec:
affinity:
{{ tuple $envAll "nova" "novnc-proxy" | include "helm-toolkit.snippets.kubernetes_pod_anti_affinity" | indent 8 }}
nodeSelector: nodeSelector:
{{ .Values.labels.novncproxy.node_selector_key }}: {{ .Values.labels.novncproxy.node_selector_value }} {{ .Values.labels.novncproxy.node_selector_key }}: {{ .Values.labels.novncproxy.node_selector_value }}
securityContext:
runAsUser: 0
hostNetwork: true hostNetwork: true
hostPID: true
dnsPolicy: ClusterFirst dnsPolicy: ClusterFirst
initContainers: initContainers:
{{ tuple $envAll $dependencies $mounts_nova_novncproxy_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ 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 # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
{{- $envAll := . }}
{{ if eq .Values.console.console_kind "novnc" }} {{ if eq .Values.console.console_kind "novnc" }}
--- ---
apiVersion: v1 apiVersion: v1
@ -28,7 +29,7 @@ spec:
nodePort: {{ .Values.network.novncproxy.node_port.port }} nodePort: {{ .Values.network.novncproxy.node_port.port }}
{{ end }} {{ end }}
selector: 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 }} {{ if .Values.network.novncproxy.node_port.enabled }}
type: NodePort type: NodePort
{{ end }} {{ end }}