From 3e12235d5d90911a0c071ed6e25b4a40da152f24 Mon Sep 17 00:00:00 2001 From: Ludovic Muller Date: Wed, 16 Aug 2023 18:37:03 +0200 Subject: [PATCH 1/4] trifid: add extra env --- appuio/trifid/templates/deployment.yaml | 4 ++++ appuio/trifid/values.yaml | 9 +++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/appuio/trifid/templates/deployment.yaml b/appuio/trifid/templates/deployment.yaml index cf6dd752..bfbdfd9f 100644 --- a/appuio/trifid/templates/deployment.yaml +++ b/appuio/trifid/templates/deployment.yaml @@ -41,6 +41,10 @@ spec: secretKeyRef: name: {{ if $endpoint.secretName }}{{ $endpoint.secretName }}{{ else }}{{ include "trifid.fullname" . }}{{ end }} key: password + {{- range $key, $value := .Values.extraEnv }} + - name: {{ $key }} + value: {{ $value }} + {{- end }} ports: - name: http containerPort: 8080 diff --git a/appuio/trifid/values.yaml b/appuio/trifid/values.yaml index 3b018281..f7b24bbf 100644 --- a/appuio/trifid/values.yaml +++ b/appuio/trifid/values.yaml @@ -31,7 +31,7 @@ podSecurityContext: securityContext: capabilities: drop: - - ALL + - ALL runAsNonRoot: true runAsUser: 1000 readOnlyRootFilesystem: true @@ -46,7 +46,8 @@ service: ingress: enabled: false - annotations: {} + annotations: + {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" hosts: @@ -68,3 +69,7 @@ resources: nodeSelector: {} tolerations: [] + +extraEnv: + {} + # VARIABLE_NAME: value From 3677c478a96ea6755c1010890b2a2b5153c7dd8e Mon Sep 17 00:00:00 2001 From: Ludovic Muller Date: Wed, 16 Aug 2023 18:40:25 +0200 Subject: [PATCH 2/4] trifid: increase patch version to 2.0.2 --- README.md | 2 +- appuio/trifid/Chart.yaml | 4 ++-- appuio/trifid/README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 7def6d61..1e8b2084 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ helm repo add appuio https://charts.appuio.ch | [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/snappass-1.0.0/total)](https://github.com/appuio/charts/releases/tag/snappass-1.0.0) | [snappass](appuio/snappass/README.md) | | [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/stardog-0.19.0/total)](https://github.com/appuio/charts/releases/tag/stardog-0.19.0) | [stardog](appuio/stardog/README.md) | | [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/stardog-userrole-operator-0.2.3/total)](https://github.com/appuio/charts/releases/tag/stardog-userrole-operator-0.2.3) | [stardog-userrole-operator](appuio/stardog-userrole-operator/README.md) | -| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/trifid-2.0.1/total)](https://github.com/appuio/charts/releases/tag/trifid-2.0.1) | [trifid](appuio/trifid/README.md) | +| [![chart downloads](https://img.shields.io/github/downloads/appuio/charts/trifid-2.0.2/total)](https://github.com/appuio/charts/releases/tag/trifid-2.0.2) | [trifid](appuio/trifid/README.md) | ## Add / Update Charts diff --git a/appuio/trifid/Chart.yaml b/appuio/trifid/Chart.yaml index aef3eb91..d0f060cc 100644 --- a/appuio/trifid/Chart.yaml +++ b/appuio/trifid/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: trifid description: Trifid provides a lightweight and easy way to access Linked Data URIs via HTTP. -version: 2.0.1 +version: 2.0.2 appVersion: 2.3.7 home: "https://github.com/zazuko/trifid" sources: -- https://github.com/zazuko/trifid + - https://github.com/zazuko/trifid diff --git a/appuio/trifid/README.md b/appuio/trifid/README.md index 7ee4bdb0..1346b360 100644 --- a/appuio/trifid/README.md +++ b/appuio/trifid/README.md @@ -1,6 +1,6 @@ # trifid -![Version: 2.0.1](https://img.shields.io/badge/Version-2.0.1-informational?style=flat-square) ![AppVersion: 2.3.7](https://img.shields.io/badge/AppVersion-2.3.7-informational?style=flat-square) +![Version: 2.0.2](https://img.shields.io/badge/Version-2.0.2-informational?style=flat-square) ![AppVersion: 2.3.7](https://img.shields.io/badge/AppVersion-2.3.7-informational?style=flat-square) Trifid provides a lightweight and easy way to access Linked Data URIs via HTTP. From 2e95e58c349cf7d9f88be57cb9f76d3484258594 Mon Sep 17 00:00:00 2001 From: Ludovic Muller Date: Wed, 16 Aug 2023 18:47:25 +0200 Subject: [PATCH 3/4] trifid: document extraEnv --- appuio/trifid/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/appuio/trifid/README.md b/appuio/trifid/README.md index 1346b360..3eaf565c 100644 --- a/appuio/trifid/README.md +++ b/appuio/trifid/README.md @@ -49,6 +49,7 @@ The following table lists the configurable parameters chart. For default values | `resources` | Pod resource requests and limits | | `nodeSelector` | Pod node selector | | `tolerations` | Pod tolerations | +| `extraEnv` | Provide custom environment variables to the deployment | ## Source Code From ceb3efbdecea19caefae1d7fec687ff913b95cb3 Mon Sep 17 00:00:00 2001 From: Ludovic Muller Date: Wed, 16 Aug 2023 19:24:17 +0200 Subject: [PATCH 4/4] Revert "trifid: document extraEnv" This reverts commit 2e95e58c349cf7d9f88be57cb9f76d3484258594. --- appuio/trifid/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/appuio/trifid/README.md b/appuio/trifid/README.md index 3eaf565c..1346b360 100644 --- a/appuio/trifid/README.md +++ b/appuio/trifid/README.md @@ -49,7 +49,6 @@ The following table lists the configurable parameters chart. For default values | `resources` | Pod resource requests and limits | | `nodeSelector` | Pod node selector | | `tolerations` | Pod tolerations | -| `extraEnv` | Provide custom environment variables to the deployment | ## Source Code