Michal.Wrobel/openbao-helm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update helm labels (#8)

Browse source
This commit is contained in:
Jason O'Donnell 2019-08-07 14:55:32 -04:00 committed by GitHub
parent 0342358c94
commit db571d8dda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 37 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
templates/server-config-configmap.yaml
View file

@ -6,10 +6,11 @@ kind: ConfigMap
metadata: metadata:
name: {{ template "vault.fullname" . }}-config name: {{ template "vault.fullname" . }}-config
labels: labels:
app: {{ template "vault.name" . }} helm.sh/chart: {{ include "vault.chart" . }}
chart: {{ template "vault.chart" . }} app.kubernetes.io/name: {{ include "vault.name" . }}
heritage: {{ .Release.Service }} app.kubernetes.io/instance: {{ .Release.Name }}
release: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/version: {{ .Chart.Version | quote }}
data: data:
extraconfig-from-values.hcl: |- extraconfig-from-values.hcl: |-
{{- if eq .mode "standalone" }} {{- if eq .mode "standalone" }}

9
templates/server-disruptionbudget.yaml
View file

@ -7,10 +7,11 @@ kind: PodDisruptionBudget
metadata: metadata:
name: {{ template "vault.fullname" . }} name: {{ template "vault.fullname" . }}
labels: labels:
app: {{ template "vault.name" . }} helm.sh/chart: {{ include "vault.chart" . }}
chart: {{ template "vault.chart" . }} app.kubernetes.io/name: {{ include "vault.name" . }}
heritage: {{ .Release.Service }} app.kubernetes.io/instance: {{ .Release.Name }}
release: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/version: {{ .Chart.Version | quote }}
spec: spec:
maxUnavailable: {{ template "vault.pdb.maxUnavailable" . }} maxUnavailable: {{ template "vault.pdb.maxUnavailable" . }}
selector: selector:

9
templates/server-service.yaml
View file

@ -9,10 +9,11 @@ kind: Service
metadata: metadata:
name: {{ template "vault.fullname" . }} name: {{ template "vault.fullname" . }}
labels: labels:
app: {{ template "vault.name" . }} helm.sh/chart: {{ include "vault.chart" . }}
chart: {{ template "vault.chart" . }} app.kubernetes.io/name: {{ include "vault.name" . }}
heritage: {{ .Release.Service }} app.kubernetes.io/instance: {{ .Release.Name }}
release: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/version: {{ .Chart.Version | quote }}
annotations: annotations:
# This must be set in addition to publishNotReadyAddresses due # This must be set in addition to publishNotReadyAddresses due
# to an open issue where it may not work: # to an open issue where it may not work:

9
templates/server-serviceaccount.yaml
View file

@ -6,8 +6,9 @@ metadata:
name: {{ template "vault.fullname" . }} name: {{ template "vault.fullname" . }}
namespace: {{ .Release.Namespace }} namespace: {{ .Release.Namespace }}
labels: labels:
app: {{ template "vault.name" . }} helm.sh/chart: {{ include "vault.chart" . }}
chart: {{ template "vault.chart" . }} app.kubernetes.io/name: {{ include "vault.name" . }}
heritage: {{ .Release.Service }} app.kubernetes.io/instance: {{ .Release.Name }}
release: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/version: {{ .Chart.Version | quote }}
{{ end }} {{ end }}

21
templates/server-statefulset.yaml
View file

@ -6,10 +6,11 @@ kind: StatefulSet
metadata: metadata:
name: {{ template "vault.fullname" . }} name: {{ template "vault.fullname" . }}
labels: labels:
app: {{ template "vault.name" . }} helm.sh/chart: {{ include "vault.chart" . }}
chart: {{ template "vault.chart" . }} app.kubernetes.io/name: {{ include "vault.name" . }}
heritage: {{ .Release.Service }} app.kubernetes.io/instance: {{ .Release.Name }}
release: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/version: {{ .Chart.Version | quote }}
spec: spec:
serviceName: {{ template "vault.fullname" . }} serviceName: {{ template "vault.fullname" . }}
podManagementPolicy: Parallel podManagementPolicy: Parallel
@ -18,16 +19,16 @@ spec:
type: OnDelete type: OnDelete
selector: selector:
matchLabels: matchLabels:
app: {{ template "vault.name" . }} helm.sh/chart: {{ template "vault.chart" . }}
chart: {{ template "vault.chart" . }} app.kubernetes.io/name: {{ template "vault.name" . }}
release: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
component: server component: server
template: template:
metadata: metadata:
labels: labels:
app: {{ template "vault.name" . }} helm.sh/chart: {{ template "vault.chart" . }}
chart: {{ template "vault.chart" . }} app.kubernetes.io/name: {{ template "vault.name" . }}
release: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
component: server component: server
{{ template "vault.annotations" . }} {{ template "vault.annotations" . }}
spec: spec:

9
templates/ui-service.yaml
View file

@ -9,10 +9,11 @@ kind: Service
metadata: metadata:
name: {{ template "vault.fullname" . }}-ui name: {{ template "vault.fullname" . }}-ui
labels: labels:
app: {{ template "vault.name" . }} helm.sh/chart: {{ include "vault.chart" . }}
chart: {{ template "vault.chart" . }} app.kubernetes.io/name: {{ include "vault.name" . }}
heritage: {{ .Release.Service }} app.kubernetes.io/instance: {{ .Release.Name }}
release: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }}
app.kubernetes.io/version: {{ .Chart.Version | quote }}
spec: spec:
selector: selector:
app: {{ template "vault.name" . }} app: {{ template "vault.name" . }}

2
test/acceptance/server-ha.bats
View file

@ -69,7 +69,7 @@ load _helpers
[ "${token}" != "" ] [ "${token}" != "" ]
# Vault Unseal # Vault Unseal
local pods=($(kubectl get pods --selector='app=vault' -o json | jq -r '.items[].metadata.name')) local pods=($(kubectl get pods --selector='app.kubernetes.io/name=vault' -o json | jq -r '.items[].metadata.name'))
for pod in "${pods[@]}" for pod in "${pods[@]}"
do do
kubectl exec -ti ${pod} -- vault operator unseal ${token} kubectl exec -ti ${pod} -- vault operator unseal ${token}