airship/deckhand
Code Issues Proposed changes

Enabling Apparmor profile to deckhand init containers

Browse Source 
Remove OSH Authors copyright

The current copyright refers to a non-existent group
"openstack helm authors" with often out-of-date references that
are confusing when adding a new file to the repo.

This change removes all references to this copyright by the
non-existent group and any blank lines underneath.

Change-Id: Ib0b21b33d8bf91ea6da4c2421cc81355cf2b23b1
This commit is contained in:
DODDA, PRATEEK 2020-06-26 11:08:56 -05:00
parent a2606e75b1
commit 897f596185
5 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
charts/deckhand/templates/deployment.yaml
View File

@ -1,5 +1,4 @@
{{/*
# 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.
@ -40,7 +39,7 @@ spec:
{{ $labels | indent 8 }}
annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
{{ dict "envAll" $envAll "podName" "deckhand-api" "containerNames" (list "deckhand-api") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
{{ dict "envAll" $envAll "podName" "deckhand-api" "containerNames" (list "init" "deckhand-api") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
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:

3
charts/deckhand/templates/job-db-init.yaml
View File

@ -32,6 +32,9 @@ spec:
metadata:
labels:
{{ tuple $envAll "deckhand" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
{{ dict "envAll" $envAll "podName" "deckhand-db-init" "containerNames" (list "init" "deckhand-db-init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec:
serviceAccountName: {{ $serviceAccountName }}
restartPolicy: OnFailure

3
charts/deckhand/templates/job-db-sync.yaml
View File

@ -32,6 +32,9 @@ spec:
metadata:
labels:
{{ tuple $envAll "deckhand" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
{{ dict "envAll" $envAll "podName" "deckhand-db-sync" "containerNames" (list "init" "deckhand-db-sync") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec:
serviceAccountName: {{ $serviceAccountName }}
restartPolicy: OnFailure

5
charts/deckhand/templates/tests/test-deckhand-api.yaml
View File

@ -22,10 +22,11 @@ Test the Deckhand API, to ensure that the health endpoint is active and able to
apiVersion: v1
kind: Pod
metadata:
name: "{{ .Release.Name }}-deckhand-api-test"
name: deckhand-api-test
annotations:
"helm.sh/hook": "test-success"
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
{{ dict "envAll" $envAll "podName" "deckhand-api-test" "containerNames" (list "deckhand-api-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
labels:
{{ tuple $envAll "deckhand" "api-test" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
spec:
@ -33,7 +34,7 @@ spec:
nodeSelector:
{{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }}
containers:
- name: "{{ .Release.Name }}-deckhand-api-test"
- name: deckhand-api-test
env:
- name: 'DECKHAND_URL'
value: {{ tuple "deckhand" "internal" "api" . | include "helm-toolkit.endpoints.host_and_port_endpoint_uri_lookup" | quote }}

9
charts/deckhand/values.yaml
View File

@ -328,7 +328,16 @@ pod:
mandatory_access_control:
type: apparmor
deckhand-api:
init: runtime/default
deckhand-api: runtime/default
deckhand-db-init:
init: runtime/default
deckhand-db-init: runtime/default
deckhand-db-sync:
init: runtime/default
deckhand-db-sync: runtime/default
deckhand-api-test:
deckhand-api-test: runtime/default
security_context:
deckhand:
pod: