diff --git a/charts/objecten/Chart.yaml b/charts/objecten/Chart.yaml index 522cf9f..584736b 100644 --- a/charts/objecten/Chart.yaml +++ b/charts/objecten/Chart.yaml @@ -3,5 +3,5 @@ name: objecten description: API om objecten te beheren die behoren bij een bepaald objecttype type: application -version: 0.9.3 +version: 0.9.4 appVersion: 2.1.1 diff --git a/charts/objecten/README.md b/charts/objecten/README.md index 00c371c..746ed40 100644 --- a/charts/objecten/README.md +++ b/charts/objecten/README.md @@ -1,6 +1,6 @@ # objecten -![Version: 0.9.0](https://img.shields.io/badge/Version-0.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.1](https://img.shields.io/badge/AppVersion-2.1.1-informational?style=flat-square) +![Version: 0.9.4](https://img.shields.io/badge/Version-0.9.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.1.1](https://img.shields.io/badge/AppVersion-2.1.1-informational?style=flat-square) API om objecten te beheren die behoren bij een bepaald objecttype @@ -11,6 +11,7 @@ helm repo add my-repo https://maykinmedia.github.io/charts/ helm install my-release my-repo/objecten ``` + ## Values | Key | Type | Default | Description | @@ -82,6 +83,7 @@ helm install my-release my-repo/objecten | settings.isHttps | bool | `true` | | | settings.secretKey | string | `""` | Generate secret key at https://djecrety.ir/ | | settings.sentry.dsn | string | `""` | | +| settings.twoFactorAuthentication | bool | `true` | | | settings.useXForwardedHost | bool | `true` | | | settings.uwsgi.harakiri | string | `""` | | | settings.uwsgi.master | string | `""` | | diff --git a/charts/objecten/templates/_helpers.tpl b/charts/objecten/templates/_helpers.tpl index 5b2239c..1f64cec 100644 --- a/charts/objecten/templates/_helpers.tpl +++ b/charts/objecten/templates/_helpers.tpl @@ -35,7 +35,6 @@ Common labels */}} {{- define "objecten.commonLabels" -}} helm.sh/chart: {{ include "objecten.chart" . }} -app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* @@ -54,7 +53,6 @@ Selector labels */}} {{- define "objecten.selectorLabels" -}} app.kubernetes.io/name: {{ include "objecten.name" . }} -app.kubernetes.io/instance: {{ .Release.Name }} {{- end }} {{/* diff --git a/charts/objecten/templates/configmap.yaml b/charts/objecten/templates/configmap.yaml index d72ebe4..21b9d79 100644 --- a/charts/objecten/templates/configmap.yaml +++ b/charts/objecten/templates/configmap.yaml @@ -17,7 +17,7 @@ data: DEBUG: "True" {{- end }} TWO_FACTOR_FORCE_OTP_ADMIN: {{ if .Values.settings.twoFactorAuthentication }}"True"{{ else }}"False"{{ end }} - TWO_FACTOR_PATCH_ADMIN: {{ if .Values.settings.twoFactorAuthentication }}"True"{{ else }}"False"{{ end }} + TWO_FACTOR_PATCH_ADMIN: {{ if .Values.settings.twoFactorAuthentication }}"True"{{ else }}"False"{{ end }} IS_HTTPS: {{ if .Values.settings.isHttps }}"True"{{ else }}"False"{{ end }} EMAIL_HOST: {{ .Values.settings.email.host | toString | quote }} EMAIL_PORT: {{ .Values.settings.email.port | toString | quote }} diff --git a/charts/objecten/templates/secret.yaml b/charts/objecten/templates/secret.yaml index db80d34..a289651 100644 --- a/charts/objecten/templates/secret.yaml +++ b/charts/objecten/templates/secret.yaml @@ -13,9 +13,9 @@ stringData: {{- end }} {{- if .Values.settings.email.password }} EMAIL_HOST_PASSWORD: {{ .Values.settings.email.password | toString | quote }} - {{- end }} + {{- end }} {{- if .Values.settings.elasticapm.url }} ELASTIC_APM_SERVER_URL: {{ .Values.settings.elasticapm.url | toString | quote }} ELASTIC_APM_SECRET_TOKEN: {{ .Values.settings.elasticapm.token | toString | quote }} - {{- end }} + {{- end }} {{- end }} diff --git a/charts/objecten/values.yaml b/charts/objecten/values.yaml index 30c45ec..19645bf 100644 --- a/charts/objecten/values.yaml +++ b/charts/objecten/values.yaml @@ -152,7 +152,7 @@ settings: debug: false twoFactorAuthentication: true - + uwsgi: master: '' threads: ''