[bitnami/contour,aspnet-core] Apply standardizations (#7543)

* Standardizations

* More changes

* More standard

* Final changes

* Readme

* fix template

* kubeval

* fix version

* Integrate PR #8065

* [bitnami/contour] Update components versions

Signed-off-by: Bitnami Containers <containers@bitnami.com>

Co-authored-by: Alejandro Moreno <amorenoc@vmware.com>
Co-authored-by: Bitnami Containers <containers@bitnami.com>
This commit is contained in:
Javier J. Salmerón-García
2021-11-09 17:19:26 +01:00
committed by GitHub
parent c4e5c940d4
commit 1f2fc92870
35 changed files with 1417 additions and 385 deletions

View File

@@ -1,6 +1,6 @@
dependencies:
- name: common
repository: https://charts.bitnami.com/bitnami
version: 1.10.0
digest: sha256:d6f283322d34efda54721ddd67aec935f1bea501c7b45dfbe89814aed21ae5dc
generated: "2021-10-04T22:25:04.37102882Z"
version: 1.10.1
digest: sha256:46a0218b2fbb421c87da91166dc5230d3ec85aa7d822dff1d479619fff8314e7
generated: "2021-11-09T15:55:37.1309947Z"

View File

@@ -1,7 +1,7 @@
annotations:
category: Infrastructure
apiVersion: v2
appVersion: 1.19.0
appVersion: 1.19.1
dependencies:
- name: common
repository: https://charts.bitnami.com/bitnami
@@ -27,4 +27,4 @@ sources:
- https://github.com/envoyproxy/envoy
- https://github.com/bitnami/bitnami-docker-contour
- https://projectcontour.io
version: 6.0.2
version: 7.0.0

View File

@@ -56,78 +56,111 @@ $ helm uninstall my-release
| ------------------------- | ----------------------------------------------- | ----- |
| `global.imageRegistry` | Global Docker image registry | `""` |
| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` |
| `global.storageClass` | Global StorageClass for Persistent Volume(s) | `""` |
### Common parameters
| Name | Description | Value |
| -------------------- | -------------------------------------------------------------------------------------- | ----- |
| `nameOverride` | String to partially override contour.fullname include (will maintain the release name) | `""` |
| `fullnameOverride` | String to fully override contour.fullname template | `""` |
| `ingress.apiVersion` | Force Ingress API version (automatically detected if not set) | `""` |
| `kubeVersion` | Force target Kubernetes version (using Helm capabilities if not set) | `""` |
| `extraDeploy` | Array of extra objects to deploy with the release | `[]` |
| Name | Description | Value |
| ------------------------ | --------------------------------------------------------------------------------------- | ------- |
| `nameOverride` | String to partially override contour.fullname include (will maintain the release name) | `""` |
| `fullnameOverride` | String to fully override contour.fullname template | `""` |
| `kubeVersion` | Force target Kubernetes version (using Helm capabilities if not set) | `""` |
| `extraDeploy` | Array of extra objects to deploy with the release | `[]` |
| `commonLabels` | Labels to add to all deployed objects | `{}` |
| `commonAnnotations` | Annotations to add to all deployed objects | `{}` |
| `diagnosticMode.enabled` | Enable diagnostic mode (all probes will be disabled and the command will be overridden) | `false` |
| `diagnosticMode.command` | Command to override all containers in the deployment | `[]` |
| `diagnosticMode.args` | Args to override all containers in the deployment | `[]` |
### Contour parameters
| Name | Description | Value |
| -------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | --------------------- |
| `replicaCount` | Number of Contour Pod replicas | `2` |
| `existingConfigMap` | Specifies the name of an externally-defined ConfigMap to use as the configuration (this is mutually exclusive with `configInline`) | `""` |
| `configInline` | Specifies Contour's configuration directly in YAML format | `{}` |
| `contour.enabled` | Contour Deployment creation. | `true` |
| `contour.image.registry` | Contour image registry | `docker.io` |
| `contour.image.repository` | Contour image name | `bitnami/contour` |
| `contour.image.tag` | Contour image tag | `1.19.0-debian-10-r0` |
| `contour.image.pullPolicy` | Contour Image pull policy | `IfNotPresent` |
| `contour.image.pullSecrets` | Contour Image pull secrets | `[]` |
| `contour.hostAliases` | Add deployment host aliases | `[]` |
| `contour.extraArgs` | Extra arguments passed to Contour container | `[]` |
| `contour.resources.limits` | Specify resource limits which the container is not allowed to succeed. | `{}` |
| `contour.resources.requests` | Specify resource requests which the container needs to spawn. | `{}` |
| `contour.manageCRDs` | Manage the creation, upgrade and deletion of Contour CRDs. | `true` |
| `contour.podAffinityPreset` | Contour Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `contour.podAntiAffinityPreset` | Contour Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` |
| `contour.nodeAffinityPreset.type` | Contour Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `contour.nodeAffinityPreset.key` | Contour Node label key to match Ignored if `affinity` is set. | `""` |
| `contour.nodeAffinityPreset.values` | Contour Node label values to match. Ignored if `affinity` is set. | `[]` |
| `contour.affinity` | Affinity for Contour pod assignment | `{}` |
| `contour.nodeSelector` | Node labels for Contour pod assignment | `{}` |
| `contour.tolerations` | Tolerations for Contour pod assignment | `[]` |
| `contour.podAnnotations` | Contour Pod annotations | `{}` |
| `contour.serviceAccount.create` | Create a serviceAccount for the Contour pod | `true` |
| `contour.serviceAccount.name` | Use the serviceAccount with the specified name, a name is generated using the fullname template | `""` |
| `contour.livenessProbe.enabled` | Enable/disable the Liveness probe | `true` |
| `contour.livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | `120` |
| `contour.livenessProbe.periodSeconds` | How often to perform the probe | `20` |
| `contour.livenessProbe.timeoutSeconds` | When the probe times out | `5` |
| `contour.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | `6` |
| `contour.livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | `1` |
| `contour.readinessProbe.enabled` | Enable/disable the readiness probe | `true` |
| `contour.readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated | `15` |
| `contour.readinessProbe.periodSeconds` | How often to perform the probe | `10` |
| `contour.readinessProbe.timeoutSeconds` | When the probe times out | `5` |
| `contour.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | `3` |
| `contour.readinessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | `1` |
| `contour.securityContext.enabled` | If the pod should run in a securityContext. | `true` |
| `contour.securityContext.runAsNonRoot` | If the pod should run as a non root container. | `true` |
| `contour.securityContext.runAsUser` | define the uid with which the pod will run | `1001` |
| `contour.securityContext.runAsGroup` | define the gid with which the pod will run | `1001` |
| `contour.certgen.serviceAccount.create` | Create a serviceAccount for the Contour pod | `true` |
| `contour.certgen.serviceAccount.name` | Use the serviceAccount with the specified name, a name is generated using the fullname template | `""` |
| `contour.tlsExistingSecret` | Name of the existingSecret to be use in Contour deployment. If it is not nil `contour.certgen` will be disabled. | `""` |
| `contour.service.extraPorts` | Extra ports to expose (normally used with the `sidecar` value) | `[]` |
| `contour.initContainers` | Attach additional init containers to Contour pods | `[]` |
| `contour.sidecars` | Add additional sidecar containers to the Contour pods | `[]` |
| `contour.extraVolumes` | Array to add extra volumes | `[]` |
| `contour.extraVolumeMounts` | Array to add extra mounts (normally used with extraVolumes) | `[]` |
| `contour.extraEnvVars` | Array containing extra env vars to be added to all Contour containers | `[]` |
| `contour.extraEnvVarsConfigMap` | ConfigMap containing extra env vars to be added to all Contour containers | `""` |
| `contour.extraEnvVarsSecret` | Secret containing extra env vars to be added to all Contour containers | `""` |
| `contour.ingressClass.name` | Name of the ingress class to route through this controller | `contour` |
| `contour.ingressClass.create` | Whether to create or not the IngressClass resource | `true` |
| `contour.ingressClass.default` | Mark IngressClass resource as default for cluster | `true` |
| Name | Description | Value |
| ----------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- | --------------------- |
| `existingConfigMap` | Specifies the name of an externally-defined ConfigMap to use as the configuration (this is mutually exclusive with `configInline`) | `""` |
| `configInline` | Specifies Contour's configuration directly in YAML format | `{}` |
| `contour.enabled` | Contour Deployment creation. | `true` |
| `contour.image.registry` | Contour image registry | `docker.io` |
| `contour.image.repository` | Contour image name | `bitnami/contour` |
| `contour.image.tag` | Contour image tag | `1.19.0-debian-10-r0` |
| `contour.image.pullPolicy` | Contour Image pull policy | `IfNotPresent` |
| `contour.image.pullSecrets` | Contour Image pull secrets | `[]` |
| `contour.image.debug` | Enable image debug mode | `false` |
| `contour.replicaCount` | Number of Contour Pod replicas | `1` |
| `contour.priorityClassName` | Priority class assigned to the pods | `""` |
| `contour.containerPorts.xds` | Set xds port inside Contour pod | `8001` |
| `contour.containerPorts.metrics` | Set metrics port inside Contour pod | `8000` |
| `contour.hostAliases` | Add deployment host aliases | `[]` |
| `contour.updateStrategy` | Strategy to use to update Pods | `{}` |
| `contour.extraArgs` | Extra arguments passed to Contour container | `[]` |
| `contour.resources.limits` | Specify resource limits which the container is not allowed to succeed. | `{}` |
| `contour.resources.requests` | Specify resource requests which the container needs to spawn. | `{}` |
| `contour.manageCRDs` | Manage the creation, upgrade and deletion of Contour CRDs. | `true` |
| `contour.podAffinityPreset` | Contour Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `contour.podAntiAffinityPreset` | Contour Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` |
| `contour.podLabels` | Extra labels for Contour pods | `{}` |
| `contour.lifecycleHooks` | lifecycleHooks for the container to automate configuration before or after startup. | `{}` |
| `contour.customLivenessProbe` | Override default liveness probe | `{}` |
| `contour.customReadinessProbe` | Override default readiness probe | `{}` |
| `contour.customStartupProbe` | Override default startup probe | `{}` |
| `contour.nodeAffinityPreset.type` | Contour Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `contour.nodeAffinityPreset.key` | Contour Node label key to match Ignored if `affinity` is set. | `""` |
| `contour.nodeAffinityPreset.values` | Contour Node label values to match. Ignored if `affinity` is set. | `[]` |
| `contour.command` | Override default command | `[]` |
| `contour.args` | Override default args | `[]` |
| `contour.affinity` | Affinity for Contour pod assignment | `{}` |
| `contour.nodeSelector` | Node labels for Contour pod assignment | `{}` |
| `contour.tolerations` | Tolerations for Contour pod assignment | `[]` |
| `contour.podAnnotations` | Contour Pod annotations | `{}` |
| `contour.serviceAccount.create` | Create a serviceAccount for the Contour pod | `true` |
| `contour.serviceAccount.name` | Use the serviceAccount with the specified name, a name is generated using the fullname template | `""` |
| `contour.podSecurityContext.enabled` | Default backend Pod securityContext | `true` |
| `contour.podSecurityContext.fsGroup` | Set Default backend Pod's Security Context fsGroup | `1001` |
| `contour.containerSecurityContext.enabled` | Envoy Container securityContext | `true` |
| `contour.containerSecurityContext.runAsUser` | User ID for the Contour container (to change this, http and https containerPorts must be set to >1024) | `1001` |
| `contour.containerSecurityContext.runAsNonRoot` | Run as noon root | `true` |
| `contour.livenessProbe.enabled` | Enable/disable the Liveness probe | `true` |
| `contour.livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | `120` |
| `contour.livenessProbe.periodSeconds` | How often to perform the probe | `20` |
| `contour.livenessProbe.timeoutSeconds` | When the probe times out | `5` |
| `contour.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | `6` |
| `contour.livenessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | `1` |
| `contour.readinessProbe.enabled` | Enable/disable the readiness probe | `true` |
| `contour.readinessProbe.initialDelaySeconds` | Delay before readiness probe is initiated | `15` |
| `contour.readinessProbe.periodSeconds` | How often to perform the probe | `10` |
| `contour.readinessProbe.timeoutSeconds` | When the probe times out | `5` |
| `contour.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | `3` |
| `contour.readinessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | `1` |
| `contour.startupProbe.enabled` | Enable/disable the startup probe | `false` |
| `contour.startupProbe.initialDelaySeconds` | Delay before startup probe is initiated | `15` |
| `contour.startupProbe.periodSeconds` | How often to perform the probe | `10` |
| `contour.startupProbe.timeoutSeconds` | When the probe times out | `5` |
| `contour.startupProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | `3` |
| `contour.startupProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | `1` |
| `contour.certgen.serviceAccount.create` | Create a serviceAccount for the Contour pod | `true` |
| `contour.certgen.serviceAccount.name` | Use the serviceAccount with the specified name, a name is generated using the fullname template | `""` |
| `contour.tlsExistingSecret` | Name of the existingSecret to be use in Contour deployment. If it is not nil `contour.certgen` will be disabled. | `""` |
| `contour.service.type` | Service type | `ClusterIP` |
| `contour.service.ports.xds` | Contour service xds port | `8001` |
| `contour.service.ports.metrics` | Contour service xds port | `8000` |
| `contour.service.nodePorts.xds` | Node port for HTTP | `""` |
| `contour.service.clusterIP` | Contour service Cluster IP | `""` |
| `contour.service.loadBalancerIP` | Contour service Load Balancer IP | `""` |
| `contour.service.loadBalancerSourceRanges` | Contour service Load Balancer sources | `[]` |
| `contour.service.externalTrafficPolicy` | Contour service external traffic policy | `Cluster` |
| `contour.service.annotations` | Additional custom annotations for Contour service | `{}` |
| `contour.service.extraPorts` | Extra port to expose on Contour service | `[]` |
| `contour.initContainers` | Attach additional init containers to Contour pods | `[]` |
| `contour.sidecars` | Add additional sidecar containers to the Contour pods | `[]` |
| `contour.extraVolumes` | Array to add extra volumes | `[]` |
| `contour.extraVolumeMounts` | Array to add extra mounts (normally used with extraVolumes) | `[]` |
| `contour.extraEnvVars` | Array containing extra env vars to be added to all Contour containers | `[]` |
| `contour.extraEnvVarsCM` | ConfigMap containing extra env vars to be added to all Contour containers | `""` |
| `contour.extraEnvVarsSecret` | Secret containing extra env vars to be added to all Contour containers | `""` |
| `contour.ingressClass.name` | Name of the ingress class to route through this controller | `contour` |
| `contour.ingressClass.create` | Whether to create or not the IngressClass resource | `true` |
| `contour.ingressClass.default` | Mark IngressClass resource as default for cluster | `true` |
### Envoy parameters
@@ -140,14 +173,18 @@ $ helm uninstall my-release
| `envoy.image.tag` | Envoy Proxy image tag (immutable tags are recommended) | `1.19.1-debian-10-r55` |
| `envoy.image.pullPolicy` | Envoy image pull policy | `IfNotPresent` |
| `envoy.image.pullSecrets` | Envoy image pull secrets | `[]` |
| `envoy.priorityClassName` | Priority class assigned to the pods | `""` |
| `envoy.extraArgs` | Extra arguments passed to Envoy container | `[]` |
| `envoy.hostAliases` | Add deployment host aliases | `[]` |
| `envoy.resources.limits` | Specify resource limits which the container is not allowed to succeed. | `{}` |
| `envoy.resources.requests` | Specify resource requests which the container needs to spawn. | `{}` |
| `envoy.command` | Override default command | `[]` |
| `envoy.args` | Override default args | `[]` |
| `envoy.shutdownManager.resources.limits` | Specify resource limits which the container is not allowed to succeed. | `{}` |
| `envoy.shutdownManager.resources.requests` | Specify resource requests which the container needs to spawn. | `{}` |
| `envoy.kind` | Install as deployment or daemonset | `daemonset` |
| `envoy.replicaCount` | Desired number of Controller pods | `1` |
| `envoy.lifecycleHooks` | lifecycleHooks for the container to automate configuration before or after startup. | `{}` |
| `envoy.updateStrategy` | Strategy to use to update Pods | `{}` |
| `envoy.minReadySeconds` | The minimum number of seconds for which a newly created Pod should be ready | `0` |
| `envoy.revisionHistoryLimit` | The number of old history to retain to allow rollback | `10` |
@@ -166,8 +203,10 @@ $ helm uninstall my-release
| `envoy.tolerations` | Tolerations for Envoy pod assignment | `[]` |
| `envoy.podAnnotations` | Envoy Pod annotations | `{}` |
| `envoy.podSecurityContext.enabled` | Envoy Pod securityContext | `false` |
| `envoy.podSecurityContext.fsGroup` | User ID for the for the mounted volumes | `0` |
| `envoy.podSecurityContext.sysctls` | Array of sysctl options to allow | `[]` |
| `envoy.containerSecurityContext.enabled` | Envoy Container securityContext | `true` |
| `envoy.containerSecurityContext.runAsUser` | User ID for the Envoy container (to change this, http and https containerPorts must be set to >1024) | `0` |
| `envoy.containerSecurityContext.runAsUser` | User ID for the Envoy container (to change this, http and https containerPorts must be set to >1024) | `1001` |
| `envoy.hostNetwork` | Envoy Pod host network access | `false` |
| `envoy.dnsPolicy` | Envoy Pod Dns Policy's DNS Policy | `ClusterFirst` |
| `envoy.tlsExistingSecret` | Name of the existingSecret to be use in Envoy deployment | `""` |
@@ -186,10 +225,20 @@ $ helm uninstall my-release
| `envoy.readinessProbe.timeoutSeconds` | When the probe times out | `1` |
| `envoy.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | `3` |
| `envoy.readinessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | `1` |
| `envoy.startupProbe.enabled` | Enable/disable the startup probe | `false` |
| `envoy.startupProbe.initialDelaySeconds` | Delay before startup probe is initiated | `15` |
| `envoy.startupProbe.periodSeconds` | How often to perform the probe | `10` |
| `envoy.startupProbe.timeoutSeconds` | When the probe times out | `5` |
| `envoy.startupProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | `3` |
| `envoy.startupProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | `1` |
| `envoy.customLivenessProbe` | Override default liveness probe | `{}` |
| `envoy.customReadinessProbe` | Override default readiness probe | `{}` |
| `envoy.customStartupProbe` | Override default startup probe | `{}` |
| `envoy.terminationGracePeriodSeconds` | Envoy termination grace period in seconds | `300` |
| `envoy.logLevel` | Envoy log level | `info` |
| `envoy.service.type` | Type of Envoy service to create | `LoadBalancer` |
| `envoy.service.externalTrafficPolicy` | Envoy Service external cluster policy. If `envoy.service.type` is NodePort or LoadBalancer | `Local` |
| `envoy.service.labels` | Labels to add to te envoy service | `{}` |
| `envoy.service.clusterIP` | Internal envoy cluster service IP | `""` |
| `envoy.service.externalIPs` | Envoy service external IP addresses | `[]` |
| `envoy.service.loadBalancerIP` | IP address to assign to load balancer (if supported) | `""` |
@@ -212,74 +261,110 @@ $ helm uninstall my-release
| `envoy.extraVolumes` | Array to add extra volumes | `[]` |
| `envoy.extraVolumeMounts` | Array to add extra mounts (normally used with extraVolumes) | `[]` |
| `envoy.extraEnvVars` | Array containing extra env vars to be added to all Envoy containers | `[]` |
| `envoy.extraEnvVarsConfigMap` | ConfigMap containing extra env vars to be added to all Envoy containers | `""` |
| `envoy.extraEnvVarsCM` | ConfigMap containing extra env vars to be added to all Envoy containers | `""` |
| `envoy.extraEnvVarsSecret` | Secret containing extra env vars to be added to all Envoy containers | `""` |
### Default backend parameters
| Name | Description | Value |
| --------------------------------------------------- | ---------------------------------------------------------------------------------------------------- | ---------------------- |
| `defaultBackend.enabled` | Enable a default backend based on NGINX | `false` |
| `defaultBackend.image.registry` | Default backend image registry | `docker.io` |
| `defaultBackend.image.repository` | Default backend image name | `bitnami/nginx` |
| `defaultBackend.image.tag` | Default backend image tag | `1.21.3-debian-10-r42` |
| `defaultBackend.image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `defaultBackend.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `defaultBackend.extraArgs` | Additional command line arguments to pass to NGINX container | `{}` |
| `defaultBackend.containerPort` | HTTP container port number | `8080` |
| `defaultBackend.hostAliases` | Add deployment host aliases | `[]` |
| `defaultBackend.replicaCount` | Desired number of default backend pods | `1` |
| `defaultBackend.podSecurityContext.enabled` | Default backend Pod securityContext | `true` |
| `defaultBackend.podSecurityContext.fsGroup` | Set Default backend Pod's Security Context fsGroup | `1001` |
| `defaultBackend.containerSecurityContext.enabled` | Default backend container securityContext | `true` |
| `defaultBackend.containerSecurityContext.runAsUser` | User ID for the Envoy container (to change this, http and https containerPorts must be set to >1024) | `1001` |
| `defaultBackend.resources.limits` | The resources limits for the Default backend container | `{}` |
| `defaultBackend.resources.requests` | The requested resources for the Default backend container | `{}` |
| `defaultBackend.livenessProbe.enabled` | Enable livenessProbe | `true` |
| `defaultBackend.livenessProbe.httpGet` | Path, port and scheme for the livenessProbe | `{}` |
| `defaultBackend.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `30` |
| `defaultBackend.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` |
| `defaultBackend.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` |
| `defaultBackend.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `3` |
| `defaultBackend.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` |
| `defaultBackend.readinessProbe.enabled` | Enable readinessProbe | `true` |
| `defaultBackend.readinessProbe.httpGet` | Path, port and scheme for the readinessProbe | `{}` |
| `defaultBackend.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `0` |
| `defaultBackend.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `5` |
| `defaultBackend.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `5` |
| `defaultBackend.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `6` |
| `defaultBackend.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` |
| `defaultBackend.customLivenessProbe` | Override default liveness probe, it overrides the default one (evaluated as a template) | `{}` |
| `defaultBackend.customReadinessProbe` | Override default readiness probe, it overrides the default one (evaluated as a template) | `{}` |
| `defaultBackend.podLabels` | Extra labels for Controller pods | `{}` |
| `defaultBackend.podAnnotations` | Annotations for Controller pods | `{}` |
| `defaultBackend.priorityClassName` | Priority class assigned to the pods | `""` |
| `defaultBackend.podAffinityPreset` | Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `defaultBackend.podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` |
| `defaultBackend.nodeAffinityPreset.type` | Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `defaultBackend.nodeAffinityPreset.key` | Node label key to match. Ignored if `affinity` is set. | `""` |
| `defaultBackend.nodeAffinityPreset.values` | Node label values to match. Ignored if `affinity` is set. | `[]` |
| `defaultBackend.affinity` | Affinity for pod assignment. Evaluated as a template. | `{}` |
| `defaultBackend.nodeSelector` | Node labels for pod assignment. Evaluated as a template. | `{}` |
| `defaultBackend.tolerations` | Tolerations for pod assignment. Evaluated as a template. | `[]` |
| `defaultBackend.service.type` | Service type | `ClusterIP` |
| `defaultBackend.service.port` | Service port | `80` |
| `defaultBackend.pdb.create` | Enable Pod Disruption Budget configuration | `false` |
| `defaultBackend.pdb.minAvailable` | Minimum number/percentage of Default backend pods that should remain scheduled | `1` |
| `defaultBackend.pdb.maxUnavailable` | Maximum number/percentage of Default backend pods that should remain scheduled | `""` |
| Name | Description | Value |
| --------------------------------------------------- | ---------------------------------------------------------------------------------------------------- | ------------------------ |
| `defaultBackend.enabled` | Enable a default backend based on NGINX | `false` |
| `defaultBackend.image.registry` | Default backend image registry | `docker.io` |
| `defaultBackend.image.repository` | Default backend image name | `bitnami/nginx` |
| `defaultBackend.image.tag` | Default backend image tag | `1.21.3-debian-10-r42` |
| `defaultBackend.image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `defaultBackend.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `defaultBackend.extraArgs` | Additional command line arguments to pass to NGINX container | `{}` |
| `defaultBackend.lifecycleHooks` | lifecycleHooks for the container to automate configuration before or after startup. | `{}` |
| `defaultBackend.extraEnvVars` | Array containing extra env vars to be added to all Contour containers | `[]` |
| `defaultBackend.extraEnvVarsCM` | ConfigMap containing extra env vars to be added to all Contour containers | `""` |
| `defaultBackend.extraEnvVarsSecret` | Secret containing extra env vars to be added to all Contour containers | `""` |
| `defaultBackend.extraVolumes` | Array to add extra volumes | `[]` |
| `defaultBackend.extraVolumeMounts` | Array to add extra mounts (normally used with extraVolumes) | `[]` |
| `defaultBackend.initContainers` | Attach additional init containers to the http backend pods | `[]` |
| `defaultBackend.sidecars` | Add additional sidecar containers to the default backend | `[]` |
| `defaultBackend.containerPorts.http` | Set http port inside Contour pod | `8001` |
| `defaultBackend.updateStrategy` | Strategy to use to update Pods | `{}` |
| `defaultBackend.command` | Override default command | `[]` |
| `defaultBackend.args` | Override default args | `[]` |
| `defaultBackend.hostAliases` | Add deployment host aliases | `[]` |
| `defaultBackend.replicaCount` | Desired number of default backend pods | `1` |
| `defaultBackend.podSecurityContext.enabled` | Default backend Pod securityContext | `true` |
| `defaultBackend.podSecurityContext.fsGroup` | Set Default backend Pod's Security Context fsGroup | `1001` |
| `defaultBackend.containerSecurityContext.enabled` | Default backend container securityContext | `true` |
| `defaultBackend.containerSecurityContext.runAsUser` | User ID for the Envoy container (to change this, http and https containerPorts must be set to >1024) | `1001` |
| `defaultBackend.resources.limits` | The resources limits for the Default backend container | `{}` |
| `defaultBackend.resources.requests` | The requested resources for the Default backend container | `{}` |
| `defaultBackend.livenessProbe.enabled` | Enable livenessProbe | `true` |
| `defaultBackend.livenessProbe.httpGet` | Path, port and scheme for the livenessProbe | `{}` |
| `defaultBackend.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `30` |
| `defaultBackend.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` |
| `defaultBackend.livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` |
| `defaultBackend.livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `3` |
| `defaultBackend.livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` |
| `defaultBackend.readinessProbe.enabled` | Enable readinessProbe | `true` |
| `defaultBackend.readinessProbe.httpGet` | Path, port and scheme for the readinessProbe | `{}` |
| `defaultBackend.readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `0` |
| `defaultBackend.readinessProbe.periodSeconds` | Period seconds for readinessProbe | `5` |
| `defaultBackend.readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `5` |
| `defaultBackend.readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `6` |
| `defaultBackend.readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` |
| `defaultBackend.startupProbe.enabled` | Enable/disable the startup probe | `false` |
| `defaultBackend.startupProbe.initialDelaySeconds` | Delay before startup probe is initiated | `15` |
| `defaultBackend.startupProbe.periodSeconds` | How often to perform the probe | `10` |
| `defaultBackend.startupProbe.timeoutSeconds` | When the probe times out | `5` |
| `defaultBackend.startupProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | `3` |
| `defaultBackend.startupProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed. | `1` |
| `defaultBackend.customLivenessProbe` | Override default liveness probe, it overrides the default one (evaluated as a template) | `{}` |
| `defaultBackend.customReadinessProbe` | Override default readiness probe, it overrides the default one (evaluated as a template) | `{}` |
| `defaultBackend.customStartupProbe` | Override default startup probe | `{}` |
| `defaultBackend.podLabels` | Extra labels for Controller pods | `{}` |
| `defaultBackend.podAnnotations` | Annotations for Controller pods | `{}` |
| `defaultBackend.priorityClassName` | Priority class assigned to the pods | `""` |
| `defaultBackend.podAffinityPreset` | Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `defaultBackend.podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` |
| `defaultBackend.nodeAffinityPreset.type` | Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` |
| `defaultBackend.nodeAffinityPreset.key` | Node label key to match. Ignored if `affinity` is set. | `""` |
| `defaultBackend.nodeAffinityPreset.values` | Node label values to match. Ignored if `affinity` is set. | `[]` |
| `defaultBackend.affinity` | Affinity for pod assignment. Evaluated as a template. | `{}` |
| `defaultBackend.nodeSelector` | Node labels for pod assignment. Evaluated as a template. | `{}` |
| `defaultBackend.tolerations` | Tolerations for pod assignment. Evaluated as a template. | `[]` |
| `defaultBackend.service.type` | Service type | `ClusterIP` |
| `defaultBackend.service.ports.http` | Service port | `80` |
| `defaultBackend.service.annotations` | Annotations to add to the service | `{}` |
| `defaultBackend.pdb.create` | Enable Pod Disruption Budget configuration | `false` |
| `defaultBackend.pdb.minAvailable` | Minimum number/percentage of Default backend pods that should remain scheduled | `1` |
| `defaultBackend.pdb.maxUnavailable` | Maximum number/percentage of Default backend pods that should remain scheduled | `""` |
| `ingress.enabled` | Ingress configuration enabled | `false` |
| `ingress.certManager` | Add annotations for cert-manager | `false` |
| `ingress.annotations` | Annotations to be added to the web ingress. | `{}` |
| `ingress.hostname` | Hostename for the Ingress object | `contour.local` |
| `ingress.path` | The Path to Concourse | `/` |
| `ingress.rulesOverride` | Ingress rules override | `[]` |
| `ingress.selfSigned` | Create a TLS secret for this ingress record using self-signed certificates generated by Helm | `false` |
| `ingress.ingressClassName` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) | `""` |
| `ingress.extraPaths` | Add additional arbitrary paths that may need to be added to the ingress under the main host. | `[]` |
| `ingress.tls` | TLS configuration. | `false` |
| `ingress.pathType` | Ingress Path type | `ImplementationSpecific` |
| `ingress.extraHosts` | The list of additional hostnames to be covered with this ingress record. | `[]` |
| `ingress.extraTls` | The tls configuration for additional hostnames to be covered with this ingress record. | `[]` |
| `ingress.secrets` | If you're providing your own certificates, please use this to add the certificates as secrets | `[]` |
### Metrics parameters
| Name | Description | Value |
| --------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | ------------------------ |
| `prometheus.serviceMonitor.namespace` | Specify if the servicemonitors will be deployed into a different namespace (blank deploys into same namespace as chart) | `""` |
| `prometheus.serviceMonitor.enabled` | Specify if a servicemonitor will be deployed for prometheus-operator. | `false` |
| `prometheus.serviceMonitor.jobLabel` | Specify the jobLabel to use for the prometheus-operator | `app.kubernetes.io/name` |
| `prometheus.serviceMonitor.interval` | Specify the scrape interval if not specified use default prometheus scrapeIntervall, the Prometheus default scrape interval is used. | `""` |
| `prometheus.serviceMonitor.metricRelabelings` | Specify additional relabeling of metrics. | `[]` |
| `prometheus.serviceMonitor.relabelings` | Specify general relabeling. | `[]` |
| Name | Description | Value |
| ------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------ | ------------------------ |
| `metrics.serviceMonitor.namespace` | Specify if the servicemonitors will be deployed into a different namespace (blank deploys into same namespace as chart) | `""` |
| `metrics.serviceMonitor.enabled` | Specify if a servicemonitor will be deployed for prometheus-operator. | `false` |
| `metrics.serviceMonitor.jobLabel` | Specify the jobLabel to use for the prometheus-operator | `app.kubernetes.io/name` |
| `metrics.serviceMonitor.interval` | Specify the scrape interval if not specified use default prometheus scrapeIntervall, the Prometheus default scrape interval is used. | `""` |
| `metrics.serviceMonitor.metricRelabelings` | Specify additional relabeling of metrics. | `[]` |
| `metrics.serviceMonitor.relabelings` | Specify general relabeling. | `[]` |
| `metrics.serviceMonitor.honorLabels` | Specify honorLabels parameter to add the scrape endpoint | `false` |
| `metrics.serviceMonitor.scrapeTimeout` | The timeout after which the scrape is ended | `""` |
| `metrics.serviceMonitor.selector` | Specify honorLabels parameter to add the scrape endpoint | `{}` |
### Other parameters
@@ -419,6 +504,18 @@ Find more information about how to deal with common errors related to Bitnami
Please carefully read through the guide "Upgrading Contour" at https://projectcontour.io/resources/upgrading/.
### To 7.0.0
This major release renames several values in this chart and adds missing features, in order to be inline with the rest of assets in the Bitnami charts repository.
Affected values:
- `prometheus` renamed as `metrics`.
- `serviceMonitor.labels` renamed as `serviceMonitor.selector`.
- `service.port` renamed as `service.ports.xds`.
- `service.nodePort` renamed as `service.nodePorts.xds`.
- `contour.updateStrategy` and `worker.updateStrategy` changed from String type (previously default to 'rollingUpdate') to Object type, allowing users to configure other updateStrategy parameters, similar to other charts.
### To 6.0.0
This version updates the chart to use Contour's latest release, `1.19.0`. Among other features, this new version introduces support for new kinds of CRDs: `ContourConfiguration` and `ContourDeployment`. For further information on new features, please refer to the [official release notes](https://github.com/projectcontour/contour/releases/tag/v1.19.0) for this version.

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: contourconfigurations.projectcontour.io
spec:

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: contourdeployments.projectcontour.io
spec:

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: extensionservices.projectcontour.io
spec:
@@ -57,6 +57,12 @@ spec:
description: RequestHashPolicy contains configuration for an
individual hash policy on a request attribute.
properties:
hashSourceIP:
description: HashSourceIP should be set to true when request
source IP hash based load balancing is desired. It must
be the only hash option field set, otherwise this request
hash policy object will be ignored.
type: boolean
headerHashOptions:
description: HeaderHashOptions should be set when request
header hash based load balancing is desired. It must be

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: httpproxies.projectcontour.io
spec:
@@ -331,6 +331,12 @@ spec:
description: RequestHashPolicy contains configuration
for an individual hash policy on a request attribute.
properties:
hashSourceIP:
description: HashSourceIP should be set to true when
request source IP hash based load balancing is desired.
It must be the only hash option field set, otherwise
this request hash policy object will be ignored.
type: boolean
headerHashOptions:
description: HeaderHashOptions should be set when
request header hash based load balancing is desired.
@@ -698,10 +704,13 @@ spec:
description: The retry policy for this route.
properties:
count:
default: 1
description: NumRetries is maximum allowed number of retries.
If not supplied, the number of retries is one.
If set to -1, then retries are disabled. If set to 0 or
not supplied, the value is set to the Envoy default of
1.
format: int64
minimum: 0
minimum: -1
type: integer
perTryTimeout:
description: PerTryTimeout specifies the timeout per retry
@@ -1032,6 +1041,12 @@ spec:
description: RequestHashPolicy contains configuration for
an individual hash policy on a request attribute.
properties:
hashSourceIP:
description: HashSourceIP should be set to true when
request source IP hash based load balancing is desired.
It must be the only hash option field set, otherwise
this request hash policy object will be ignored.
type: boolean
headerHashOptions:
description: HeaderHashOptions should be set when request
header hash based load balancing is desired. It must
@@ -1379,7 +1394,7 @@ spec:
description: The fully qualified domain name of the root of the
ingress tree all leaves of the DAG rooted at this object relate
to the fqdn.
pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
pattern: ^(\*\.)?[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
type: string
rateLimitPolicy:
description: The policy for rate limiting on the virtual host.
@@ -1665,6 +1680,9 @@ spec:
type: object
type: object
status:
default:
currentStatus: NotReconciled
description: Waiting for controller
description: Status is a container for computed information about the
HTTPProxy.
properties:

View File

@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.0
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
name: tlscertificatedelegations.projectcontour.io
spec:

View File

@@ -9,8 +9,14 @@ metadata:
"helm.sh/hook": "pre-install,pre-upgrade"
"helm.sh/hook-weight": "1"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: contour-certgen
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
spec:
ttlSecondsAfterFinished: 0
template:
@@ -25,9 +31,12 @@ spec:
{{- if .Values.contour.affinity }}
affinity: {{- include "common.tplvalues.render" (dict "value" .Values.contour.affinity "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.contour.tolerations}}
{{- if .Values.contour.tolerations }}
tolerations: {{- include "common.tplvalues.render" (dict "value" .Values.contour.tolerations "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.contour.podSecurityContext.enabled }}
securityContext: {{- omit .Values.contour.podSecurityContext "enabled" | toYaml | nindent 8 }}
{{- end }}
containers:
- name: contour
image: {{ include "common.images.image" ( dict "imageRoot" .Values.contour.image "global" .Values.global) }}
@@ -49,27 +58,23 @@ spec:
{{- if .Values.contour.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.contour.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
{{- if or .Values.contour.extraEnvVarsConfigMap .Values.contour.extraEnvVarsSecret }}
{{- if or .Values.contour.extraEnvVarsCM .Values.contour.extraEnvVarsSecret }}
envFrom:
{{- if .Values.contour.extraEnvVarsConfigMap }}
{{- if .Values.contour.extraEnvVarsCM }}
- configMapRef:
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsConfigMap "context" $ ) }}
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsCM "context" $ ) }}
{{- end }}
{{- if .Values.contour.extraEnvVarsSecret }}
- secretRef:
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsSecret "context" $ ) }}
{{- end }}
{{- end }}
{{- if .Values.contour.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.contour.containerSecurityContext "enabled" | toYaml | nindent 12 }}
{{- end }}
resources: {{ toYaml .Values.contour.resources | nindent 12 }}
restartPolicy: Never
serviceAccountName: {{ include "contour.contourCertGenServiceAccountName" . }}
{{- if .Values.contour.securityContext.enabled }}
securityContext:
runAsUser: {{ .Values.contour.securityContext.runAsUser }}
runAsGroup: {{ .Values.contour.securityContext.runAsGroup }}
fsGroup: {{ .Values.contour.securityContext.fsGroup }}
runAsNonRoot: {{ .Values.contour.securityContext.runAsNonRoot }}
{{- end }}
parallelism: 1
completions: 1
backoffLimit: 1

View File

@@ -8,8 +8,14 @@ metadata:
annotations:
"helm.sh/hook": "pre-install,pre-upgrade"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: contour-certgen
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
rules:
- apiGroups:
- ""

View File

@@ -8,6 +8,12 @@ metadata:
annotations:
"helm.sh/hook": "pre-install,pre-upgrade"
"helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: contour-certgen
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- end }}

View File

@@ -7,6 +7,12 @@ metadata:
namespace: {{ .Release.Namespace }}
labels: {{- include "common.labels.standard" . | nindent 4}}
app.kubernetes.io/component: contour
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
data:
contour.yaml: |
{{ include "common.tplvalues.render" ( dict "value" .Values.configInline "context" $) | indent 4 }}

View File

@@ -7,20 +7,23 @@ metadata:
namespace: {{ .Release.Namespace }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: contour
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
replicas: {{ .Values.replicaCount }}
strategy:
type: RollingUpdate
rollingUpdate:
# This value of maxSurge means that during a rolling update
# the new ReplicaSet will be created first.
maxSurge: 50%
replicas: {{ .Values.contour.replicaCount }}
{{- if .Values.contour.updateStrategy }}
strategy: {{- toYaml .Values.contour.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
app.kubernetes.io/component: contour
template:
metadata:
{{- if or .Values.configInline .Values.contour.podAnnotations }}
{{- if or .Values.configInline .Values.contour.podAnnotations .Values.commonAnnotations }}
annotations:
{{- if .Values.contour.podAnnotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.contour.podAnnotations "context" $) | nindent 8 }}
@@ -28,11 +31,23 @@ spec:
{{- if .Values.configInline }}
checksum/config: {{ include (print $.Template.BasePath "/contour/configmap.yaml") . | sha256sum }}
{{- end }}
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 8 }}
{{- end }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 8 }}
app.kubernetes.io/component: contour
{{- if .Values.contour.podLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.contour.podLabels "context" $ ) | nindent 8 }}
{{- end }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
{{- end }}
spec:
{{- include "common.images.pullSecrets" ( dict "images" (list .Values.contour.image) "global" .Values.global) | nindent 6 }}
{{- if .Values.contour.priorityClassName }}
priorityClassName: {{ .Values.contour.priorityClassName | quote }}
{{- end }}
{{- if .Values.contour.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.contour.hostAliases "context" $) | nindent 8 }}
{{- end }}
@@ -55,13 +70,26 @@ spec:
{{- include "common.tplvalues.render" ( dict "value" .Values.contour.initContainers "context" $ ) | nindent 6 }}
{{- end }}
containers:
- command:
- name: contour
{{- if .Values.diagnosticMode.enabled }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.command "context" $) | nindent 12 }}
{{- else if .Values.contour.command }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.contour.command "context" $) | nindent 12 }}
{{- else }}
command:
- contour
{{- end }}
{{- if .Values.diagnosticMode.enabled }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.diagnosticMode.args "context" $) | nindent 12 }}
{{- else if .Values.contour.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.contour.args "context" $) | nindent 12 }}
{{- else }}
args:
- serve
- --incluster
- --xds-address=0.0.0.0
- --xds-port=8001
- --xds-port={{ .Values.contour.containerPorts.xds }}
- --http-port={{ .Values.contour.containerPorts.metrics }}
- --envoy-service-http-port={{ .Values.envoy.containerPorts.http }}
- --envoy-service-https-port={{ .Values.envoy.containerPorts.https }}
- --contour-cafile=/certs/ca.crt
@@ -74,37 +102,60 @@ spec:
{{- if .Values.contour.extraArgs }}
{{- include "common.tplvalues.render" (dict "value" .Values.contour.extraArgs "context" $) | nindent 12 }}
{{- end }}
{{- end }}
image: {{ include "common.images.image" ( dict "imageRoot" .Values.contour.image "global" .Values.global) }}
imagePullPolicy: {{ .Values.contour.image.pullPolicy }}
name: contour
ports:
- containerPort: 8001
- containerPort: {{ .Values.contour.containerPorts.xds }}
name: xds
protocol: TCP
- containerPort: 8000
- containerPort: {{ .Values.contour.containerPorts.metrics }}
name: metrics
protocol: TCP
{{- if .Values.contour.livenessProbe.enabled }}
{{- if not .Values.diagnosticMode.enabled }}
{{- if .Values.contour.lifecycleHooks }}
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.contour.lifecycleHooks "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.contour.livenessProbe.enabled }}
livenessProbe:
httpGet:
path: /healthz
port: 8000
port: {{ .Values.contour.containerPorts.metrics }}
initialDelaySeconds: {{ .Values.contour.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.contour.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.contour.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.contour.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.contour.livenessProbe.failureThreshold }}
{{- end }}
{{- if .Values.contour.readinessProbe.enabled }}
{{- else if .Values.contour.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.contour.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.contour.readinessProbe.enabled }}
readinessProbe:
tcpSocket:
port: 8001
httpGet:
path: /healthz
port: {{ .Values.contour.containerPorts.metrics }}
initialDelaySeconds: {{ .Values.contour.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.contour.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.contour.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.contour.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.contour.readinessProbe.failureThreshold }}
{{- end }}
{{- else if .Values.contour.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.contour.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.contour.startupProbe.enabled }}
startupProbe:
httpGet:
path: /healthz
port: {{ .Values.contour.containerPorts.metrics }}
initialDelaySeconds: {{ .Values.contour.startupProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.contour.startupProbe.periodSeconds }}
timeoutSeconds: {{ .Values.contour.startupProbe.timeoutSeconds }}
successThreshold: {{ .Values.contour.startupProbe.successThreshold }}
failureThreshold: {{ .Values.contour.startupProbe.failureThreshold }}
{{- else if .Values.contour.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.contour.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
{{- end }}
resources: {{ toYaml .Values.contour.resources | nindent 12 }}
volumeMounts:
- name: contourcert
@@ -127,31 +178,33 @@ spec:
fieldRef:
apiVersion: v1
fieldPath: metadata.name
- name: BITNAMI_DEBUG
value: {{ ternary "true" "false" (or .Values.contour.image.debug .Values.diagnosticMode.enabled) | quote }}
{{- if .Values.contour.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.contour.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
{{- if or .Values.contour.extraEnvVarsConfigMap .Values.contour.extraEnvVarsSecret }}
{{- if or .Values.contour.extraEnvVarsCM .Values.contour.extraEnvVarsSecret }}
envFrom:
{{- if .Values.contour.extraEnvVarsConfigMap }}
{{- if .Values.contour.extraEnvVarsCM }}
- configMapRef:
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsConfigMap "context" $ ) }}
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsCM "context" $ ) }}
{{- end }}
{{- if .Values.contour.extraEnvVarsSecret }}
- secretRef:
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsSecret "context" $ ) }}
{{- end }}
{{- end }}
{{- if .Values.contour.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.contour.containerSecurityContext "enabled" | toYaml | nindent 12 }}
{{- end }}
{{- if .Values.contour.sidecars }}
{{- include "common.tplvalues.render" ( dict "value" .Values.contour.sidecars "context" $) | nindent 8 }}
{{- end }}
dnsPolicy: ClusterFirst
serviceAccountName: {{ include "contour.contourServiceAccountName" . }}
{{- if .Values.contour.securityContext.enabled }}
{{- if .Values.contour.podSecurityContext.enabled }}
securityContext:
runAsUser: {{ .Values.contour.securityContext.runAsUser }}
runAsGroup: {{ .Values.contour.securityContext.runAsGroup }}
fsGroup: {{ .Values.contour.securityContext.fsGroup }}
runAsNonRoot: {{ .Values.contour.securityContext.runAsNonRoot }}
fsGroup: {{ .Values.contour.podSecurityContext.fsGroup }}
{{- end }}
volumes:
- name: contourcert

View File

@@ -5,6 +5,12 @@ kind: ClusterRole
metadata:
name: {{ include "common.names.fullname" .}}-contour
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
rules:
- apiGroups:
- ""

View File

@@ -7,19 +7,46 @@ metadata:
namespace: {{ .Release.Namespace }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: contour
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
annotations:
{{- if .Values.contour.service.annotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.contour.service.annotations "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
type: {{ .Values.contour.service.type }}
{{- if (or (eq .Values.contour.service.type "LoadBalancer") (eq .Values.contour.service.type "NodePort")) }}
externalTrafficPolicy: {{ .Values.contour.service.externalTrafficPolicy | quote }}
{{- end }}
{{ if .Values.contour.service.clusterIP }}
clusterIP: {{ .Values.contour.service.clusterIP }}
{{ end }}
{{ if eq .Values.contour.service.type "LoadBalancer" }}
loadBalancerSourceRanges: {{ .Values.contour.service.loadBalancerSourceRanges }}
{{ end }}
{{- if (and (eq .Values.contour.service.type "LoadBalancer") (not (empty .Values.contour.service.loadBalancerIP))) }}
loadBalancerIP: {{ .Values.contour.service.loadBalancerIP }}
{{- end }}
ports:
- port: 8001
name: xds
- port: {{ .Values.contour.service.ports.xds }}
name: tcp-xds
protocol: TCP
targetPort: 8001
targetPort: xds
{{- if (and (or (eq .Values.contour.service.type "NodePort") (eq .Values.contour.service.type "LoadBalancer")) (not (empty .Values.contour.service.nodePorts.xds))) }}
nodePort: {{ .Values.contour.service.nodePorts.xds }}
{{- else if eq .Values.contour.service.type "ClusterIP" }}
nodePort: null
{{- end }}
{{- if .Values.contour.service.extraPorts }}
{{- include "common.tplvalues.render" (dict "value" .Values.contour.service.extraPorts "context" $) | nindent 4 }}
{{- end }}
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
app.kubernetes.io/component: contour
type: ClusterIP
{{- if .Values.prometheus.serviceMonitor.enabled }}
{{- if .Values.metrics.serviceMonitor.enabled }}
---
apiVersion: v1
kind: Service
@@ -35,8 +62,8 @@ spec:
app.kubernetes.io/component: contour
ports:
- name: metrics
port: 8000
port: {{ .Values.contour.service.ports.metrics }}
protocol: TCP
targetPort: 8000
targetPort: metrics
{{- end }}
{{- end }}

View File

@@ -7,4 +7,10 @@ metadata:
namespace: {{ .Release.Namespace }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: contour
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
{{- end }}

View File

@@ -1,33 +1,48 @@
{{- if and .Values.prometheus.serviceMonitor.enabled .Values.contour.enabled }}
{{- if and .Values.metrics.serviceMonitor.enabled .Values.contour.enabled }}
---
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "common.names.fullname" . }}-contour
{{- if .Values.prometheus.serviceMonitor.namespace }}
namespace: {{ .Values.prometheus.serviceMonitor.namespace }}
{{- if .Values.metrics.serviceMonitor.namespace }}
namespace: {{ .Values.metrics.serviceMonitor.namespace }}
{{- else }}
namespace: {{ .Release.Namespace }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: contour
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
jobLabel: {{ .Values.prometheus.serviceMonitor.jobLabel | quote }}
jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel | quote }}
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
app.kubernetes.io/component: contour
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 4 }}
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
endpoints:
- port: metrics
{{- if .Values.prometheus.serviceMonitor.interval }}
interval: {{ .Values.prometheus.serviceMonitor.interval }}
{{- if .Values.metrics.serviceMonitor.interval }}
interval: {{ .Values.metrics.serviceMonitor.interval }}
{{- end }}
{{- if .Values.prometheus.serviceMonitor.metricRelabelings }}
metricRelabelings: {{ toYaml .Values.prometheus.serviceMonitor.metricRelabelings | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- if .Values.prometheus.serviceMonitor.relabelings }}
relabelings: {{ toYaml .Values.prometheus.serviceMonitor.relabelings | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.honorLabels }}
honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.metricRelabelings }}
metricRelabelings: {{ toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.relabelings }}
relabelings: {{ toYaml .Values.metrics.serviceMonitor.relabelings | nindent 6 }}
{{- end }}
{{- end }}

View File

@@ -17,16 +17,28 @@ spec:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
app.kubernetes.io/component: default-backend
replicas: {{ .Values.defaultBackend.replicaCount }}
{{- if .Values.defaultBackend.updateStrategy }}
strategy: {{- toYaml .Values.defaultBackend.updateStrategy | nindent 4 }}
{{- end }}
template:
metadata:
{{- if .Values.defaultBackend.podAnnotations }}
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.defaultBackend.podAnnotations "context" $) | nindent 8 }}
{{- if or .Values.defaultBackend.podAnnotations .Values.commonAnnotations }}
annotations:
{{- if .Values.defaultBackend.podAnnotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.defaultBackend.podAnnotations "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 8 }}
{{- end }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 8 }}
app.kubernetes.io/component: default-backend
{{- if .Values.defaultBackend.podLabels }}
{{- include "common.tplvalues.render" (dict "value" .Values.defaultBackend.podLabels "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
{{- end }}
spec:
{{- include "common.images.pullSecrets" ( dict "images" (list .Values.defaultBackend.image) "global" .Values.global) | nindent 6 }}
{{- if .Values.defaultBackend.hostAliases }}
@@ -55,6 +67,10 @@ spec:
automountServiceAccountToken: false
serviceAccountName: {{ include "envoy.envoyServiceAccountName" . }}
terminationGracePeriodSeconds: 60
{{- if .Values.defaultBackend.initContainers }}
initContainers:
{{- include "common.tplvalues.render" ( dict "value" .Values.defaultBackend.initContainers "context" $ ) | nindent 6 }}
{{- end }}
containers:
- name: default-backend
image: {{ include "common.images.image" ( dict "imageRoot" .Values.defaultBackend.image "global" .Values.global) }}
@@ -62,6 +78,12 @@ spec:
{{- if .Values.defaultBackend.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.defaultBackend.containerSecurityContext "enabled" | toYaml | nindent 12 }}
{{- end }}
{{- if .Values.defaultBackend.command }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.defaultBackend.command "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.defaultBackend.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.defaultBackend.args "context" $) | nindent 12 }}
{{- else }}
args:
{{- range $key, $value := .Values.defaultBackend.extraArgs }}
{{- if $value }}
@@ -70,21 +92,80 @@ spec:
- --{{ $key }}
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.defaultBackend.lifecycleHooks }}
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.defaultBackend.lifecycleHooks "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.defaultBackend.extraEnvVars }}
env: {{- include "common.tplvalues.render" (dict "value" .Values.defaultBackend.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
{{- if or .Values.defaultBackend.extraEnvVarsCM .Values.defaultBackend.extraEnvVarsSecret }}
envFrom:
{{- if .Values.defaultBackend.extraEnvVarsCM }}
- configMapRef:
name: {{ include "common.tplvalues.render" ( dict "value" .Values.defaultBackend.extraEnvVarsCM "context" $ ) }}
{{- end }}
{{- if .Values.defaultBackend.extraEnvVarsSecret }}
- secretRef:
name: {{ include "common.tplvalues.render" ( dict "value" .Values.defaultBackend.extraEnvVarsSecret "context" $ ) }}
{{- end }}
{{- end }}
{{- if .Values.defaultBackend.livenessProbe.enabled }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.defaultBackend.livenessProbe "enabled") "context" $) | nindent 12 }}
livenessProbe:
httpGet:
path: /
port: http
scheme: HTTP
initialDelaySeconds: {{ .Values.defaultBackend.livenessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.defaultBackend.livenessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.defaultBackend.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.defaultBackend.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.defaultBackend.livenessProbe.failureThreshold }}
{{- else if .Values.defaultBackend.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.defaultBackend.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.defaultBackend.readinessProbe.enabled }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.defaultBackend.readinessProbe "enabled") "context" $) | nindent 12 }}
readinessProbe:
httpGet:
path: /
port: http
scheme: HTTP
initialDelaySeconds: {{ .Values.defaultBackend.readinessProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.defaultBackend.readinessProbe.periodSeconds }}
timeoutSeconds: {{ .Values.defaultBackend.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.defaultBackend.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.defaultBackend.readinessProbe.failureThreshold }}
{{- else if .Values.defaultBackend.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.defaultBackend.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.defaultBackend.startupProbe.enabled }}
startupProbe:
httpGet:
path: /
port: http
scheme: HTTP
initialDelaySeconds: {{ .Values.defaultBackend.startupProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.defaultBackend.startupProbe.periodSeconds }}
timeoutSeconds: {{ .Values.defaultBackend.startupProbe.timeoutSeconds }}
successThreshold: {{ .Values.defaultBackend.startupProbe.successThreshold }}
failureThreshold: {{ .Values.defaultBackend.startupProbe.failureThreshold }}
{{- else if .Values.defaultBackend.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.defaultBackend.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
ports:
- name: http
containerPort: {{ .Values.defaultBackend.containerPort }}
containerPort: {{ .Values.defaultBackend.containerPorts.http }}
protocol: TCP
{{- if .Values.defaultBackend.resources }}
resources: {{- toYaml .Values.defaultBackend.resources | nindent 12 }}
{{- if .Values.defaultBackend.extraVolumeMounts }}
volumeMounts: {{- include "common.tplvalues.render" ( dict "value" .Values.contour.extraVolumeMounts "context" $ ) | nindent 12 }}
{{- end }}
{{- end }}
{{- if .Values.defaultBackend.sidecars }}
{{- include "common.tplvalues.render" ( dict "value" .Values.defaultBackend.sidecars "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.defaultBackend.extraVolumes }}
volumes: {{- include "common.tplvalues.render" ( dict "value" .Values.defaultBackend.extraVolumes "context" $ ) | nindent 8 }}
{{- end }}
{{- end }}

View File

@@ -3,27 +3,63 @@ apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
kind: Ingress
metadata:
name: {{ include "common.names.fullname" . }}-default-backend
namespace: {{ .Release.Namespace }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: default-backend
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
annotations:
kubernetes.io/ingress.class: {{ include "contour.ingressClassName" . }}
{{- if .Values.ingress.certManager }}
kubernetes.io/tls-acme: "true"
{{- end }}
{{- if .Values.ingress.annotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.ingress.annotations "context" $) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
{{- if semverCompare "<1.19-0" (include "common.capabilities.kubeVersion" .) -}}
backend:
serviceName: {{ include "common.names.fullname" . }}-default-backend
servicePort: http
{{- else }}
defaultBackend:
service:
name: {{ include "common.names.fullname" . }}-default-backend
port:
name: http
{{- if and .Values.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }}
ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
{{- end }}
rules:
{{- if .Values.ingress.rulesOverride }}
{{- toYaml .Values.ingress.rulesOverride | nindent 4 }}
{{- else }}
{{- if .Values.ingress.hostname }}
- host: {{ .Values.ingress.hostname | quote }}
http:
paths:
{{- if .Values.ingress.extraPaths }}
{{- toYaml .Values.ingress.extraPaths | nindent 10 }}
{{- end }}
- path: {{ .Values.ingress.path }}
{{- if eq "true" (include "common.ingress.supportsPathType" .) }}
pathType: {{ .Values.ingress.pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-default-backend" (include "common.names.fullname" .)) "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- range .Values.ingress.extraHosts }}
- host: {{ .name | quote }}
http:
paths:
- path: {{ default "/" .path }}
{{- if eq "true" (include "common.ingress.supportsPathType" $) }}
pathType: {{ default "ImplementationSpecific" .pathType }}
{{- end }}
backend: {{- include "common.ingress.backend" (dict "serviceName" (printf "%s-default-backend" (include "common.names.fullname" $)) "servicePort" "http" "context" $) | nindent 14 }}
{{- end }}
{{- end }}
{{- if or (and .Values.ingress.tls (or .Values.ingress.certManager .Values.ingress.selfSigned)) .Values.ingress.extraTls }}
tls:
{{- if and .Values.ingress.tls (or .Values.ingress.certManager .Values.ingress.selfSigned) }}
- hosts:
- {{ .Values.ingress.hostname | quote }}
secretName: {{ printf "%s-tls" .Values.ingress.hostname }}
{{- end }}
{{- if .Values.ingress.extraTls }}
{{- include "common.tplvalues.render" ( dict "value" .Values.ingress.extraTls "context" $ ) | nindent 4 }}
{{- end }}
{{- end }}
{{- end }}

View File

@@ -22,7 +22,7 @@ spec:
type: {{ .Values.defaultBackend.service.type }}
ports:
- name: http
port: {{ .Values.defaultBackend.service.port }}
port: {{ .Values.defaultBackend.service.ports.http }}
protocol: TCP
targetPort: http
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}

View File

@@ -0,0 +1,44 @@
{{- if .Values.ingress.enabled }}
{{- if .Values.ingress.secrets }}
{{- range .Values.ingress.secrets }}
apiVersion: v1
kind: Secret
metadata:
name: {{ .name }}
namespace: {{ $.Release.Namespace | quote }}
labels: {{- include "common.labels.standard" $ | nindent 4 }}
{{- if $.Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" $.Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if $.Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" $.Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
type: kubernetes.io/tls
data:
tls.crt: {{ .certificate | b64enc }}
tls.key: {{ .key | b64enc }}
---
{{- end }}
{{- end }}
{{- if and .Values.ingress.tls .Values.ingress.selfSigned }}
{{- $ca := genCA "odoo-ca" 365 }}
{{- $cert := genSignedCert .Values.ingress.hostname nil (list .Values.ingress.hostname) 365 $ca }}
apiVersion: v1
kind: Secret
metadata:
name: {{ printf "%s-tls" .Values.ingress.hostname }}
namespace: {{ .Release.Namespace | quote }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
type: kubernetes.io/tls
data:
tls.crt: {{ $cert.Cert | b64enc | quote }}
tls.key: {{ $cert.Key | b64enc | quote }}
ca.crt: {{ $ca.Cert | b64enc | quote }}
{{- end }}
{{- end }}

View File

@@ -6,27 +6,43 @@ metadata:
namespace: {{ .Release.Namespace }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: envoy
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 10%
minReadySeconds: {{ .Values.envoy.minReadySeconds }}
{{- if .Values.envoy.updateStrategy }}
updateStrategy: {{- toYaml .Values.envoy.updateStrategy | nindent 4 }}
{{- end }}
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
app.kubernetes.io/component: envoy
template:
metadata:
{{- if .Values.envoy.podAnnotations }}
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.envoy.podAnnotations "context" $) | nindent 8 }}
{{- if or .Values.envoy.podAnnotations .Values.commonAnnotations }}
annotations:
{{- if .Values.envoy.podAnnotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.envoy.podAnnotations "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 8 }}
{{- end }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 8 }}
app.kubernetes.io/component: envoy
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
{{- end }}
spec:
{{- include "common.images.pullSecrets" ( dict "images" (list .Values.contour.image .Values.envoy.image) "global" .Values.global) | nindent 6 }}
{{- if .Values.envoy.hostAliases }}
hostAliases: {{- include "common.tplvalues.render" (dict "value" .Values.envoy.hostAliases "context" $) | nindent 8 }}
{{- end }}
{{- if .Values.envoy.priorityClassName }}
priorityClassName: {{ .Values.envoy.priorityClassName | quote }}
{{- end }}
{{- if .Values.envoy.affinity }}
affinity: {{- include "common.tplvalues.render" (dict "value" .Values.envoy.affinity "context" $) | nindent 8 }}
{{- else }}
@@ -64,17 +80,20 @@ spec:
env:
{{- include "common.tplvalues.render" (dict "value" .Values.contour.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
{{- if or .Values.contour.extraEnvVarsConfigMap .Values.contour.extraEnvVarsSecret }}
{{- if or .Values.contour.extraEnvVarsCM .Values.contour.extraEnvVarsSecret }}
envFrom:
{{- if .Values.contour.extraEnvVarsConfigMap }}
{{- if .Values.contour.extraEnvVarsCM }}
- configMapRef:
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsConfigMap "context" $ ) }}
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsCM "context" $ ) }}
{{- end }}
{{- if .Values.contour.extraEnvVarsSecret }}
- secretRef:
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsSecret "context" $ ) }}
{{- end }}
{{- end }}
{{- if .Values.envoy.lifecycleHooks }}
lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.envoy.lifecycleHooks "context" $) | nindent 12 }}
{{- else }}
lifecycle:
preStop:
exec:
@@ -82,6 +101,7 @@ spec:
- contour
- envoy
- shutdown
{{- end }}
{{- if .Values.contour.livenessProbe.enabled }}
livenessProbe:
httpGet:
@@ -95,12 +115,23 @@ spec:
{{- end }}
name: shutdown-manager
resources: {{- toYaml .Values.envoy.shutdownManager.resources | nindent 12 }}
{{- if .Values.envoy.extraVolumeMounts }}
volumeMounts:
- name: envoy-admin
mountPath: /admin
{{- if .Values.envoy.extraVolumeMounts }}
{{- include "common.tplvalues.render" ( dict "value" .Values.envoy.extraVolumeMounts "context" $ ) | nindent 12 }}
{{- end }}
- command:
- name: envoy
{{- if .Values.envoy.command }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.envoy.command "context" $) | nindent 12 }}
{{- else }}
command:
- envoy
{{- end }}
{{- if .Values.envoy.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.envoy.args "context" $) | nindent 12 }}
{{- else }}
args:
- -c
- /config/envoy.json
@@ -110,9 +141,9 @@ spec:
{{- if .Values.envoy.extraArgs }}
{{- include "common.tplvalues.render" (dict "value" .Values.envoy.extraArgs "context" $) | nindent 12 }}
{{- end }}
{{- end }}
image: {{ include "common.images.image" ( dict "imageRoot" .Values.envoy.image "global" .Values.global ) }}
imagePullPolicy: {{ .Values.envoy.image.pullPolicy }}
name: envoy
{{- if .Values.envoy.containerSecurityContext.enabled }}
securityContext:
runAsUser: {{ .Values.envoy.containerSecurityContext.runAsUser }}
@@ -131,11 +162,11 @@ spec:
{{- if .Values.envoy.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.envoy.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
{{- if or .Values.envoy.extraEnvVarsConfigMap .Values.envoy.extraEnvVarsSecret }}
{{- if or .Values.envoy.extraEnvVarsCM .Values.envoy.extraEnvVarsSecret }}
envFrom:
{{- if .Values.envoy.extraEnvVarsConfigMap }}
{{- if .Values.envoy.extraEnvVarsCM }}
- configMapRef:
name: {{ include "common.tplvalues.render" ( dict "value" .Values.envoy.extraEnvVarsConfigMap "context" $ ) }}
name: {{ include "common.tplvalues.render" ( dict "value" .Values.envoy.extraEnvVarsCM "context" $ ) }}
{{- end }}
{{- if .Values.envoy.extraEnvVarsSecret }}
- secretRef:
@@ -238,11 +269,11 @@ spec:
{{- if .Values.contour.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.contour.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
{{- if or .Values.contour.extraEnvVarsConfigMap .Values.contour.extraEnvVarsSecret }}
{{- if or .Values.contour.extraEnvVarsCM .Values.contour.extraEnvVarsSecret }}
envFrom:
{{- if .Values.contour.extraEnvVarsConfigMap }}
{{- if .Values.contour.extraEnvVarsCM }}
- configMapRef:
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsConfigMap "context" $ ) }}
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsCM "context" $ ) }}
{{- end }}
{{- if .Values.contour.extraEnvVarsSecret }}
- secretRef:

View File

@@ -16,7 +16,7 @@ spec:
{{- if not .Values.envoy.autoscaling.enabled }}
replicas: {{ .Values.envoy.replicaCount }}
{{- end }}
revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
revisionHistoryLimit: {{ .Values.envoy.revisionHistoryLimit }}
{{- if .Values.envoy.updateStrategy }}
strategy: {{- toYaml .Values.envoy.updateStrategy | nindent 4 }}
{{- end }}
@@ -31,6 +31,9 @@ spec:
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 8 }}
app.kubernetes.io/component: envoy
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 8 }}
{{- end }}
spec:
{{- include "common.images.pullSecrets" ( dict "images" (list .Values.contour.image .Values.envoy.image) "global" .Values.global) | nindent 6 }}
{{- if .Values.envoy.hostAliases }}
@@ -44,6 +47,9 @@ spec:
podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.envoy.podAntiAffinityPreset "component" "envoy" "context" $) | nindent 10 }}
nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.envoy.nodeAffinityPreset.type "key" .Values.envoy.nodeAffinityPreset.key "values" .Values.envoy.nodeAffinityPreset.values) | nindent 10 }}
{{- end }}
{{- if .Values.envoy.priorityClassName }}
priorityClassName: {{ .Values.envoy.priorityClassName | quote }}
{{- end }}
{{- if .Values.envoy.nodeSelector }}
nodeSelector: {{- include "common.tplvalues.render" (dict "value" .Values.envoy.nodeSelector "context" $) | nindent 8 }}
{{- end }}
@@ -73,11 +79,11 @@ spec:
env:
{{- include "common.tplvalues.render" (dict "value" .Values.contour.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
{{- if or .Values.contour.extraEnvVarsConfigMap .Values.contour.extraEnvVarsSecret }}
{{- if or .Values.contour.extraEnvVarsCM .Values.contour.extraEnvVarsSecret }}
envFrom:
{{- if .Values.contour.extraEnvVarsConfigMap }}
{{- if .Values.contour.extraEnvVarsCM }}
- configMapRef:
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsConfigMap "context" $ ) }}
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsCM "context" $ ) }}
{{- end }}
{{- if .Values.contour.extraEnvVarsSecret }}
- secretRef:
@@ -104,12 +110,22 @@ spec:
{{- end }}
name: shutdown-manager
resources: {{- toYaml .Values.envoy.shutdownManager.resources | nindent 12 }}
{{- if .Values.envoy.extraVolumeMounts }}
volumeMounts:
- name: envoy-admin
mountPath: /admin
{{- if .Values.envoy.extraVolumeMounts }}
{{- include "common.tplvalues.render" ( dict "value" .Values.envoy.extraVolumeMounts "context" $ ) | nindent 12 }}
{{- end }}
- command:
- name: envoy
{{- if .Values.envoy.command }}
command: {{- include "common.tplvalues.render" (dict "value" .Values.envoy.command "context" $) | nindent 12 }}
{{- else }}
command:
- envoy
{{- end }}
{{- if .Values.envoy.args }}
args: {{- include "common.tplvalues.render" (dict "value" .Values.envoy.args "context" $) | nindent 12 }}
{{- else }}
args:
- -c
- /config/envoy.json
@@ -119,9 +135,9 @@ spec:
{{- if .Values.envoy.extraArgs }}
{{- include "common.tplvalues.render" (dict "value" .Values.envoy.extraArgs "context" $) | nindent 12 }}
{{- end }}
{{- end }}
image: {{ include "common.images.image" ( dict "imageRoot" .Values.envoy.image "global" .Values.global ) }}
imagePullPolicy: {{ .Values.envoy.image.pullPolicy }}
name: envoy
{{- if .Values.envoy.containerSecurityContext.enabled }}
securityContext:
runAsUser: {{ .Values.envoy.containerSecurityContext.runAsUser }}
@@ -140,11 +156,11 @@ spec:
{{- if .Values.envoy.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.envoy.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
{{- if or .Values.envoy.extraEnvVarsConfigMap .Values.envoy.extraEnvVarsSecret }}
{{- if or .Values.envoy.extraEnvVarsCM .Values.envoy.extraEnvVarsSecret }}
envFrom:
{{- if .Values.envoy.extraEnvVarsConfigMap }}
{{- if .Values.envoy.extraEnvVarsCM }}
- configMapRef:
name: {{ include "common.tplvalues.render" ( dict "value" .Values.envoy.extraEnvVarsConfigMap "context" $ ) }}
name: {{ include "common.tplvalues.render" ( dict "value" .Values.envoy.extraEnvVarsCM "context" $ ) }}
{{- end }}
{{- if .Values.envoy.extraEnvVarsSecret }}
- secretRef:
@@ -183,6 +199,8 @@ spec:
timeoutSeconds: {{ .Values.envoy.readinessProbe.timeoutSeconds }}
successThreshold: {{ .Values.envoy.readinessProbe.successThreshold }}
failureThreshold: {{ .Values.envoy.readinessProbe.failureThreshold }}
{{- else if .Values.envoy.customReadinessProbe }}
readinessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.envoy.customReadinessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.envoy.livenessProbe.enabled }}
livenessProbe:
@@ -194,6 +212,21 @@ spec:
timeoutSeconds: {{ .Values.envoy.livenessProbe.timeoutSeconds }}
successThreshold: {{ .Values.envoy.livenessProbe.successThreshold }}
failureThreshold: {{ .Values.envoy.livenessProbe.failureThreshold }}
{{- else if .Values.envoy.customLivenessProbe }}
livenessProbe: {{- include "common.tplvalues.render" (dict "value" .Values.envoy.customLivenessProbe "context" $) | nindent 12 }}
{{- end }}
{{- if .Values.envoy.startupProbe.enabled }}
startupProbe:
httpGet:
path: /ready
port: 8002
initialDelaySeconds: {{ .Values.envoy.startupProbe.initialDelaySeconds }}
periodSeconds: {{ .Values.envoy.startupProbe.periodSeconds }}
timeoutSeconds: {{ .Values.envoy.startupProbe.timeoutSeconds }}
successThreshold: {{ .Values.envoy.startupProbe.successThreshold }}
failureThreshold: {{ .Values.envoy.startupProbe.failureThreshold }}
{{- else if .Values.envoy.customStartupProbe }}
startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.envoy.customStartupProbe "context" $) | nindent 12 }}
{{- end }}
resources: {{- toYaml .Values.envoy.resources | nindent 12 }}
volumeMounts:
@@ -247,11 +280,11 @@ spec:
{{- if .Values.contour.extraEnvVars }}
{{- include "common.tplvalues.render" (dict "value" .Values.contour.extraEnvVars "context" $) | nindent 12 }}
{{- end }}
{{- if or .Values.contour.extraEnvVarsConfigMap .Values.contour.extraEnvVarsSecret }}
{{- if or .Values.contour.extraEnvVarsCM .Values.contour.extraEnvVarsSecret }}
envFrom:
{{- if .Values.contour.extraEnvVarsConfigMap }}
{{- if .Values.contour.extraEnvVarsCM }}
- configMapRef:
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsConfigMap "context" $ ) }}
name: {{ include "common.tplvalues.render" ( dict "value" .Values.contour.extraEnvVarsCM "context" $ ) }}
{{- end }}
{{- if .Values.contour.extraEnvVarsSecret }}
- secretRef:

View File

@@ -9,6 +9,9 @@ metadata:
app.kubernetes.io/component: envoy
{{- if .Values.envoy.service.labels }}
{{- include "common.tplvalues.render" (dict "value" .Values.envoy.service.labels "context" $) | nindent 4 }}
{{- end }}
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
annotations:
{{- if (ne (index .Values.envoy.service.annotations "service.beta.kubernetes.io/aws-load-balancer-type" | toString ) "nlb") }}
@@ -24,6 +27,9 @@ metadata:
{{- if .Values.envoy.service.annotations }}
{{- include "common.tplvalues.render" (dict "value" .Values.envoy.service.annotations "context" $) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
{{- if .Values.envoy.service.externalTrafficPolicy }}
externalTrafficPolicy: {{ .Values.envoy.service.externalTrafficPolicy | quote }}
@@ -65,7 +71,7 @@ spec:
selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
app.kubernetes.io/component: envoy
type: {{ .Values.envoy.service.type }}
{{- if .Values.prometheus.serviceMonitor.enabled }}
{{- if .Values.metrics.serviceMonitor.enabled }}
---
apiVersion: v1
kind: Service

View File

@@ -7,4 +7,10 @@ metadata:
namespace: {{ .Release.Namespace }}
labels: {{- include "common.labels.standard" . | nindent 4 }}
app.kubernetes.io/component: envoy
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
{{- end }}

View File

@@ -1,34 +1,49 @@
{{- if and .Values.prometheus.serviceMonitor.enabled .Values.envoy.enabled }}
{{- if and .Values.metrics.serviceMonitor.enabled .Values.envoy.enabled }}
---
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ include "common.names.fullname" . }}-envoy
{{- if .Values.prometheus.serviceMonitor.namespace }}
namespace: {{ .Values.prometheus.serviceMonitor.namespace }}
{{- if .Values.metrics.serviceMonitor.namespace }}
namespace: {{ .Values.metrics.serviceMonitor.namespace }}
{{- else }}
namespace: {{ .Release.Namespace }}
{{- end }}
labels: {{- include "common.labels.standard" . | nindent 4}}
app.kubernetes.io/component: envoy
{{- if .Values.commonLabels }}
{{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
{{- end }}
{{- if .Values.commonAnnotations }}
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
{{- end }}
spec:
jobLabel: {{ .Values.prometheus.serviceMonitor.jobLabel | quote }}
jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel | quote }}
selector:
matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }}
app.kubernetes.io/component: envoy
{{- if .Values.metrics.serviceMonitor.selector }}
{{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 4 }}
{{- end }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
endpoints:
- port: metrics
path: /stats/prometheus
{{- if .Values.prometheus.serviceMonitor.interval }}
interval: {{ .Values.prometheus.serviceMonitor.interval }}
{{- if .Values.metrics.serviceMonitor.interval }}
interval: {{ .Values.metrics.serviceMonitor.interval }}
{{- end }}
{{- if .Values.prometheus.serviceMonitor.metricRelabelings }}
metricRelabelings: {{ toYaml .Values.prometheus.serviceMonitor.metricRelabelings | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }}
{{- end }}
{{- if .Values.prometheus.serviceMonitor.relabelings }}
relabelings: {{ toYaml .Values.prometheus.serviceMonitor.relabelings | nindent 6 }}
{{- if .Values.metrics.serviceMonitor.honorLabels }}
honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.metricRelabelings }}
metricRelabelings: {{ toYaml .Values.metrics.serviceMonitor.metricRelabelings | nindent 6 }}
{{- end }}
{{- if .Values.metrics.serviceMonitor.relabelings }}
relabelings: {{ toYaml .Values.metrics.serviceMonitor.relabelings | nindent 6 }}
{{- end }}
{{- end }}

View File

@@ -2,9 +2,11 @@
## Global Docker image parameters
## Please, note that this will override the image parameters, including dependencies, configured to use the global value
## Current available global Docker image parameters: imageRegistry, imagePullSecrets and storageClass
##
## @param global.imageRegistry Global Docker image registry
## @param global.imagePullSecrets [array] Global Docker registry secret names as an array
## @param global.storageClass Global StorageClass for Persistent Volume(s)
##
global:
imageRegistry: ""
@@ -13,8 +15,10 @@ global:
## - myRegistryKeySecretName
##
imagePullSecrets: []
storageClass: ""
## @section Common parameters
##
## @param nameOverride String to partially override contour.fullname include (will maintain the release name)
##
@@ -22,22 +26,37 @@ nameOverride: ""
## @param fullnameOverride String to fully override contour.fullname template
##
fullnameOverride: ""
## @param ingress.apiVersion Force Ingress API version (automatically detected if not set)
##
ingress:
apiVersion: ""
## @param kubeVersion Force target Kubernetes version (using Helm capabilities if not set)
##
kubeVersion: ""
## @param extraDeploy [array] Array of extra objects to deploy with the release
##
extraDeploy: []
## @param commonLabels Labels to add to all deployed objects
##
commonLabels: {}
## @param commonAnnotations Annotations to add to all deployed objects
##
commonAnnotations: {}
## Diagnostic mode in the deployment
##
diagnosticMode:
## @param diagnosticMode.enabled Enable diagnostic mode (all probes will be disabled and the command will be overridden)
##
enabled: false
## @param diagnosticMode.command [array] Command to override all containers in the deployment
##
command:
- sleep
## @param diagnosticMode.args [array] Args to override all containers in the deployment
##
args:
- infinity
## @section Contour parameters
## @param replicaCount Number of Contour Pod replicas
##
replicaCount: 2
## To configure Contour, you must specify ONE of the following two options.
## @param existingConfigMap Specifies the name of an externally-defined ConfigMap to use as the configuration (this is mutually exclusive with `configInline`)
## Helm will not manage the contents of this ConfigMap, it is your responsibility to create it.
@@ -68,11 +87,12 @@ contour:
## @param contour.image.tag Contour image tag
## @param contour.image.pullPolicy Contour Image pull policy
## @param contour.image.pullSecrets [array] Contour Image pull secrets
## @param contour.image.debug Enable image debug mode
##
image:
registry: docker.io
repository: bitnami/contour
tag: 1.19.0-debian-10-r0
tag: 1.19.1-debian-10-r0
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -86,10 +106,29 @@ contour:
## - myRegistryKeySecretName
##
pullSecrets: []
debug: false
## @param contour.replicaCount Number of Contour Pod replicas
##
replicaCount: 1
## @param contour.priorityClassName Priority class assigned to the pods
## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass
##
priorityClassName: ""
## Configures the ports the Envoy proxy listens on
## @param contour.containerPorts.xds Set xds port inside Contour pod
## @param contour.containerPorts.metrics Set metrics port inside Contour pod
##
containerPorts:
xds: 8001
metrics: 8000
## @param contour.hostAliases [array] Add deployment host aliases
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##
hostAliases: []
## @param contour.updateStrategy Strategy to use to update Pods
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
##
updateStrategy: {}
## @param contour.extraArgs [array] Extra arguments passed to Contour container
##
extraArgs: []
@@ -108,11 +147,13 @@ contour:
## limits:
## cpu: 400m
## memory: 258Mi
##
limits: {}
## Examples:
## requests:
## cpu: 100m
## memory: 25Mi
##
requests: {}
## @param contour.manageCRDs Manage the creation, upgrade and deletion of Contour CRDs.
##
@@ -125,6 +166,22 @@ contour:
## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
##
podAntiAffinityPreset: soft
## @param contour.podLabels [object] Extra labels for Contour pods
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
##
podLabels: {}
## @param contour.lifecycleHooks lifecycleHooks for the container to automate configuration before or after startup.
##
lifecycleHooks: {}
## @param contour.customLivenessProbe Override default liveness probe
##
customLivenessProbe: {}
## @param contour.customReadinessProbe Override default readiness probe
##
customReadinessProbe: {}
## @param contour.customStartupProbe Override default startup probe
##
customStartupProbe: {}
## Node affinity preset
## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity
## @param contour.nodeAffinityPreset.type Contour Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard`
@@ -143,6 +200,12 @@ contour:
## - e2e-az2
##
values: []
## @param contour.command Override default command
##
command: []
## @param contour.args Override default args
##
args: []
## @param contour.affinity [object] Affinity for Contour pod assignment
## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
## Note: podAffinityPreset, podAntiAffinityPreset, and nodeAffinityPreset will be ignored when it's set
@@ -166,6 +229,24 @@ contour:
serviceAccount:
create: true
name: ""
## Contour Security Context
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
## @param contour.podSecurityContext.enabled Default backend Pod securityContext
## @param contour.podSecurityContext.fsGroup Set Default backend Pod's Security Context fsGroup
##
podSecurityContext:
enabled: true
fsGroup: 1001
## Envoy container security context
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
## @param contour.containerSecurityContext.enabled Envoy Container securityContext
## @param contour.containerSecurityContext.runAsUser User ID for the Contour container (to change this, http and https containerPorts must be set to >1024)
## @param contour.containerSecurityContext.runAsNonRoot Run as noon root
##
containerSecurityContext:
enabled: true
runAsUser: 1001
runAsNonRoot: true
## @param contour.livenessProbe.enabled Enable/disable the Liveness probe
## @param contour.livenessProbe.initialDelaySeconds Delay before liveness probe is initiated
## @param contour.livenessProbe.periodSeconds How often to perform the probe
@@ -194,16 +275,20 @@ contour:
timeoutSeconds: 5
failureThreshold: 3
successThreshold: 1
## @param contour.securityContext.enabled If the pod should run in a securityContext.
## @param contour.securityContext.runAsNonRoot If the pod should run as a non root container.
## @param contour.securityContext.runAsUser define the uid with which the pod will run
## @param contour.securityContext.runAsGroup define the gid with which the pod will run
## @param contour.startupProbe.enabled Enable/disable the startup probe
## @param contour.startupProbe.initialDelaySeconds Delay before startup probe is initiated
## @param contour.startupProbe.periodSeconds How often to perform the probe
## @param contour.startupProbe.timeoutSeconds When the probe times out
## @param contour.startupProbe.failureThreshold Minimum consecutive failures for the probe to be considered failed after having succeeded.
## @param contour.startupProbe.successThreshold Minimum consecutive successes for the probe to be considered successful after having failed.
##
securityContext:
enabled: true
runAsNonRoot: true
runAsUser: 1001
runAsGroup: 1001
startupProbe:
enabled: false
initialDelaySeconds: 15
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 3
successThreshold: 1
## @param contour.certgen.serviceAccount.create Create a serviceAccount for the Contour pod
## @param contour.certgen.serviceAccount.name Use the serviceAccount with the specified name, a name is generated using the fullname template
##
@@ -217,9 +302,48 @@ contour:
tlsExistingSecret: ""
## Contour Service properties
## ref: https://kubernetes.io/docs/concepts/services-networking/service/#multi-port-services
## @param contour.service.extraPorts [array] Extra ports to expose (normally used with the `sidecar` value)
##
service:
## @param contour.service.type Service type
##
type: ClusterIP
## @param contour.service.ports.xds Contour service xds port
## @param contour.service.ports.metrics Contour service xds port
##
ports:
xds: 8001
metrics: 8000
## Node ports to expose
## @param contour.service.nodePorts.xds Node port for HTTP
## NOTE: choose port between <30000-32767>
##
nodePorts:
xds: ""
## @param contour.service.clusterIP Contour service Cluster IP
## e.g.:
## clusterIP: None
##
clusterIP: ""
## @param contour.service.loadBalancerIP Contour service Load Balancer IP
## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer
##
loadBalancerIP: ""
## @param contour.service.loadBalancerSourceRanges Contour service Load Balancer sources
## ref: https://kubernetes.io/docs/tasks/access-application-cluster/configure-cloud-provider-firewall/#restrict-access-for-loadbalancer-service
## e.g:
## loadBalancerSourceRanges:
## - 10.10.10.0/24
##
loadBalancerSourceRanges: []
## @param contour.service.externalTrafficPolicy Contour service external traffic policy
## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip
##
externalTrafficPolicy: Cluster
## @param contour.service.annotations Additional custom annotations for Contour service
##
annotations: {}
## @param contour.service.extraPorts Extra port to expose on Contour service
##
extraPorts: []
## @param contour.initContainers [array] Attach additional init containers to Contour pods
## For example:
@@ -253,9 +377,9 @@ contour:
## value: env_var_value
##
extraEnvVars: []
## @param contour.extraEnvVarsConfigMap ConfigMap containing extra env vars to be added to all Contour containers
## @param contour.extraEnvVarsCM ConfigMap containing extra env vars to be added to all Contour containers
##
extraEnvVarsConfigMap: ""
extraEnvVarsCM: ""
## @param contour.extraEnvVarsSecret Secret containing extra env vars to be added to all Contour containers
##
extraEnvVarsSecret: ""
@@ -275,6 +399,7 @@ contour:
default: true
## @section Envoy parameters
##
envoy:
## @param envoy.enabled Envoy Proxy creation
@@ -291,7 +416,7 @@ envoy:
image:
registry: docker.io
repository: bitnami/envoy
tag: 1.19.1-debian-10-r55
tag: 1.19.1-debian-10-r74
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -305,6 +430,10 @@ envoy:
## - myRegistryKeySecretName
##
pullSecrets: []
## @param envoy.priorityClassName Priority class assigned to the pods
## ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/#priorityclass
##
priorityClassName: ""
## @param envoy.extraArgs [array] Extra arguments passed to Envoy container
##
extraArgs: []
@@ -321,30 +450,42 @@ envoy:
## lines, adjust them as necessary, and remove the curly braces after 'resources:'.
## @param envoy.resources.limits [object] Specify resource limits which the container is not allowed to succeed.
## @param envoy.resources.requests [object] Specify resource requests which the container needs to spawn.
##
resources:
## Example:
## limits:
## cpu: 400m
## memory: 250Mi
##
limits: {}
## Examples:
## requests:
## cpu: 100m
## memory: 25Mi
##
requests: {}
## @param envoy.command Override default command
##
command: []
## @param envoy.args Override default args
##
args: []
## @param envoy.shutdownManager.resources.limits [object] Specify resource limits which the container is not allowed to succeed.
## @param envoy.shutdownManager.resources.requests [object] Specify resource requests which the container needs to spawn.
##
shutdownManager:
resources:
## Example:
## limits:
## cpu: 50m
## memory: 32Mi
##
limits: {}
## Examples:
## requests:
## cpu: 10m
## memory: 16Mi
##
requests: {}
## @param envoy.kind Install as deployment or daemonset
##
@@ -352,10 +493,16 @@ envoy:
## @param envoy.replicaCount Desired number of Controller pods
##
replicaCount: 1
## @param envoy.lifecycleHooks lifecycleHooks for the container to automate configuration before or after startup.
##
lifecycleHooks: {}
## @param envoy.updateStrategy [object] Strategy to use to update Pods
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
##
updateStrategy: {}
updateStrategy:
type: RollingUpdate
rollingUpdate:
maxUnavailable: 10%
## @param envoy.minReadySeconds The minimum number of seconds for which a newly created Pod should be ready
##
minReadySeconds: 0
@@ -420,8 +567,12 @@ envoy:
## Pod security context
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod
## @param envoy.podSecurityContext.enabled Envoy Pod securityContext
## @param envoy.podSecurityContext.fsGroup User ID for the for the mounted volumes
## @param envoy.podSecurityContext.sysctls Array of sysctl options to allow
##
podSecurityContext:
fsGroup: 0
sysctls: []
enabled: false
## Envoy container security context
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container
@@ -430,7 +581,7 @@ envoy:
##
containerSecurityContext:
enabled: true
runAsUser: 0
runAsUser: 1001
## @param envoy.hostNetwork Envoy Pod host network access
## ref: https://kubernetes.io/docs/concepts/policy/pod-security-policy/#host-namespaces
##
@@ -479,6 +630,29 @@ envoy:
timeoutSeconds: 1
failureThreshold: 3
successThreshold: 1
## @param envoy.startupProbe.enabled Enable/disable the startup probe
## @param envoy.startupProbe.initialDelaySeconds Delay before startup probe is initiated
## @param envoy.startupProbe.periodSeconds How often to perform the probe
## @param envoy.startupProbe.timeoutSeconds When the probe times out
## @param envoy.startupProbe.failureThreshold Minimum consecutive failures for the probe to be considered failed after having succeeded.
## @param envoy.startupProbe.successThreshold Minimum consecutive successes for the probe to be considered successful after having failed.
##
startupProbe:
enabled: false
initialDelaySeconds: 15
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 3
successThreshold: 1
## @param envoy.customLivenessProbe Override default liveness probe
##
customLivenessProbe: {}
## @param envoy.customReadinessProbe Override default readiness probe
##
customReadinessProbe: {}
## @param envoy.customStartupProbe Override default startup probe
##
customStartupProbe: {}
## @param envoy.terminationGracePeriodSeconds Envoy termination grace period in seconds
##
terminationGracePeriodSeconds: 300
@@ -494,6 +668,9 @@ envoy:
## @param envoy.service.externalTrafficPolicy Envoy Service external cluster policy. If `envoy.service.type` is NodePort or LoadBalancer
##
externalTrafficPolicy: Local
## @param envoy.service.labels Labels to add to te envoy service
##
labels: {}
## @param envoy.service.clusterIP Internal envoy cluster service IP
## e.g.:
## clusterIP: None
@@ -576,14 +753,15 @@ envoy:
## value: env_var_value
##
extraEnvVars: []
## @param envoy.extraEnvVarsConfigMap ConfigMap containing extra env vars to be added to all Envoy containers
## @param envoy.extraEnvVarsCM ConfigMap containing extra env vars to be added to all Envoy containers
##
extraEnvVarsConfigMap: ""
extraEnvVarsCM: ""
## @param envoy.extraEnvVarsSecret Secret containing extra env vars to be added to all Envoy containers
##
extraEnvVarsSecret: ""
## @section Default backend parameters
##
## Default 404 backend
##
@@ -602,7 +780,7 @@ defaultBackend:
image:
registry: docker.io
repository: bitnami/nginx
tag: 1.21.3-debian-10-r42
tag: 1.21.4-debian-10-r6
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -619,9 +797,62 @@ defaultBackend:
## @param defaultBackend.extraArgs [object] Additional command line arguments to pass to NGINX container
##
extraArgs: {}
## @param defaultBackend.containerPort HTTP container port number
## @param defaultBackend.lifecycleHooks lifecycleHooks for the container to automate configuration before or after startup.
##
containerPort: 8080
lifecycleHooks: {}
## @param defaultBackend.extraEnvVars [array] Array containing extra env vars to be added to all Contour containers
## For example:
## extraEnvVars:
## - name: MY_ENV_VAR
## value: env_var_value
##
extraEnvVars: []
## @param defaultBackend.extraEnvVarsCM ConfigMap containing extra env vars to be added to all Contour containers
##
extraEnvVarsCM: ""
## @param defaultBackend.extraEnvVarsSecret Secret containing extra env vars to be added to all Contour containers
##
extraEnvVarsSecret: ""
## @param defaultBackend.extraVolumes [array] Array to add extra volumes
##
extraVolumes: []
## @param defaultBackend.extraVolumeMounts [array] Array to add extra mounts (normally used with extraVolumes)
##
extraVolumeMounts: []
## @param defaultBackend.initContainers [array] Attach additional init containers to the http backend pods
## For example:
## initContainers:
## - name: your-image-name
## image: your-image
## imagePullPolicy: Always
##
initContainers: []
## @param defaultBackend.sidecars [array] Add additional sidecar containers to the default backend
## Example:
## sidecars:
## - name: your-image-name
## image: your-image
## imagePullPolicy: Always
## ports:
## - name: portname
## containerPort: 1234
##
sidecars: []
## Configures the ports the http backend listens on
## @param defaultBackend.containerPorts.http Set http port inside Contour pod
##
containerPorts:
http: 8001
## @param defaultBackend.updateStrategy Strategy to use to update Pods
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#update-strategies
##
updateStrategy: {}
## @param defaultBackend.command Override default command
##
command: []
## @param defaultBackend.args Override default args
##
args: []
## @param defaultBackend.hostAliases [array] Add deployment host aliases
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##
@@ -658,11 +889,13 @@ defaultBackend:
## limits:
## cpu: 250m
## memory: 256Mi
##
limits: {}
## Examples:
## requests:
## cpu: 250m
## memory: 256Mi
##
requests: {}
## Default backend containers' liveness probe. Evaluated as a template.
## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle/#container-probes
@@ -676,10 +909,6 @@ defaultBackend:
##
livenessProbe:
enabled: true
httpGet:
path: /
port: http
scheme: HTTP
failureThreshold: 3
initialDelaySeconds: 30
periodSeconds: 10
@@ -697,21 +926,34 @@ defaultBackend:
##
readinessProbe:
enabled: true
httpGet:
path: /
port: http
scheme: HTTP
failureThreshold: 6
initialDelaySeconds: 0
periodSeconds: 5
successThreshold: 1
timeoutSeconds: 5
## @param defaultBackend.startupProbe.enabled Enable/disable the startup probe
## @param defaultBackend.startupProbe.initialDelaySeconds Delay before startup probe is initiated
## @param defaultBackend.startupProbe.periodSeconds How often to perform the probe
## @param defaultBackend.startupProbe.timeoutSeconds When the probe times out
## @param defaultBackend.startupProbe.failureThreshold Minimum consecutive failures for the probe to be considered failed after having succeeded.
## @param defaultBackend.startupProbe.successThreshold Minimum consecutive successes for the probe to be considered successful after having failed.
##
startupProbe:
enabled: false
initialDelaySeconds: 15
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 3
successThreshold: 1
## @param defaultBackend.customLivenessProbe [object] Override default liveness probe, it overrides the default one (evaluated as a template)
##
customLivenessProbe: {}
## @param defaultBackend.customReadinessProbe [object] Override default readiness probe, it overrides the default one (evaluated as a template)
##
customReadinessProbe: {}
## @param defaultBackend.customStartupProbe Override default startup probe
##
customStartupProbe: {}
## @param defaultBackend.podLabels [object] Extra labels for Controller pods
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
##
@@ -764,11 +1006,14 @@ defaultBackend:
tolerations: []
## Default backend Service parameters
## @param defaultBackend.service.type Service type
## @param defaultBackend.service.port Service port
## @param defaultBackend.service.ports.http Service port
## @param defaultBackend.service.annotations Annotations to add to the service
##
service:
type: ClusterIP
port: 80
ports:
http: 80
annotations: {}
## PodDisruptionBudget for default backend
## Default backend Pod Disruption Budget configuration
## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/
@@ -781,17 +1026,116 @@ defaultBackend:
minAvailable: 1
maxUnavailable: ""
## Ingress parameters
##
ingress:
## @param ingress.enabled Ingress configuration enabled
## Ref: https://kubernetes.io/docs/user-guide/ingress/
##
## Enable Ingress.
##
enabled: false
## @param ingress.certManager Add annotations for cert-manager
##
certManager: false
## @param ingress.annotations Annotations to be added to the web ingress.
## Example:
## kubernetes.io/ingress.class: nginx
## kubernetes.io/tls-acme: 'true'
##
annotations: {}
## Either `hosts` or `rulesOverride` must be provided if Ingress is enabled.
## `hosts` sets up the Ingress with default rules per provided hostname.
## @param ingress.hostname Hostename for the Ingress object
##
hostname: contour.local
## @param ingress.path The Path to Concourse
##
path: /
## @param ingress.rulesOverride Ingress rules override
## Either `hosts` or `rulesOverride` must be provided if Ingress is enabled.
## `rulesOverride` allows the user to define the full set of ingress rules, for more complex Ingress setups.
##
rulesOverride: []
## @param ingress.selfSigned Create a TLS secret for this ingress record using self-signed certificates generated by Helm
##
selfSigned: false
## @param ingress.ingressClassName IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+)
##
ingressClassName: ""
## @param ingress.extraPaths Add additional arbitrary paths that may need to be added to the ingress under the main host.
## For example: The ALB ingress controller requires a special rule for handling SSL redirection.
##
extraPaths: []
## @param ingress.tls TLS configuration.
## Secrets must be manually created in the namespace.
## Example:
## - secretName: concourse-web-tls
## hosts:
## - concourse.domain.com
##
tls: false
## @param ingress.pathType Ingress Path type
##
pathType: ImplementationSpecific
## @param ingress.extraHosts The list of additional hostnames to be covered with this ingress record.
## Most likely the hostname above will be enough, but in the event more hosts are needed, this is an array
## extraHosts:
## - name: concourse.local
## path: /
##
extraHosts: []
## @param ingress.extraTls The tls configuration for additional hostnames to be covered with this ingress record.
## see: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls
## extraTls:
## - hosts:
## - concourse.local
## secretName: concourse.local-tls
##
extraTls: []
## @param ingress.secrets If you're providing your own certificates, please use this to add the certificates as secrets
## key and certificate should start with -----BEGIN CERTIFICATE----- or
## -----BEGIN RSA PRIVATE KEY-----
##
## name should line up with a tlsSecret set further up
## If you're using cert-manager, this is unneeded, as it will create the secret for you if it is not set
##
## It is also possible to create and manage the certificates outside of this helm chart
## Please see README.md for more information
## Example:
## - name: concourse.local-tls
## key:
## certificate:
##
secrets: []
## @section Metrics parameters
##
## Prometheus Operator service monitors
## @param prometheus.serviceMonitor.namespace Specify if the servicemonitors will be deployed into a different namespace (blank deploys into same namespace as chart)
## @param prometheus.serviceMonitor.enabled Specify if a servicemonitor will be deployed for prometheus-operator.
## @param prometheus.serviceMonitor.jobLabel Specify the jobLabel to use for the prometheus-operator
## @param prometheus.serviceMonitor.interval Specify the scrape interval if not specified use default prometheus scrapeIntervall, the Prometheus default scrape interval is used.
## @param prometheus.serviceMonitor.metricRelabelings [array] Specify additional relabeling of metrics.
## @param prometheus.serviceMonitor.relabelings [array] Specify general relabeling.
## @param metrics.serviceMonitor.namespace Specify if the servicemonitors will be deployed into a different namespace (blank deploys into same namespace as chart)
## @param metrics.serviceMonitor.enabled Specify if a servicemonitor will be deployed for prometheus-operator.
## @param metrics.serviceMonitor.jobLabel Specify the jobLabel to use for the prometheus-operator
## @param metrics.serviceMonitor.interval Specify the scrape interval if not specified use default prometheus scrapeIntervall, the Prometheus default scrape interval is used.
## @param metrics.serviceMonitor.metricRelabelings [array] Specify additional relabeling of metrics.
## @param metrics.serviceMonitor.relabelings [array] Specify general relabeling.
## @param metrics.serviceMonitor.honorLabels Specify honorLabels parameter to add the scrape endpoint
## @param metrics.serviceMonitor.scrapeTimeout The timeout after which the scrape is ended
## @param metrics.serviceMonitor.selector Specify honorLabels parameter to add the scrape endpoint
##
prometheus:
metrics:
serviceMonitor:
namespace: ""
enabled: false
@@ -799,8 +1143,12 @@ prometheus:
interval: ""
metricRelabelings: []
relabelings: []
honorLabels: false
scrapeTimeout: ""
selector: {}
## @section Other parameters
##
## @param rbac.create Create the RBAC roles for API accessibility
##