panxiao81/helm-charts-hardened
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Tornjak ingress (#16)

Browse Source 
Co-authored-by: Marco Franssen <[email protected]>
This commit is contained in:
Mariusz Sabath
2023-10-09 11:31:55 +00:00
committed by GitHub
co-authored by Marco Franssen
parent 8f1bfc16ad
commit 03ff618958
6 changed files with 86 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
charts/spire/charts/spire-server/README.md
+6
View File
@@ -267,6 +267,12 @@ In order to run Tornjak with simple HTTP Connection only, make sure you don't cr
| `tornjak.service.ports.http` | Insecure port for tornjak service | `10000` | | `tornjak.service.ports.http` | Insecure port for tornjak service | `10000` |
| `tornjak.service.ports.https` | Secure port for tornjak service | `10443` | | `tornjak.service.ports.https` | Secure port for tornjak service | `10443` |
| `tornjak.service.annotations` | Annotations for the service | `{}` | | `tornjak.service.annotations` | Annotations for the service | `{}` |
| `tornjak.ingress.enabled` | Flag to enable ingress for Tornjak backend service | `false` |
| `tornjak.ingress.className` | Ingress class name for Tornjak backend service | `""` |
| `tornjak.ingress.annotations` | Annotations for Tornjak backend service | `{}` |
| `tornjak.ingress.tlsBackendPort` | Flag to enable TLS on the ingress Tornjak backend service | `false` |
| `tornjak.ingress.hosts` | Host paths for ingress Tornjak backend service | `[]` |
| `tornjak.ingress.tls` | Secrets containing TLS certs to enable https on ingress | `[]` |
| `tornjak.startupProbe.failureThreshold` | Failure threshold count | `3` | | `tornjak.startupProbe.failureThreshold` | Failure threshold count | `3` |
| `tornjak.startupProbe.initialDelaySeconds` | Initial delay seconds | `5` | | `tornjak.startupProbe.initialDelaySeconds` | Initial delay seconds | `5` |
| `tornjak.startupProbe.periodSeconds` | Period seconds | `10` | | `tornjak.startupProbe.periodSeconds` | Period seconds | `10` |
charts/spire/charts/spire-server/templates/tornjak-ingress.yaml
+16
View File
@@ -0,0 +1,16 @@
{{- if .Values.tornjak.ingress.enabled -}}
{{- $fullName := include "spire-tornjak.fullname" . -}}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ $fullName }}
namespace: {{ include "spire-server.namespace" . }}
labels:
{{ include "spire-server.labels" . | nindent 4}}
{{- with .Values.tornjak.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{ include "spire-lib.ingress-spec" (dict "ingress" .Values.tornjak.ingress "svcName" (include "spire-tornjak.servicename" .) "port" "tornjak-srv-http") | nindent 2 }}
{{- end }}
charts/spire/charts/spire-server/values.yaml
+21
View File
@@ -562,6 +562,27 @@ tornjak:
## @param tornjak.service.annotations [object] Annotations for the service ## @param tornjak.service.annotations [object] Annotations for the service
annotations: {} annotations: {}
## @param tornjak.ingress.enabled Flag to enable ingress for Tornjak backend service
## @param tornjak.ingress.className Ingress class name for Tornjak backend service
## @param tornjak.ingress.annotations [object] Annotations for Tornjak backend service
## @param tornjak.ingress.tlsBackendPort Flag to enable TLS on the ingress Tornjak backend service
## @param tornjak.ingress.hosts [array] Host paths for ingress Tornjak backend service
ingress:
enabled: false
className: ""
annotations: {}
tlsBackendPort: false
hosts:
- host: tornjak-backend.example.org
paths:
- path: /
pathType: Prefix
## @param tornjak.ingress.tls [array] Secrets containing TLS certs to enable https on ingress
tls: []
# - secretName: chart-example-tls
# hosts:
# - tornjak-backend.example.org
## @param tornjak.startupProbe.failureThreshold Failure threshold count ## @param tornjak.startupProbe.failureThreshold Failure threshold count
## @param tornjak.startupProbe.initialDelaySeconds Initial delay seconds ## @param tornjak.startupProbe.initialDelaySeconds Initial delay seconds
## @param tornjak.startupProbe.periodSeconds Period seconds ## @param tornjak.startupProbe.periodSeconds Period seconds
charts/spire/charts/tornjak-frontend/README.md
+5
View File
@@ -88,6 +88,11 @@ port forwarding. See the chart NOTES output for more details.
| `startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` | | `startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` |
| `startupProbe.failureThreshold` | Failure threshold count for startupProbe | `6` | | `startupProbe.failureThreshold` | Failure threshold count for startupProbe | `6` |
| `startupProbe.successThreshold` | Success threshold count for startupProbe | `1` | | `startupProbe.successThreshold` | Success threshold count for startupProbe | `1` |
| `ingress.enabled` | Flag to enable ingress for Tornjak frontend service | `false` |
| `ingress.className` | Ingress class name for Tornjak frontend service | `""` |
| `ingress.annotations` | Annotations for Tornjak frontend service | `{}` |
| `ingress.hosts` | Host paths for ingress Tornjak frontend service | `[]` |
| `ingress.tls` | Secrets containing TLS certs to enable https on ingress | `[]` |
| `tests.bash.image.registry` | The OCI registry to pull the image from | `cgr.dev` | | `tests.bash.image.registry` | The OCI registry to pull the image from | `cgr.dev` |
| `tests.bash.image.repository` | The repository within the registry | `chainguard/bash` | | `tests.bash.image.repository` | The repository within the registry | `chainguard/bash` |
| `tests.bash.image.pullPolicy` | The image pull policy | `IfNotPresent` | | `tests.bash.image.pullPolicy` | The image pull policy | `IfNotPresent` |
charts/spire/charts/tornjak-frontend/templates/ingress.yaml
+16
View File
@@ -0,0 +1,16 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "tornjak-frontend.fullname" . -}}
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: {{ $fullName }}
namespace: {{ include "tornjak-frontend.namespace" . }}
labels:
{{ include "tornjak-frontend.labels" . | nindent 4}}
{{- with .Values.ingress.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
{{ include "spire-lib.ingress-spec" (dict "ingress" .Values.ingress "svcName" $fullName "port" .Values.service.port "global" .Values.global) | nindent 2 }}
{{- end }}
charts/spire/charts/tornjak-frontend/values.yaml
+22 -3
View File
@@ -22,13 +22,13 @@ image:
## @param imagePullSecrets [array] Pull secrets for images ## @param imagePullSecrets [array] Pull secrets for images
imagePullSecrets: [] imagePullSecrets: []
## @param nameOverride Name override ## @param nameOverride Name override
nameOverride: "" nameOverride: ""
## @param namespaceOverride Namespace override ## @param namespaceOverride Namespace override
namespaceOverride: "" namespaceOverride: ""
## @param fullnameOverride Fullname override ## @param fullnameOverride Fullname override
fullnameOverride: "" fullnameOverride: ""
## @param serviceAccount.create Specifies whether a service account should be created ## @param serviceAccount.create Specifies whether a service account should be created
@@ -113,6 +113,25 @@ startupProbe:
failureThreshold: 6 failureThreshold: 6
successThreshold: 1 successThreshold: 1
## @param ingress.enabled Flag to enable ingress for Tornjak frontend service
## @param ingress.className Ingress class name for Tornjak frontend service
## @param ingress.annotations [object] Annotations for Tornjak frontend service
## @param ingress.hosts [array] Host paths for ingress Tornjak frontend service
ingress:
enabled: false
className: ""
annotations: {}
hosts:
- host: tornjak-frontend.example.org
paths:
- path: /
pathType: Prefix
## @param ingress.tls [array] Secrets containing TLS certs to enable https on ingress
tls: []
# - secretName: chart-example-tls
# hosts:
# - tornjak-frontend.example.org
tests: tests:
bash: bash:
## @param tests.bash.image.registry The OCI registry to pull the image from ## @param tests.bash.image.registry The OCI registry to pull the image from