diff --git a/README.md b/README.md index a9f0db7..ce8c869 100644 --- a/README.md +++ b/README.md @@ -104,7 +104,8 @@ This repository is serves also as a catalogue for Rancher. We have serveral apps - [Jenkins](molgenis-jenkins/README.md) - [NEXUS](molgenis-nexus/README.md) - [HTTPD](molgenis-httpd/README.md) -- [MOLNIGES preview](molgenis-preview/README.md) +- [MOLGENIS preview](molgenis-preview/README.md) +- [MOLGENIS vault](molgenis-vault/README.md) ### Useful commands You can you need to know to easily develop and deploy helm-charts diff --git a/molgenis-vault/README.md b/molgenis-vault/README.md index a534657..0e0ac70 100644 --- a/molgenis-vault/README.md +++ b/molgenis-vault/README.md @@ -10,8 +10,6 @@ That creates a new vault with two vault pods. See https://github.com/coreos/vault-operator/blob/master/doc/user/vault.md -The UI will be exposed on the host name you specify. - ## Parameters ### Azure cloud credentials diff --git a/molgenis-vault/resources/vault.yaml b/molgenis-vault/resources/vault.yaml index a4158b8..fa1c83b 100644 --- a/molgenis-vault/resources/vault.yaml +++ b/molgenis-vault/resources/vault.yaml @@ -1,3 +1,4 @@ +# Use kubectl create -f vault.yaml to manually create a vault apiVersion: "vault.security.coreos.com/v1alpha1" kind: "VaultService" metadata: diff --git a/molgenis-vault/templates/NOTES.txt b/molgenis-vault/templates/NOTES.txt index ae4cce7..5df45af 100644 --- a/molgenis-vault/templates/NOTES.txt +++ b/molgenis-vault/templates/NOTES.txt @@ -1 +1,13 @@ -Good luck! \ No newline at end of file +Vault operator created + +Next steps: + +* Manually create a vault using resources/vault.yaml +* Manually restore a backup using resources/backup.yaml +* Unseal the vault pods + +{{ if .Values.backupJob.enable }} +!! Make sure to check if the backups succeed !! +{{ else }} +!!!!!! NO BACKUPS CONFIGURED !!!!!! +{{ end }} \ No newline at end of file diff --git a/molgenis-vault/templates/abs-secret.yaml b/molgenis-vault/templates/abs-secret.yaml index 519c814..5f31f41 100644 --- a/molgenis-vault/templates/abs-secret.yaml +++ b/molgenis-vault/templates/abs-secret.yaml @@ -1,3 +1,4 @@ +# Secret to access microsoft azure blob store apiVersion: v1 kind: Secret metadata: diff --git a/molgenis-vault/templates/backup-configmap.yaml b/molgenis-vault/templates/backup-configmap.yaml index 89f5404..8eb22d4 100644 --- a/molgenis-vault/templates/backup-configmap.yaml +++ b/molgenis-vault/templates/backup-configmap.yaml @@ -1,3 +1,4 @@ +# configmap to use as a template by the backup cronjob to create etcdbackup instances apiVersion: v1 kind: ConfigMap metadata: diff --git a/molgenis-vault/templates/ingress.yaml b/molgenis-vault/templates/ingress.yaml deleted file mode 100644 index 020b7a4..0000000 --- a/molgenis-vault/templates/ingress.yaml +++ /dev/null @@ -1,38 +0,0 @@ -{{- if .Values.ingress.enabled -}} -{{- $fullName := include "molgenis-vault.fullname" . -}} -{{- $ingressPath := .Values.ingress.path -}} -apiVersion: extensions/v1beta1 -kind: Ingress -metadata: - name: {{ $fullName }} - labels: - app: {{ template "molgenis-vault.name" . }} - chart: {{ template "molgenis-vault.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -{{- with .Values.ingress.annotations }} - annotations: -{{ toYaml . | indent 4 }} -{{- end }} -spec: -{{- if .Values.ingress.tls }} - tls: - {{- range .Values.ingress.tls }} - - hosts: - {{- range .hosts }} - - {{ . }} - {{- end }} - secretName: {{ .secretName }} - {{- end }} -{{- end }} - rules: - {{- range .Values.ingress.hosts }} - - host: {{ . }} - http: - paths: - - path: {{ $ingressPath }} - backend: - serviceName: {{ $fullName }} - servicePort: http - {{- end }} -{{- end }} diff --git a/molgenis-vault/values.yaml b/molgenis-vault/values.yaml index 92ac470..f77f5ff 100644 --- a/molgenis-vault/values.yaml +++ b/molgenis-vault/values.yaml @@ -45,13 +45,3 @@ etcd-operator: image: tag: v0.9.2 -ingress: - enabled: false - annotations: {} - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: "true" - path: / - hosts: - - chart-example.local - tls: [] -