mirror of
https://github.com/bjw-s-labs/helm-charts.git
synced 2025-07-03 16:37:04 +02:00
feat(common): Release v2.5.0 (#258)
Co-authored-by: Maurits <75321636+maurits-funda@users.noreply.github.com> Co-authored-by: Noam Lerner <bugok@users.noreply.github.com>
This commit is contained in:
Bernd Schorgers
GitHub
parent
1582fe27c4
commit
a548690b00
25 changed files with 670 additions and 56 deletions
|
|
@ -3,7 +3,7 @@ apiVersion: v2
|
|||
name: common
|
||||
description: Function library for Helm charts
|
||||
type: library
|
||||
version: 2.4.0
|
||||
version: 2.5.0
|
||||
kubeVersion: ">=1.22.0-0"
|
||||
keywords:
|
||||
- common
|
||||
|
|
@ -14,32 +14,21 @@ maintainers:
|
|||
email: me@bjw-s.dev
|
||||
annotations:
|
||||
artifacthub.io/changes: |-
|
||||
- kind: fixed
|
||||
description: |-
|
||||
PersistentVolumeClaims now properly created based on `persistence.x.enabled` value
|
||||
- kind: added
|
||||
description: |-
|
||||
Add support for `timeouts` in HTTPRoute.
|
||||
Support suspending CronJobs
|
||||
- kind: added
|
||||
description: |-
|
||||
Add support for `workingDir` for containers.
|
||||
- kind: fixed
|
||||
Add support for targetLabels in ServiceMonitor
|
||||
- kind: added
|
||||
description: |-
|
||||
Defaulting image tags to chart.Appversion was removed without a proper alternative
|
||||
- kind: fixed
|
||||
Re-add support for setting mountPropagation on volumemounts
|
||||
- kind: added
|
||||
description: |-
|
||||
Using RequestRedirect is not allowed with BackendRefs in Routes.
|
||||
- kind: fixed
|
||||
Support `envFrom` identifiers and name templates for Secrets and ConfigMaps
|
||||
- kind: added
|
||||
description: |-
|
||||
StatefulSet objects would not always fall back to proper defaults and error out
|
||||
- kind: changed
|
||||
description: |-
|
||||
routes will no longer auto target its service.
|
||||
It will need to be explicitly defined as below
|
||||
|
||||
```yaml
|
||||
- backendRefs:
|
||||
- group: ""
|
||||
kind: Service
|
||||
name: foo
|
||||
namespace: foo-namespace
|
||||
port: 8080
|
||||
weight: 1
|
||||
```
|
||||
Support the `job` controller type to generate one-off jobs.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# common
|
||||
|
||||
 
|
||||
 
|
||||
|
||||
Function library for Helm charts
|
||||
|
||||
|
|
@ -27,7 +27,7 @@ Include this chart as a dependency in your `Chart.yaml` e.g.
|
|||
# Chart.yaml
|
||||
dependencies:
|
||||
- name: common
|
||||
version: 2.3.0
|
||||
version: 2.5.0
|
||||
repository: https://bjw-s.github.io/helm-charts/
|
||||
```
|
||||
|
||||
|
|
@ -58,7 +58,7 @@ The following table contains an overview of available values and their descripti
|
|||
| controllers.main.containers.main.command | list | `[]` | Override the command(s) for the default container |
|
||||
| controllers.main.containers.main.dependsOn | list | `[]` | Specify if this container depends on any other containers This is used to determine the order in which the containers are rendered. The use of "dependsOn" completely disables the "order" field within the controller. |
|
||||
| controllers.main.containers.main.env | string | `nil` | Environment variables. Template enabled. Syntax options: A) TZ: UTC B) PASSWD: '{{ .Release.Name }}' B) TZ: value: UTC dependsOn: otherVar D) PASSWD: configMapKeyRef: name: config-map-name key: key-name E) PASSWD: dependsOn: - otherVar1 - otherVar2 valueFrom: secretKeyRef: name: secret-name key: key-name ... F) - name: TZ value: UTC G) - name: TZ value: '{{ .Release.Name }}' |
|
||||
| controllers.main.containers.main.envFrom | list | `[]` | Secrets and/or ConfigMaps that will be loaded as environment variables. [[ref]](https://unofficial-kubernetes.readthedocs.io/en/latest/tasks/configure-pod-container/configmap/#use-case-consume-configmap-in-environment-variables) |
|
||||
| controllers.main.containers.main.envFrom | list | `[]` | Secrets and/or ConfigMaps that will be loaded as environment variables. Syntax options: A) Pass an app-template configMap identifier: - config: config B) Pass any configMap name that is not also an identifier (Template enabled): - config: random-configmap-name C) Pass an app-template configMap identifier, explicit syntax: - configMapRef: identifier: config D) Pass any configMap name, explicit syntax (Template enabled): - configMapRef: name: "{{ .Release.Name }}-config" E) Pass an app-template secret identifier: - secret: secret F) Pass any secret name that is not also an identifier (Template enabled): - secret: random-secret-name G) Pass an app-template secret identifier, explicit syntax: - secretRef: identifier: secret H) Pass any secret name, explicit syntax (Template enabled): - secretRef: name: "{{ .Release.Name }}-secret" |
|
||||
| controllers.main.containers.main.image.pullPolicy | string | `nil` | image pull policy |
|
||||
| controllers.main.containers.main.image.repository | string | `nil` | image repository |
|
||||
| controllers.main.containers.main.image.tag | string | `nil` | image tag |
|
||||
|
|
@ -85,6 +85,7 @@ The following table contains an overview of available values and their descripti
|
|||
| controllers.main.containers.main.securityContext | object | `{}` | Configure the Security Context for the container |
|
||||
| controllers.main.containers.main.terminationMessagePath | string | `nil` | [[ref](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle-1)] |
|
||||
| controllers.main.containers.main.terminationMessagePolicy | string | `nil` | [[ref](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle-1)] |
|
||||
| controllers.main.containers.main.workingDir | string | `nil` | Override the working directory for the default container |
|
||||
| controllers.main.cronjob | object | See below | CronJob configuration. Required only when using `controller.type: cronjob`. |
|
||||
| controllers.main.cronjob.backoffLimit | int | `6` | Limits the number of times a failed job will be retried |
|
||||
| controllers.main.cronjob.concurrencyPolicy | string | `"Forbid"` | Specifies how to treat concurrent executions of a job that is created by this cron job valid values are Allow, Forbid or Replace |
|
||||
|
|
@ -92,6 +93,7 @@ The following table contains an overview of available values and their descripti
|
|||
| controllers.main.cronjob.schedule | string | `"*/20 * * * *"` | Sets the CronJob time when to execute your jobs |
|
||||
| controllers.main.cronjob.startingDeadlineSeconds | int | `30` | The deadline in seconds for starting the job if it misses its scheduled time for any reason |
|
||||
| controllers.main.cronjob.successfulJobsHistory | int | `1` | The number of succesful Jobs to keep |
|
||||
| controllers.main.cronjob.suspend | string | false | Suspends the CronJob [[ref]](https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/#schedule-suspension) |
|
||||
| controllers.main.cronjob.timeZone | string | `nil` | Sets the CronJob timezone (only works in Kubernetes >= 1.27) |
|
||||
| controllers.main.cronjob.ttlSecondsAfterFinished | string | `nil` | If this field is set, ttlSecondsAfterFinished after the Job finishes, it is eligible to be automatically deleted. |
|
||||
| controllers.main.enabled | bool | `true` | enable the controller. |
|
||||
|
|
@ -157,7 +159,7 @@ The following table contains an overview of available values and their descripti
|
|||
| networkpolicies.main.rules.ingress | list | `[{}]` | The ingress rules for this networkPolicy. Allows all ingress traffic by default. |
|
||||
| persistence | object | See below | Configure persistence for the chart here. Additional items can be added by adding a dictionary key similar to the 'config' key. [[ref]](https://bjw-s.github.io/helm-charts/docs/common-library/common-library-storage) |
|
||||
| persistence.config.accessMode | string | `"ReadWriteOnce"` | AccessMode for the persistent volume. Make sure to select an access mode that is supported by your storage provider! [[ref]](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#access-modes) |
|
||||
| persistence.config.advancedMounts | object | `{}` | Explicitly configure mounts for specific controllers and containers. Example: advancedMounts: main: # the controller with the "main" identifier main: # the container with the "main" identifier - path: /data/config.yaml readOnly: true subPath: config.yaml second-container: # the container with the "second-container" identifier - path: /appdata/config readOnly: true second-controller: # the controller with the "second-controller" identifier main: # the container with the "main" identifier - path: /data/config.yaml readOnly: false subPath: config.yaml |
|
||||
| persistence.config.advancedMounts | object | `{}` | Explicitly configure mounts for specific controllers and containers. Example: advancedMounts: main: # the controller with the "main" identifier main: # the container with the "main" identifier - path: /data/config.yaml readOnly: true mountPropagation: None subPath: config.yaml second-container: # the container with the "second-container" identifier - path: /appdata/config readOnly: true second-controller: # the controller with the "second-controller" identifier main: # the container with the "main" identifier - path: /data/config.yaml readOnly: false subPath: config.yaml |
|
||||
| persistence.config.dataSource | object | `{}` | The optional data source for the persistentVolumeClaim. [[ref]](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#volume-populators-and-data-sources) |
|
||||
| persistence.config.dataSourceRef | object | `{}` | The optional volume populator for the persistentVolumeClaim. [[ref]](https://kubernetes.io/docs/concepts/storage/persistent-volumes/#volume-populators-and-data-sources) |
|
||||
| persistence.config.enabled | bool | `false` | Enables or disables the persistence item. Defaults to true |
|
||||
|
|
@ -175,8 +177,8 @@ The following table contains an overview of available values and their descripti
|
|||
| route.main.labels | object | `{}` | Provide additional labels which may be required. |
|
||||
| route.main.nameOverride | string | `nil` | Override the name suffix that is used for this route. |
|
||||
| route.main.parentRefs | list | `[{"group":"gateway.networking.k8s.io","kind":"Gateway","name":null,"namespace":null,"sectionName":null}]` | Configure the resource the route attaches to. |
|
||||
| route.main.rules | list | `[{"backendRefs":[{"group":"","kind":"Service","name":"main","namespace":null,"port":null,"weight":1}],"timeouts":{}"filters":[],"matches":[{"path":{"type":"PathPrefix","value":"/"}}]}]` | Configure rules for routing. Defaults to the primary service. |
|
||||
| route.main.rules[0].backendRefs | list | `[{"group":"","kind":"Service","name":"main","namespace":null,"port":null,"weight":1}]` | Configure backends where matching requests should be sent. |
|
||||
| route.main.rules | list | `[{"backendRefs":[],"filters":[],"matches":[{"path":{"type":"PathPrefix","value":"/"}}],"timeouts":{}}]` | Configure rules for routing. Defaults to the primary service. |
|
||||
| route.main.rules[0].backendRefs | list | `[]` | Configure backends where matching requests should be sent. |
|
||||
| secrets | object | See below | Use this to populate secrets with the values you specify. Be aware that these values are not encrypted by default, and could therefore visible to anybody with access to the values.yaml file. Additional Secrets can be added by adding a dictionary key similar to the 'secret' object. |
|
||||
| secrets.secret.annotations | object | `{}` | Annotations to add to the Secret |
|
||||
| secrets.secret.enabled | bool | `false` | Enables or disables the Secret |
|
||||
|
|
@ -214,6 +216,7 @@ The following table contains an overview of available values and their descripti
|
|||
| serviceMonitor.main.nameOverride | string | `nil` | Override the name suffix that is used for this serviceMonitor. |
|
||||
| serviceMonitor.main.selector | object | `{}` | Configures a custom selector for the serviceMonitor, this takes precedence over specifying a service name. Helm templates can be used. |
|
||||
| serviceMonitor.main.serviceName | string | `"{{ include \"bjw-s.common.lib.chart.names.fullname\" $ }}"` | Configures the target Service for the serviceMonitor. Helm templates can be used. |
|
||||
| serviceMonitor.main.targetLabels | list | `[]` | Configures custom targetLabels for the serviceMonitor. (All collected meterics will have these labels, taking the value from the target service) [[ref]](https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#servicemonitorspec/) |
|
||||
|
||||
</details>
|
||||
|
||||
|
|
@ -224,4 +227,4 @@ The following table contains an overview of available values and their descripti
|
|||
- Join the k8s-at-home [Discord](https://discord.gg/k8s-at-home) community
|
||||
|
||||
----------------------------------------------
|
||||
Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)
|
||||
Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3)
|
||||
|
|
|
|||
|
|
@ -32,6 +32,9 @@ metadata:
|
|||
annotations: {{- toYaml . | nindent 4 -}}
|
||||
{{- end }}
|
||||
spec:
|
||||
{{- with $cronjobObject.cronjob.suspend }}
|
||||
suspend: {{ ternary "true" "false" . }}
|
||||
{{- end }}
|
||||
concurrencyPolicy: "{{ $cronjobObject.cronjob.concurrencyPolicy }}"
|
||||
startingDeadlineSeconds: {{ $cronjobObject.cronjob.startingDeadlineSeconds }}
|
||||
{{- with $timeZone }}
|
||||
|
|
|
|||
46
charts/library/common/templates/classes/_job.tpl
Normal file
46
charts/library/common/templates/classes/_job.tpl
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
{{/*
|
||||
This template serves as the blueprint for the job objects that are created
|
||||
within the common library.
|
||||
*/}}
|
||||
{{- define "bjw-s.common.class.job" -}}
|
||||
{{- $rootContext := .rootContext -}}
|
||||
{{- $jobObject := .object -}}
|
||||
|
||||
{{- $labels := merge
|
||||
(dict "app.kubernetes.io/component" $jobObject.identifier)
|
||||
($jobObject.labels | default dict)
|
||||
(include "bjw-s.common.lib.metadata.allLabels" $rootContext | fromYaml)
|
||||
-}}
|
||||
{{- $annotations := merge
|
||||
($jobObject.annotations | default dict)
|
||||
(include "bjw-s.common.lib.metadata.globalAnnotations" $rootContext | fromYaml)
|
||||
-}}
|
||||
---
|
||||
apiVersion: batch/v1
|
||||
kind: Job
|
||||
metadata:
|
||||
name: {{ $jobObject.name }}
|
||||
{{- with $labels }}
|
||||
labels: {{- toYaml . | nindent 4 -}}
|
||||
{{- end }}
|
||||
{{- with $annotations }}
|
||||
annotations: {{- toYaml . | nindent 4 -}}
|
||||
{{- end }}
|
||||
spec:
|
||||
{{- with $jobObject.job.suspend }}
|
||||
suspend: {{ ternary "true" "false" . }}
|
||||
{{- end }}
|
||||
{{- with $jobObject.job.ttlSecondsAfterFinished }}
|
||||
ttlSecondsAfterFinished: {{ . }}
|
||||
{{- end }}
|
||||
backoffLimit: {{ $jobObject.job.backoffLimit }}
|
||||
template:
|
||||
metadata:
|
||||
{{- with (include "bjw-s.common.lib.pod.metadata.annotations" (dict "rootContext" $rootContext "controllerObject" $jobObject)) }}
|
||||
annotations: {{ . | nindent 8 }}
|
||||
{{- end -}}
|
||||
{{- with (include "bjw-s.common.lib.pod.metadata.labels" (dict "rootContext" $rootContext "controllerObject" $jobObject)) }}
|
||||
labels: {{ . | nindent 8 }}
|
||||
{{- end }}
|
||||
spec: {{ include "bjw-s.common.lib.pod.spec" (dict "rootContext" $rootContext "controllerObject" $jobObject) | nindent 6 }}
|
||||
{{- end -}}
|
||||
|
|
@ -30,4 +30,8 @@ spec:
|
|||
{{- include "bjw-s.common.lib.metadata.selectorLabels" $rootContext | nindent 6 }}
|
||||
{{- end }}
|
||||
endpoints: {{- toYaml $serviceMonitorObject.endpoints | nindent 4 }}
|
||||
{{- if not (empty $serviceMonitorObject.targetLabels )}}
|
||||
targetLabels:
|
||||
{{- toYaml $serviceMonitorObject.targetLabels | nindent 4 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
{{/*
|
||||
Return a configMap Object by its Identifier.
|
||||
*/}}
|
||||
{{- define "bjw-s.common.lib.configMap.getByIdentifier" -}}
|
||||
{{- $rootContext := .rootContext -}}
|
||||
{{- $identifier := .id -}}
|
||||
|
||||
{{- $configMapValues := dig $identifier nil $rootContext.Values.configMaps -}}
|
||||
{{- if not (empty $configMapValues) -}}
|
||||
{{- include "bjw-s.common.lib.configMap.valuesToObject" (dict "rootContext" $rootContext "id" $identifier "values" $configMapValues) -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
|
@ -36,8 +36,8 @@ terminationMessagePolicy: {{ . | trim }}
|
|||
{{- with (include "bjw-s.common.lib.container.field.env" (dict "ctx" $ctx) | trim) }}
|
||||
env: {{ . | trim | nindent 2 }}
|
||||
{{- end -}}
|
||||
{{- with $containerObject.envFrom }}
|
||||
envFrom: {{ toYaml . | trim | nindent 2 }}
|
||||
{{- with (include "bjw-s.common.lib.container.field.envFrom" (dict "ctx" $ctx) | trim) }}
|
||||
envFrom: {{ . | trim | nindent 2 }}
|
||||
{{- end -}}
|
||||
{{- with $containerObject.ports }}
|
||||
ports: {{ toYaml . | trim | nindent 2 }}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,58 @@
|
|||
{{/*
|
||||
Env field used by the container.
|
||||
*/}}
|
||||
{{- define "bjw-s.common.lib.container.field.envFrom" -}}
|
||||
{{- $ctx := .ctx -}}
|
||||
{{- $rootContext := $ctx.rootContext -}}
|
||||
{{- $containerObject := $ctx.containerObject -}}
|
||||
|
||||
{{- if not (empty (get $containerObject "envFrom")) -}}
|
||||
{{- $envFrom := list -}}
|
||||
{{- range $containerObject.envFrom -}}
|
||||
{{- $item := dict -}}
|
||||
|
||||
{{- if hasKey . "configMap" -}}
|
||||
{{- $configMap := include "bjw-s.common.lib.configMap.getByIdentifier" (dict "rootContext" $rootContext "id" .configMap) | fromYaml -}}
|
||||
{{- $configMapName := default (tpl .configMap $rootContext) $configMap.name -}}
|
||||
{{- $_ := set $item "configMapRef" (dict "name" $configMapName) -}}
|
||||
{{- else if hasKey . "configMapRef" -}}
|
||||
{{- if not (empty (dig "identifier" nil .configMapRef)) -}}
|
||||
{{- $configMap := include "bjw-s.common.lib.configMap.getByIdentifier" (dict "rootContext" $rootContext "id" .configMapRef.identifier) | fromYaml -}}
|
||||
{{- if empty $configMap -}}
|
||||
{{- fail (printf "No configMap configured with identifier '%s'" .configMapRef.identifier) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- $_ := set $item "configMapRef" (dict "name" $configMap.name) -}}
|
||||
{{- else -}}
|
||||
{{- $_ := set $item "configMapRef" (dict "name" (tpl .configMapRef.name $rootContext)) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- else if hasKey . "secret" -}}
|
||||
{{- $secret := include "bjw-s.common.lib.secret.getByIdentifier" (dict "rootContext" $rootContext "id" .secret) | fromYaml -}}
|
||||
{{- $secretName := default (tpl .secret $rootContext) $secret.name -}}
|
||||
{{- $_ := set $item "secretRef" (dict "name" $secretName) -}}
|
||||
{{- else if hasKey . "secretRef" -}}
|
||||
{{- if not (empty (dig "identifier" nil .secretRef)) -}}
|
||||
{{- $secret := include "bjw-s.common.lib.secret.getByIdentifier" (dict "rootContext" $rootContext "id" .secretRef.identifier) | fromYaml -}}
|
||||
{{- if empty $secret -}}
|
||||
{{- fail (printf "No secret configured with identifier '%s'" .secretRef.identifier) -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- $_ := set $item "secretRef" (dict "name" $secret.name) -}}
|
||||
{{- else -}}
|
||||
{{- $_ := set $item "secretRef" (dict "name" (tpl .secretRef.name $rootContext)) -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- if not (empty (dig "prefix" nil .)) -}}
|
||||
{{- $_ := set $item "prefix" .prefix -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- if not (empty $item) -}}
|
||||
{{- $envFrom = append $envFrom $item -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- $envFrom | toYaml -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
|
@ -91,6 +91,12 @@ volumeMounts used by the container.
|
|||
{{- $_ := set $volumeMount "readOnly" $readOnly -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- /* Use the specified mountPropagation setting if provided */ -}}
|
||||
{{- with .mountPropagation -}}
|
||||
{{- $mountPropagation := . -}}
|
||||
{{- $_ := set $volumeMount "mountPropagation" $mountPropagation -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- $enabledVolumeMounts = append $enabledVolumeMounts $volumeMount -}}
|
||||
{{- end -}}
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ Validate controller values
|
|||
{{- $rootContext := .rootContext -}}
|
||||
{{- $controllerValues := .object -}}
|
||||
|
||||
{{- $allowedControllerTypes := list "deployment" "daemonset" "statefulset" "cronjob" -}}
|
||||
{{- $allowedControllerTypes := list "deployment" "daemonset" "statefulset" "cronjob" "job" -}}
|
||||
{{- if not (has $controllerValues.type $allowedControllerTypes) -}}
|
||||
{{- fail (printf "Not a valid controller.type (%s)" $controllerValues.type) -}}
|
||||
{{- end -}}
|
||||
|
|
|
|||
12
charts/library/common/templates/lib/job/_validate.tpl
Normal file
12
charts/library/common/templates/lib/job/_validate.tpl
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
{{/*
|
||||
Validate job values
|
||||
*/}}
|
||||
{{- define "bjw-s.common.lib.job.validate" -}}
|
||||
{{- $rootContext := .rootContext -}}
|
||||
{{- $jobValues := .object -}}
|
||||
|
||||
{{- $allowedRestartPolicy := list "Never" "OnFailure" -}}
|
||||
{{- if not (has $jobValues.pod.restartPolicy $allowedRestartPolicy) -}}
|
||||
{{- fail (printf "Not a valid restart policy for Job (controller: %s, strategy: %s)" $jobValues.identifier $jobValues.pod.restartPolicy) -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
14
charts/library/common/templates/lib/job/_valuesToObject.tpl
Normal file
14
charts/library/common/templates/lib/job/_valuesToObject.tpl
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
{{/*
|
||||
Convert job values to an object
|
||||
*/}}
|
||||
{{- define "bjw-s.common.lib.job.valuesToObject" -}}
|
||||
{{- $rootContext := .rootContext -}}
|
||||
{{- $identifier := .id -}}
|
||||
{{- $objectValues := .values -}}
|
||||
|
||||
{{- $restartPolicy := default "Never" $objectValues.pod.restartPolicy -}}
|
||||
{{- $_ := set $objectValues.pod "restartPolicy" $restartPolicy -}}
|
||||
|
||||
{{- /* Return the Job object */ -}}
|
||||
{{- $objectValues | toYaml -}}
|
||||
{{- end -}}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
{{/*
|
||||
Return a secret Object by its Identifier.
|
||||
*/}}
|
||||
{{- define "bjw-s.common.lib.secret.getByIdentifier" -}}
|
||||
{{- $rootContext := .rootContext -}}
|
||||
{{- $identifier := .id -}}
|
||||
|
||||
{{- $secretValues := dig $identifier nil $rootContext.Values.secrets -}}
|
||||
{{- if not (empty $secretValues) -}}
|
||||
{{- include "bjw-s.common.lib.secret.valuesToObject" (dict "rootContext" $rootContext "id" $identifier "values" $secretValues) -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
|
@ -35,6 +35,10 @@ Renders the controller objects required by the chart.
|
|||
{{- $statefulsetObject := (include "bjw-s.common.lib.statefulset.valuesToObject" (dict "rootContext" $ "id" $key "values" $controllerObject)) | fromYaml -}}
|
||||
{{- include "bjw-s.common.lib.statefulset.validate" (dict "rootContext" $ "object" $statefulsetObject) -}}
|
||||
{{- include "bjw-s.common.class.statefulset" (dict "rootContext" $ "object" $statefulsetObject) | nindent 0 -}}
|
||||
{{- else if eq $controllerObject.type "job" -}}
|
||||
{{- $jobObject := (include "bjw-s.common.lib.job.valuesToObject" (dict "rootContext" $ "id" $key "values" $controllerObject)) | fromYaml -}}
|
||||
{{- include "bjw-s.common.lib.job.validate" (dict "rootContext" $ "object" $jobObject) -}}
|
||||
{{- include "bjw-s.common.class.job" (dict "rootContext" $ "object" $jobObject) | nindent 0 -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
|
|
|||
|
|
@ -4,7 +4,13 @@ Renders the Persistent Volume Claim objects required by the chart.
|
|||
{{- define "bjw-s.common.render.pvcs" -}}
|
||||
{{- /* Generate pvc as required */ -}}
|
||||
{{- range $key, $pvc := .Values.persistence -}}
|
||||
{{- if and $pvc.enabled (eq (default "persistentVolumeClaim" $pvc.type) "persistentVolumeClaim") (not $pvc.existingClaim) -}}
|
||||
{{- /* Enable PVC by default, but allow override */ -}}
|
||||
{{- $pvcEnabled := true -}}
|
||||
{{- if hasKey $pvc "enabled" -}}
|
||||
{{- $pvcEnabled = $pvc.enabled -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- if and $pvcEnabled (eq (default "persistentVolumeClaim" $pvc.type) "persistentVolumeClaim") (not $pvc.existingClaim) -}}
|
||||
{{- $pvcValues := (mustDeepCopy $pvc) -}}
|
||||
|
||||
{{- /* Create object from the raw PVC values */ -}}
|
||||
|
|
|
|||
|
|
@ -105,18 +105,18 @@ controllers:
|
|||
enabled: true
|
||||
|
||||
# -- Set the controller type.
|
||||
# Valid options are deployment, daemonset, statefulset or cronjob
|
||||
# Valid options are deployment, daemonset, statefulset, cronjob or job
|
||||
type: deployment
|
||||
# -- Set annotations on the deployment/statefulset/daemonset/cronjob
|
||||
# -- Set annotations on the deployment/statefulset/daemonset/cronjob/job
|
||||
annotations: {}
|
||||
# -- Set labels on the deployment/statefulset/daemonset/cronjob
|
||||
# -- Set labels on the deployment/statefulset/daemonset/cronjob/job
|
||||
labels: {}
|
||||
# -- Number of desired pods. When using a HorizontalPodAutoscaler, set this to `null`.
|
||||
replicas: 1
|
||||
# -- Set the controller upgrade strategy
|
||||
# For Deployments, valid values are Recreate (default) and RollingUpdate.
|
||||
# For StatefulSets, valid values are OnDelete and RollingUpdate (default).
|
||||
# DaemonSets/CronJobs ignore this.
|
||||
# DaemonSets/CronJobs/Jobs ignore this.
|
||||
strategy:
|
||||
|
||||
rollingUpdate:
|
||||
|
|
@ -132,6 +132,10 @@ controllers:
|
|||
# -- CronJob configuration. Required only when using `controller.type: cronjob`.
|
||||
# @default -- See below
|
||||
cronjob:
|
||||
# -- Suspends the CronJob
|
||||
# [[ref]](https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/#schedule-suspension)
|
||||
# @default -- false
|
||||
suspend:
|
||||
# -- Specifies how to treat concurrent executions of a job that is created by this cron job
|
||||
# valid values are Allow, Forbid or Replace
|
||||
concurrencyPolicy: Forbid
|
||||
|
|
@ -145,7 +149,20 @@ controllers:
|
|||
successfulJobsHistory: 1
|
||||
# -- The number of failed Jobs to keep
|
||||
failedJobsHistory: 1
|
||||
# -- If this field is set, ttlSecondsAfterFinished after the Job finishes, it is eligible to
|
||||
# -- If this field is set, ttlSecondsAfterFinished after the Job finishes, it is eligible to
|
||||
# be automatically deleted.
|
||||
ttlSecondsAfterFinished:
|
||||
# -- Limits the number of times a failed job will be retried
|
||||
backoffLimit: 6
|
||||
|
||||
# -- Job configuration. Required only when using `controller.type: job`.
|
||||
# @default -- See below
|
||||
job:
|
||||
# -- Suspends the Job
|
||||
# [[ref]](https://kubernetes.io/docs/concepts/workloads/controllers/job/#suspending-a-job)
|
||||
# @default -- false
|
||||
suspend:
|
||||
# -- If this field is set, ttlSecondsAfterFinished after the Job finishes, it is eligible to
|
||||
# be automatically deleted.
|
||||
ttlSecondsAfterFinished:
|
||||
# -- Limits the number of times a failed job will be retried
|
||||
|
|
@ -239,12 +256,28 @@ controllers:
|
|||
env:
|
||||
|
||||
# -- Secrets and/or ConfigMaps that will be loaded as environment variables.
|
||||
# [[ref]](https://unofficial-kubernetes.readthedocs.io/en/latest/tasks/configure-pod-container/configmap/#use-case-consume-configmap-in-environment-variables)
|
||||
# Syntax options:
|
||||
# A) Pass an app-template configMap identifier:
|
||||
# - config: config
|
||||
# B) Pass any configMap name that is not also an identifier (Template enabled):
|
||||
# - config: random-configmap-name
|
||||
# C) Pass an app-template configMap identifier, explicit syntax:
|
||||
# - configMapRef:
|
||||
# identifier: config
|
||||
# D) Pass any configMap name, explicit syntax (Template enabled):
|
||||
# - configMapRef:
|
||||
# name: "{{ .Release.Name }}-config"
|
||||
# E) Pass an app-template secret identifier:
|
||||
# - secret: secret
|
||||
# F) Pass any secret name that is not also an identifier (Template enabled):
|
||||
# - secret: random-secret-name
|
||||
# G) Pass an app-template secret identifier, explicit syntax:
|
||||
# - secretRef:
|
||||
# identifier: secret
|
||||
# H) Pass any secret name, explicit syntax (Template enabled):
|
||||
# - secretRef:
|
||||
# name: "{{ .Release.Name }}-secret"
|
||||
envFrom: []
|
||||
# - configMapRef:
|
||||
# name: config-map-name
|
||||
# - secretRef:
|
||||
# name: secret-name
|
||||
|
||||
# -- Probe configuration
|
||||
# -- [[ref]](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/)
|
||||
|
|
@ -499,6 +532,11 @@ serviceMonitor:
|
|||
interval: 1m
|
||||
scrapeTimeout: 10s
|
||||
|
||||
# -- Configures custom targetLabels for the serviceMonitor. (All collected
|
||||
# meterics will have these labels, taking the value from the target service)
|
||||
# [[ref]](https://github.com/prometheus-operator/prometheus-operator/blob/main/Documentation/api.md#servicemonitorspec/)
|
||||
targetLabels: []
|
||||
|
||||
# -- Configure the ingresses for the chart here.
|
||||
# Additional ingresses can be added by adding a dictionary key similar to the 'main' ingress.
|
||||
# @default -- See below
|
||||
|
|
@ -660,6 +698,7 @@ persistence:
|
|||
# main: # the container with the "main" identifier
|
||||
# - path: /data/config.yaml
|
||||
# readOnly: true
|
||||
# mountPropagation: None
|
||||
# subPath: config.yaml
|
||||
# second-container: # the container with the "second-container" identifier
|
||||
# - path: /appdata/config
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue