Skip to content

Commit

Permalink
use minio on teresa helm
Browse files Browse the repository at this point in the history
  • Loading branch information
yagonobre committed Oct 26, 2017
1 parent e15d09e commit 268bc8f
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 3 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,6 @@ ENV/
# Rope project settings
.ropeproject
*.sqlite

#Helm Dependency
helm/chart/teresa/charts
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

## [Next Version] - Release Date
### Added
- [helm] minio as dependency

## [0.9.0] - 2017-10-26
### Fixed
- login now use the --cluster flag to save the token to config file
Expand Down
1 change: 1 addition & 0 deletions helm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ Parameter | Description | Default
`build.limits.cpu` | CPU limit used by build POD | `500m`
`build.limits.memory` | Memory limit used by build POD | `1024Mi`
`debug` | If true, print the stack trace on every panic/recover. | `false`
`useMinio` | If true, use minio instead of s3. | `false`

Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

Expand Down
9 changes: 9 additions & 0 deletions helm/chart/teresa/requirements.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
dependencies:
- condition: ""
enabled: false
name: minio
repository: https://kubernetes-charts.storage.googleapis.com/
tags: null
version: 0.1.5
digest: sha256:3aee42d4db11f4c7c5d9c3d3378ca898589cb217934cfb2c08f38869eac12a35
generated: 2017-08-29T13:57:14.161449942-03:00
5 changes: 5 additions & 0 deletions helm/chart/teresa/requirements.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dependencies:
- name: minio
version: "0.1.5"
repository: "https://kubernetes-charts.storage.googleapis.com/"
condition: useMinio
23 changes: 20 additions & 3 deletions helm/chart/teresa/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,26 +50,43 @@ spec:
value: /etc/teresa-keys/teresa.rsa.pub
- name: TERESA_STORAGE_TYPE
value: {{ .Values.storage.type }}
{{ if .Values.aws.s3.endpoint }}
{{- if .Values.useMinio }}
- name: TERESA_STORAGE_AWS_ENDPOINT
value: {{ template "minio.fullname" . }}
{{- else if .Values.aws.s3.endpoint }}
- name: TERESA_STORAGE_AWS_ENDPOINT
value: {{ quote .Values.aws.s3.endpoint }}
{{- end }}
- name: TERESA_STORAGE_AWS_BUCKET
{{- if .Values.useMinio }}
value: {{ .Values.minio.defaultBucket.name }}
{{- else }}
value: {{ .Values.aws.s3.bucket }}
{{- end }}
- name: TERESA_STORAGE_AWS_S3_FORCE_PATH_STYLE
value: {{ quote .Values.aws.s3.force_path_style }}
- name: TERESA_STORAGE_AWS_KEY
valueFrom:
secretKeyRef:
{{- if .Values.useMinio }}
name: {{ template "minio.fullname" . }}-user
key: accesskey
{{- else }}
name: {{ template "fullname" . }}-aws
key: access_key
- name: TERESA_STORAGE_AWS_REGION
value: {{ .Values.aws.region }}
{{- end }}
- name: TERESA_STORAGE_AWS_SECRET
valueFrom:
secretKeyRef:
{{- if .Values.useMinio }}
name: {{ template "minio.fullname" . }}-user
key: secretkey
{{- else }}
name: {{ template "fullname" . }}-aws
key: secret_key
{{- end }}
- name: TERESA_STORAGE_AWS_REGION
value: {{ .Values.aws.region }}
{{- if .Values.tls.crt }}
- name: TERESA_SECRETS_TLS_CERT
value: /etc/teresa/server.crt
Expand Down
7 changes: 7 additions & 0 deletions helm/chart/teresa/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,10 @@ build:
cpu: 500m
memory: 1024Mi
debug: false
useMinio: false
minio:
serviceType: ClusterIP
bucketDefault:
enabled: true
name: teresa
policy: public

0 comments on commit 268bc8f

Please sign in to comment.