From a4f6846a8a205c0634be9e71511da6f5b26ebfea Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Wed, 5 Jan 2022 15:12:12 +0100 Subject: [PATCH] [bitnami/mediawiki] Chart standardized (#7585) * [bitnami/mediawiki] Chart standarized * Update README.md and bump MariaDB major * Update readme, minor changes to serviceMonitor and service templates * Add missing parameter * Update values.yaml * [bitnami/mediawiki] Update components versions Signed-off-by: Bitnami Containers Co-authored-by: Bitnami Containers --- bitnami/mediawiki/Chart.lock | 6 +- bitnami/mediawiki/Chart.yaml | 4 +- bitnami/mediawiki/README.md | 259 ++++++++++-------- bitnami/mediawiki/templates/NOTES.txt | 6 +- bitnami/mediawiki/templates/deployment.yaml | 25 +- bitnami/mediawiki/templates/ingress.yaml | 3 + .../mediawiki/templates/mediawiki-pvc.yaml | 16 +- .../mediawiki/templates/servicemonitor.yaml | 29 +- bitnami/mediawiki/templates/svc.yaml | 40 ++- bitnami/mediawiki/values.yaml | 138 ++++++++-- 10 files changed, 364 insertions(+), 162 deletions(-) diff --git a/bitnami/mediawiki/Chart.lock b/bitnami/mediawiki/Chart.lock index 4ca79022c7..c92259416a 100644 --- a/bitnami/mediawiki/Chart.lock +++ b/bitnami/mediawiki/Chart.lock @@ -4,6 +4,6 @@ dependencies: version: 1.10.3 - name: mariadb repository: https://charts.bitnami.com/bitnami - version: 9.8.1 -digest: sha256:a429c1430d16b73c1aebcf6f5b9fee956938fad431ce201bdb11250611828234 -generated: "2021-12-15T23:15:41.444025638Z" + version: 10.2.0 +digest: sha256:07209341bb965b657547ac7df0f394af342582862d5eb08579da0b82b7dbc190 +generated: "2022-01-04T13:46:35.244724+01:00" diff --git a/bitnami/mediawiki/Chart.yaml b/bitnami/mediawiki/Chart.yaml index bdfc74f247..70ce53955f 100644 --- a/bitnami/mediawiki/Chart.yaml +++ b/bitnami/mediawiki/Chart.yaml @@ -13,7 +13,7 @@ dependencies: repository: https://charts.bitnami.com/bitnami tags: - mediawiki-database - version: 9.x.x + version: 10.x.x description: Extremely powerful, scalable software and a feature-rich wiki implementation that uses PHP to process and display data stored in a database. engine: gotpl home: https://github.com/bitnami/charts/tree/master/bitnami/mediawiki @@ -32,4 +32,4 @@ name: mediawiki sources: - https://github.com/bitnami/bitnami-docker-mediawiki - https://www.mediawiki.org/ -version: 12.4.5 +version: 13.0.0 diff --git a/bitnami/mediawiki/README.md b/bitnami/mediawiki/README.md index a0d01cd234..05647b5222 100644 --- a/bitnami/mediawiki/README.md +++ b/bitnami/mediawiki/README.md @@ -72,106 +72,130 @@ The command removes all the Kubernetes components associated with the chart and ### Mediawiki parameters -| Name | Description | Value | -| -------------------- | -------------------------------------------------------------------- | --------------------- | -| `image.registry` | MediaWiki image registry | `docker.io` | -| `image.repository` | MediaWiki image repository | `bitnami/mediawiki` | -| `image.tag` | MediaWiki image tag (immutable tags are recommended) | `1.37.0-debian-10-r0` | -| `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | -| `hostAliases` | Deployment pod host aliases | `[]` | -| `mediawikiUser` | User of the application | `user` | -| `mediawikiPassword` | Application password | `""` | -| `mediawikiEmail` | Admin email | `user@example.com` | -| `mediawikiName` | Name for the wiki | `My Wiki` | -| `mediawikiHost` | Mediawiki host to create application URLs | `""` | -| `allowEmptyPassword` | Allow DB blank passwords | `yes` | -| `smtpHost` | SMTP host | `""` | -| `smtpPort` | SMTP port | `""` | -| `smtpHostID` | SMTP host ID | `""` | -| `smtpUser` | SMTP user | `""` | -| `smtpPassword` | SMTP password | `""` | -| `command` | Override default container command (useful when using custom images) | `[]` | -| `args` | Override default container args (useful when using custom images) | `[]` | -| `extraEnvVars` | Extra environment variables to be set on Mediawki container | `[]` | -| `extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars | `""` | -| `extraEnvVarsSecret` | Name of existing Secret containing extra env vars | `""` | +| Name | Description | Value | +| -------------------- | -------------------------------------------------------------------------------- | --------------------- | +| `image.registry` | MediaWiki image registry | `docker.io` | +| `image.repository` | MediaWiki image repository | `bitnami/mediawiki` | +| `image.tag` | MediaWiki image tag (immutable tags are recommended) | `1.37.1-debian-10-r0` | +| `image.pullPolicy` | Image pull policy | `IfNotPresent` | +| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | +| `image.debug` | Enable %%MAIN_CONTAINER%% image debug mode | `false` | +| `hostAliases` | Deployment pod host aliases | `[]` | +| `mediawikiUser` | User of the application | `user` | +| `mediawikiPassword` | Application password | `""` | +| `mediawikiEmail` | Admin email | `user@example.com` | +| `mediawikiName` | Name for the wiki | `My Wiki` | +| `mediawikiHost` | Mediawiki host to create application URLs | `""` | +| `allowEmptyPassword` | Allow DB blank passwords | `yes` | +| `smtpHost` | SMTP host | `""` | +| `smtpPort` | SMTP port | `""` | +| `smtpHostID` | SMTP host ID | `""` | +| `smtpUser` | SMTP user | `""` | +| `smtpPassword` | SMTP password | `""` | +| `command` | Override default container command (useful when using custom images) | `[]` | +| `args` | Override default container args (useful when using custom images) | `[]` | +| `lifecycleHooks` | for the Mediawiki container(s) to automate configuration before or after startup | `{}` | +| `extraEnvVars` | Extra environment variables to be set on Mediawki container | `[]` | +| `extraEnvVarsCM` | Name of existing ConfigMap containing extra env vars | `""` | +| `extraEnvVarsSecret` | Name of existing Secret containing extra env vars | `""` | ### Mediawiki deployment parameters -| Name | Description | Value | -| ------------------------------------ | ----------------------------------------------------------------------------------------- | ------------------------------------------------- | -| `updateStrategy.type` | StrategyType can be set to RollingUpdate or OnDelete | `RollingUpdate` | -| `podSecurityContext.enabled` | Enable Mediawiki pods' Security Context | `true` | -| `podSecurityContext.fsGroup` | Group ID for the volumes of the pod | `1001` | -| `containerSecurityContext.enabled` | Enable Mediawiki containers' SecurityContext | `true` | -| `containerSecurityContext.runAsUser` | User ID to run Mediawiki containers | `1001` | -| `resources.limits` | The resources limits for the Mediawki container | `{}` | -| `resources.requests` | The requested resources for the Mediawki container | `{}` | -| `livenessProbe.enabled` | Enable livenessProbe | `true` | -| `livenessProbe.httpGet.path` | Request path for livenessProbe | `/api.php?action=query&meta=siteinfo&format=none` | -| `livenessProbe.httpGet.port` | Port for livenessProbe | `http` | -| `livenessProbe.httpGet.httpHeaders` | Headers for livenessProbe | `[]` | -| `livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `120` | -| `livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` | -| `livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` | -| `livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `6` | -| `livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | -| `readinessProbe.enabled` | Enable readinessProbe | `true` | -| `readinessProbe.httpGet.path` | Request path for readinessProbe | `/api.php?action=query&meta=siteinfo&format=none` | -| `readinessProbe.httpGet.port` | Port for readinessProbe | `http` | -| `readinessProbe.httpGet.httpHeaders` | Headers for livenessProbe | `[]` | -| `readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `30` | -| `readinessProbe.periodSeconds` | Period seconds for readinessProbe | `10` | -| `readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `5` | -| `readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `6` | -| `readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | -| `customLivenessProbe` | Override default liveness probe | `{}` | -| `customReadinessProbe` | Override default readiness probe | `{}` | -| `podLabels` | Extra labels for Mediawki pods | `{}` | -| `podAnnotations` | Annotations for Mediawki pods | `{}` | -| `podAffinityPreset` | Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | -| `podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` | -| `nodeAffinityPreset.type` | Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | -| `nodeAffinityPreset.key` | Node label key to match. Ignored if `affinity` is set. | `""` | -| `nodeAffinityPreset.values` | Node label values to match. Ignored if `affinity` is set. | `[]` | -| `affinity` | Affinity for pod assignment. Evaluated as a template. | `{}` | -| `nodeSelector` | Node labels for pod assignment. Evaluated as a template. | `{}` | -| `tolerations` | Tolerations for pod assignment. Evaluated as a template. | `[]` | -| `extraVolumes` | Optionally specify extra list of additional volumes for Mediawki pods | `[]` | -| `extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for Mediawki container(s) | `[]` | -| `initContainers` | Add additional init containers to the Mediawki pods | `[]` | -| `sidecars` | Add additional sidecar containers to the Mediawki pods | `[]` | -| `persistence.enabled` | Enable persistence using PVC | `true` | -| `persistence.storageClass` | PVC Storage Class for MediaWiki volume | `""` | -| `persistence.existingClaim` | An Existing PVC name for MediaWiki volume | `""` | -| `persistence.accessMode` | PVC Access Mode for MediaWiki volume | `ReadWriteOnce` | -| `persistence.size` | PVC Storage Request for MediaWiki volume | `8Gi` | +| Name | Description | Value | +| --------------------------------------- | ----------------------------------------------------------------------------------------- | ------------------------------------------------- | +| `updateStrategy.type` | StrategyType can be set to RollingUpdate or OnDelete | `RollingUpdate` | +| `podSecurityContext.enabled` | Enable Mediawiki pods' Security Context | `true` | +| `podSecurityContext.fsGroup` | Group ID for the volumes of the pod | `1001` | +| `containerSecurityContext.enabled` | Enable Mediawiki containers' SecurityContext | `true` | +| `containerSecurityContext.runAsUser` | User ID to run Mediawiki containers | `1001` | +| `containerSecurityContext.runAsNonRoot` | Set Mediawiki container's Security Context runAsNonRoot | `true` | +| `resources.limits` | The resources limits for the Mediawki container | `{}` | +| `resources.requests` | The requested resources for the Mediawki container | `{}` | +| `startupProbe.enabled` | Enable startupProbe | `false` | +| `startupProbe.httpGet.path` | Request path for startupProbe | `/api.php?action=query&meta=siteinfo&format=none` | +| `startupProbe.httpGet.port` | Port for startupProbe | `http` | +| `startupProbe.httpGet.httpHeaders` | Headers for startupProbe | `[]` | +| `startupProbe.initialDelaySeconds` | Initial delay seconds for startupProbe | `120` | +| `startupProbe.periodSeconds` | Period seconds for startupProbe | `10` | +| `startupProbe.timeoutSeconds` | Timeout seconds for startupProbe | `5` | +| `startupProbe.failureThreshold` | Failure threshold for startupProbe | `6` | +| `startupProbe.successThreshold` | Success threshold for startupProbe | `1` | +| `livenessProbe.enabled` | Enable livenessProbe | `true` | +| `livenessProbe.httpGet.path` | Request path for livenessProbe | `/api.php?action=query&meta=siteinfo&format=none` | +| `livenessProbe.httpGet.port` | Port for livenessProbe | `http` | +| `livenessProbe.httpGet.httpHeaders` | Headers for livenessProbe | `[]` | +| `livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `120` | +| `livenessProbe.periodSeconds` | Period seconds for livenessProbe | `10` | +| `livenessProbe.timeoutSeconds` | Timeout seconds for livenessProbe | `5` | +| `livenessProbe.failureThreshold` | Failure threshold for livenessProbe | `6` | +| `livenessProbe.successThreshold` | Success threshold for livenessProbe | `1` | +| `readinessProbe.enabled` | Enable readinessProbe | `true` | +| `readinessProbe.httpGet.path` | Request path for readinessProbe | `/api.php?action=query&meta=siteinfo&format=none` | +| `readinessProbe.httpGet.port` | Port for readinessProbe | `http` | +| `readinessProbe.httpGet.httpHeaders` | Headers for livenessProbe | `[]` | +| `readinessProbe.initialDelaySeconds` | Initial delay seconds for readinessProbe | `30` | +| `readinessProbe.periodSeconds` | Period seconds for readinessProbe | `10` | +| `readinessProbe.timeoutSeconds` | Timeout seconds for readinessProbe | `5` | +| `readinessProbe.failureThreshold` | Failure threshold for readinessProbe | `6` | +| `readinessProbe.successThreshold` | Success threshold for readinessProbe | `1` | +| `customStartupProbe` | Override default startup probe | `{}` | +| `customLivenessProbe` | Override default liveness probe | `{}` | +| `customReadinessProbe` | Override default readiness probe | `{}` | +| `podLabels` | Extra labels for Mediawki pods | `{}` | +| `podAnnotations` | Annotations for Mediawki pods | `{}` | +| `podAffinityPreset` | Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `podAntiAffinityPreset` | Pod anti-affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `soft` | +| `nodeAffinityPreset.type` | Node affinity preset type. Ignored if `affinity` is set. Allowed values: `soft` or `hard` | `""` | +| `nodeAffinityPreset.key` | Node label key to match. Ignored if `affinity` is set. | `""` | +| `nodeAffinityPreset.values` | Node label values to match. Ignored if `affinity` is set. | `[]` | +| `affinity` | Affinity for pod assignment. Evaluated as a template. | `{}` | +| `nodeSelector` | Node labels for pod assignment. Evaluated as a template. | `{}` | +| `tolerations` | Tolerations for pod assignment. Evaluated as a template. | `[]` | +| `priorityClassName` | Mediawiki pods' priorityClassName | `""` | +| `schedulerName` | Name of the k8s scheduler (other than default) | `""` | +| `topologySpreadConstraints` | Topology Spread Constraints for pod assignment | `[]` | +| `extraVolumes` | Optionally specify extra list of additional volumes for Mediawki pods | `[]` | +| `extraVolumeMounts` | Optionally specify extra list of additional volumeMounts for Mediawki container(s) | `[]` | +| `initContainers` | Add additional init containers to the Mediawki pods | `[]` | +| `sidecars` | Add additional sidecar containers to the Mediawki pods | `[]` | +| `persistence.enabled` | Enable persistence using PVC | `true` | +| `persistence.storageClass` | PVC Storage Class for MediaWiki volume | `""` | +| `persistence.existingClaim` | An Existing PVC name for MediaWiki volume | `""` | +| `persistence.accessModes` | Persistent Volume access modes | `[]` | +| `persistence.size` | PVC Storage Request for MediaWiki volume | `8Gi` | +| `persistence.annotations` | Persistent Volume Claim annotations | `{}` | ### Traffic Exposure parameters -| Name | Description | Value | -| ------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ------------------------ | -| `service.type` | Kubernetes Service type | `LoadBalancer` | -| `service.loadBalancerIP` | Use serviceLoadBalancerIP to request a specific static IP, | `""` | -| `service.port` | Service HTTP port | `80` | -| `service.httpsPort` | HTTPS Port. Set this to any value (recommended: 443) to enable the https service port | `""` | -| `service.nodePorts.http` | Kubernetes http node port | `""` | -| `service.nodePorts.https` | Kubernetes https node port | `""` | -| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | -| `ingress.enabled` | Set to true to enable ingress record generation | `false` | -| `ingress.pathType` | Ingress path type | `ImplementationSpecific` | -| `ingress.apiVersion` | Force Ingress API version (automatically detected if not set) | `""` | -| `ingress.hostname` | Default host for the ingress resource | `mediawiki.local` | -| `ingress.path` | The Path to Mediawiki. You may need to set this to '/*' in order to use this with ALB ingress controllers. | `/` | -| `ingress.annotations` | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. | `{}` | -| `ingress.tls` | Enable TLS configuration for the hostname defined at ingress.hostname parameter | `false` | -| `ingress.extraHosts` | The list of additional hostnames to be covered with this ingress record. | `[]` | -| `ingress.extraPaths` | Any additional arbitrary paths that may need to be added to the ingress under the main host. | `[]` | -| `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 | `[]` | +| Name | Description | Value | +| ---------------------------------- | -------------------------------------------------------------------------------------------------------------------------------- | ------------------------ | +| `service.type` | Kubernetes Service type | `LoadBalancer` | +| `service.ports.http` | Service HTTP port | `80` | +| `service.ports.https` | HTTPS Port. Set this to any value (recommended: 443) to enable the https service port | `443` | +| `service.nodePorts.http` | Kubernetes http node port | `""` | +| `service.nodePorts.https` | Kubernetes https node port | `""` | +| `service.externalTrafficPolicy` | Enable client source IP preservation | `Cluster` | +| `service.clusterIP` | Mediawiki service Cluster IP | `""` | +| `service.loadBalancerIP` | Mediawiki service Load Balancer IP | `""` | +| `service.loadBalancerSourceRanges` | Mediawiki service Load Balancer sources | `[]` | +| `service.extraPorts` | Extra ports to expose (normally used with the `sidecar` value) | `[]` | +| `service.annotations` | Additional custom annotations for Mediawiki service | `{}` | +| `service.sessionAffinity` | Session Affinity for Kubernetes service, can be "None" or "ClientIP" | `None` | +| `service.sessionAffinityConfig` | Additional settings for the sessionAffinity | `{}` | +| `ingress.enabled` | Set to true to enable ingress record generation | `false` | +| `ingress.pathType` | Ingress path type | `ImplementationSpecific` | +| `ingress.apiVersion` | Force Ingress API version (automatically detected if not set) | `""` | +| `ingress.hostname` | Default host for the ingress resource | `mediawiki.local` | +| `ingress.path` | The Path to Mediawiki. You may need to set this to '/*' in order to use this with ALB ingress controllers. | `/` | +| `ingress.annotations` | Additional annotations for the Ingress resource. To enable certificate autogeneration, place here your cert-manager annotations. | `{}` | +| `ingress.tls` | Enable TLS configuration for the hostname defined at ingress.hostname parameter | `false` | +| `ingress.extraHosts` | The list of additional hostnames to be covered with this ingress record. | `[]` | +| `ingress.extraPaths` | Any additional arbitrary paths that may need to be added to the ingress under the main host. | `[]` | +| `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 | `[]` | +| `ingress.ingressClassName` | IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) | `""` | ### Database parameters @@ -200,24 +224,26 @@ The command removes all the Kubernetes components associated with the chart and ### Metrics parameters -| Name | Description | Value | -| ----------------------------------------- | ---------------------------------------------------------------------------- | ------------------------- | -| `metrics.enabled` | Start a side-car prometheus exporter | `false` | -| `metrics.image.registry` | Apache exporter image registry | `docker.io` | -| `metrics.image.repository` | Apache exporter image repository | `bitnami/apache-exporter` | -| `metrics.image.tag` | Apache exporter image tag (immutable tags are recommended) | `0.10.1-debian-10-r57` | -| `metrics.image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | -| `metrics.resources` | Exporter resource requests/limit | `{}` | -| `metrics.port` | Metrics service port | `9117` | -| `metrics.podAnnotations` | Additional annotations for Metrics exporter pod | `{}` | -| `metrics.serviceMonitor.enabled` | Create ServiceMonitor Resource for scraping metrics using PrometheusOperator | `true` | -| `metrics.serviceMonitor.namespace` | The namespace in which the ServiceMonitor will be created | `""` | -| `metrics.serviceMonitor.interval` | The interval at which metrics should be scraped | `30s` | -| `metrics.serviceMonitor.scrapeTimeout` | The timeout after which the scrape is ended | `""` | -| `metrics.serviceMonitor.relabellings` | Metrics relabellings to add to the scrape endpoint | `[]` | -| `metrics.serviceMonitor.honorLabels` | Labels to honor to add to the scrape endpoint | `false` | -| `metrics.serviceMonitor.additionalLabels` | Additional custom labels for the ServiceMonitor | `{}` | +| Name | Description | Value | +| ------------------------------------------ | ---------------------------------------------------------------------------- | ------------------------- | +| `metrics.enabled` | Start a side-car prometheus exporter | `false` | +| `metrics.image.registry` | Apache exporter image registry | `docker.io` | +| `metrics.image.repository` | Apache exporter image repository | `bitnami/apache-exporter` | +| `metrics.image.tag` | Apache exporter image tag (immutable tags are recommended) | `0.10.1-debian-10-r83` | +| `metrics.image.pullPolicy` | Image pull policy | `IfNotPresent` | +| `metrics.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` | +| `metrics.resources` | Exporter resource requests/limit | `{}` | +| `metrics.port` | Metrics service port | `9117` | +| `metrics.podAnnotations` | Additional annotations for Metrics exporter pod | `{}` | +| `metrics.serviceMonitor.enabled` | Create ServiceMonitor Resource for scraping metrics using PrometheusOperator | `true` | +| `metrics.serviceMonitor.namespace` | The namespace in which the ServiceMonitor will be created | `""` | +| `metrics.serviceMonitor.interval` | The interval at which metrics should be scraped | `30s` | +| `metrics.serviceMonitor.scrapeTimeout` | The timeout after which the scrape is ended | `""` | +| `metrics.serviceMonitor.relabelings` | RelabelConfigs to apply to samples before scraping | `[]` | +| `metrics.serviceMonitor.metricRelabelings` | MetricRelabelConfigs to apply to samples before ingestion | `[]` | +| `metrics.serviceMonitor.selector` | ServiceMonitor selector labels | `{}` | +| `metrics.serviceMonitor.labels` | Extra labels for the ServiceMonitor | `{}` | +| `metrics.serviceMonitor.honorLabels` | honorLabels chooses the metric's labels on collisions with target labels | `false` | ### NetworkPolicy parameters @@ -336,6 +362,19 @@ Find more information about how to deal with common errors related to Bitnami’ ## Upgrading +### To 13.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: + +- `service.port` was deprecated. We recommend using `service.ports.http` instead. +- `service.httpsPort` was deprecated. We recommend using `service.ports.https` instead. +- `metrics.serviceMonitor.additionalLabels` was replaced by `metrics.serviceMonitor.labels`. +- `metrics.serviceMonitor.relabellings` was replaced by `metrics.serviceMonitor.metricRelabelings`, and new value `metrics.serviceMonitor.relabelings` was introduced, fixing an issue with the values mapping. Now, the ServiceMonitor settings are inline with the chart values. + +Additionally updates the MariaDB subchart to it newest major, 10.0.0, which contains similar changes. Check [MariaDB Upgrading Notes](https://github.com/bitnami/charts/tree/master/bitnami/mariadb#to-1000) for more information. + ### To 12.0.0 - Chart labels were adapted to follow the [Helm charts standard labels](https://helm.sh/docs/chart_best_practices/labels/#standard-labels). diff --git a/bitnami/mediawiki/templates/NOTES.txt b/bitnami/mediawiki/templates/NOTES.txt index fee1cfe7c8..fc3ec03134 100644 --- a/bitnami/mediawiki/templates/NOTES.txt +++ b/bitnami/mediawiki/templates/NOTES.txt @@ -72,13 +72,13 @@ host. To configure Mediawiki with the URL of your service: export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "common.names.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") -{{- $port:=.Values.service.port | toString }} - echo "Mediawiki URL: http://$SERVICE_IP{{- if ne $port "80" }}:{{ .Values.service.port }}{{ end }}/" +{{- $port:= ( coalesce .Values.service.ports.http .Values.service.port) | toString }} + echo "Mediawiki URL: http://$SERVICE_IP{{- if ne $port "80" }}:{{ coalesce .Values.service.ports.http .Values.service.port }}{{ end }}/" {{- else if contains "ClusterIP" .Values.service.type }} echo "Mediawiki URL: http://127.0.0.1:8080/" - kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "common.names.fullname" . }} 8080:{{ .Values.service.port }} + kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "common.names.fullname" . }} 8080:{{ coalesce .Values.service.ports.http .Values.service.port }} {{- end }} {{- end }} diff --git a/bitnami/mediawiki/templates/deployment.yaml b/bitnami/mediawiki/templates/deployment.yaml index 45288585b7..7a9a809ddc 100644 --- a/bitnami/mediawiki/templates/deployment.yaml +++ b/bitnami/mediawiki/templates/deployment.yaml @@ -44,6 +44,13 @@ spec: podAntiAffinity: {{- include "common.affinities.pods" (dict "type" .Values.podAntiAffinityPreset "context" $) | nindent 10 }} nodeAffinity: {{- include "common.affinities.nodes" (dict "type" .Values.nodeAffinityPreset.type "key" .Values.nodeAffinityPreset.key "values" .Values.nodeAffinityPreset.values) | nindent 10 }} {{- end }} + {{- if .Values.schedulerName }} + schedulerName: {{ .Values.schedulerName }} + {{- end }} + {{- if .Values.topologySpreadConstraints }} + topologySpreadConstraints: {{- include "common.tplvalues.render" (dict "value" .Values.topologySpreadConstraints "context" .) | nindent 8 }} + {{- end }} + priorityClassName: {{ .Values.priorityClassName | quote }} {{- if .Values.nodeSelector }} nodeSelector: {{- include "common.tplvalues.render" ( dict "value" .Values.nodeSelector "context" $) | nindent 8 }} {{- end }} @@ -69,7 +76,12 @@ spec: {{- if .Values.args }} args: {{- include "common.tplvalues.render" (dict "value" .Values.args "context" $) | nindent 12 }} {{- end }} + {{- if .Values.lifecycleHooks }} + lifecycle: {{- include "common.tplvalues.render" (dict "value" .Values.lifecycleHooks "context" $) | nindent 12 }} + {{- end }} env: + - name: BITNAMI_DEBUG + value: {{ ternary "true" "false" .Values.image.debug | quote }} - name: ALLOW_EMPTY_PASSWORD value: {{ .Values.allowEmptyPassword | quote }} - name: MARIADB_HOST @@ -85,9 +97,9 @@ spec: secretKeyRef: name: {{ include "mediawiki.databaseSecretName" . }} key: mariadb-password - {{- $port:=.Values.service.port | toString }} + {{- $port:= ( coalesce .Values.service.ports.http .Values.service.port) | toString }} - name: MEDIAWIKI_HOST - value: "{{ include "mediawiki.host" . }}{{- if ne $port "80" }}:{{ .Values.service.port }}{{ end }}" + value: "{{ include "mediawiki.host" . }}{{- if ne $port "80" }}:{{ coalesce .Values.service.ports.http .Values.service.port }}{{ end }}" - name: MEDIAWIKI_USERNAME value: {{ .Values.mediawikiUser | quote }} - name: MEDIAWIKI_PASSWORD @@ -139,10 +151,15 @@ spec: ports: - name: http containerPort: 8080 - {{- if .Values.service.httpsPort }} + {{- if or .Values.service.ports.https .Values.service.httpsPort }} - name: https containerPort: 443 - {{ end }} + {{ end }} + {{- if .Values.startupProbe.enabled }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.startupProbe "enabled") "context" $) | nindent 12 }} + {{- else if .Values.customStartupProbe }} + startupProbe: {{- include "common.tplvalues.render" (dict "value" .Values.customStartupProbe "context" $) | nindent 12 }} + {{- end }} {{- if .Values.livenessProbe.enabled }} livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.livenessProbe "enabled") "context" $) | nindent 12 }} {{- else if .Values.customLivenessProbe }} diff --git a/bitnami/mediawiki/templates/ingress.yaml b/bitnami/mediawiki/templates/ingress.yaml index eae3c32f52..31074f7c22 100644 --- a/bitnami/mediawiki/templates/ingress.yaml +++ b/bitnami/mediawiki/templates/ingress.yaml @@ -20,6 +20,9 @@ metadata: {{- end }} {{- end }} spec: + {{- if and .Values.ingress.ingressClassName (eq "true" (include "common.ingress.supportsIngressClassname" .)) }} + ingressClassName: {{ .Values.ingress.ingressClassName | quote }} + {{- end }} rules: {{- if .Values.ingress.hostname }} - host: {{ .Values.ingress.hostname }} diff --git a/bitnami/mediawiki/templates/mediawiki-pvc.yaml b/bitnami/mediawiki/templates/mediawiki-pvc.yaml index c0fa72b3ec..4e88483a06 100644 --- a/bitnami/mediawiki/templates/mediawiki-pvc.yaml +++ b/bitnami/mediawiki/templates/mediawiki-pvc.yaml @@ -7,12 +7,24 @@ metadata: {{- 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 }} + {{- if or .Values.persistence.annotations .Values.commonAnnotations }} + annotations: + {{- if .Values.persistence.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.persistence.annotations "context" $ ) | nindent 4 }} + {{- end }} + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + {{- end }} {{- end }} spec: accessModes: + {{- if not (empty .Values.persistence.accessModes) }} + {{- range .Values.persistence.accessModes }} + - {{ . | quote }} + {{- end }} + {{- else }} - {{ .Values.persistence.accessMode | quote }} + {{- end }} resources: requests: storage: {{ .Values.persistence.size | quote }} diff --git a/bitnami/mediawiki/templates/servicemonitor.yaml b/bitnami/mediawiki/templates/servicemonitor.yaml index a7e6d9aeef..0ac4db0f71 100644 --- a/bitnami/mediawiki/templates/servicemonitor.yaml +++ b/bitnami/mediawiki/templates/servicemonitor.yaml @@ -10,31 +10,42 @@ metadata: {{- end }} labels: {{- include "common.labels.standard" . | nindent 4 }} app.kubernetes.io/component: metrics - {{- if .Values.metrics.serviceMonitor.additionalLabels }} - {{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.additionalLabels "context" $) | nindent 4 }} - {{- end }} {{- 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 }} + {{- if .Values.metrics.serviceMonitor.labels }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.labels "context" $) | nindent 4 }} {{- end }} {{- if .Values.commonAnnotations }} - annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }} + annotations: {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }} {{- end }} spec: + jobLabel: {{ .Values.metrics.serviceMonitor.jobLabel | quote }} endpoints: - port: metrics path: /metrics + {{- if .Values.metrics.serviceMonitor.interval }} interval: {{ .Values.metrics.serviceMonitor.interval }} + {{- end }} {{- if .Values.metrics.serviceMonitor.scrapeTimeout }} scrapeTimeout: {{ .Values.metrics.serviceMonitor.scrapeTimeout }} {{- end }} + {{- if .Values.metrics.serviceMonitor.honorLabels }} honorLabels: {{ .Values.metrics.serviceMonitor.honorLabels }} - {{- if .Values.metrics.serviceMonitor.relabellings }} - metricRelabelings: {{- toYaml .Values.metrics.serviceMonitor.relabellings | nindent 8 }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.metricRelabelings }} + metricRelabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.metricRelabelings "context" $) | nindent 8 }} + {{- end }} + {{- if .Values.metrics.serviceMonitor.relabelings }} + relabelings: {{- include "common.tplvalues.render" ( dict "value" .Values.metrics.serviceMonitor.relabelings "context" $) | nindent 8 }} {{- end }} namespaceSelector: matchNames: - - {{ .Release.Namespace }} + - {{ .Release.Namespace | quote }} selector: matchLabels: {{- include "common.labels.matchLabels" . | nindent 6 }} app.kubernetes.io/component: metrics -{{- end }} \ No newline at end of file + {{- if .Values.metrics.serviceMonitor.selector }} + {{- include "common.tplvalues.render" (dict "value" .Values.metrics.serviceMonitor.selector "context" $) | nindent 6 }} + {{- end }} +{{- end }} diff --git a/bitnami/mediawiki/templates/svc.yaml b/bitnami/mediawiki/templates/svc.yaml index c77cbc4b98..cf65f35633 100644 --- a/bitnami/mediawiki/templates/svc.yaml +++ b/bitnami/mediawiki/templates/svc.yaml @@ -2,34 +2,54 @@ apiVersion: v1 kind: Service metadata: name: {{ template "common.names.fullname" . }} + 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 }} + annotations: + {{- if .Values.commonAnnotations }} + {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }} + {{- end }} + {{- if .Values.service.annotations }} + {{- include "common.tplvalues.render" ( dict "value" .Values.service.annotations "context" $) | nindent 4 }} + {{- end }} spec: type: {{ .Values.service.type }} - {{- if .Values.service.loadBalancerIP }} + {{- if and .Values.service.clusterIP (eq .Values.service.type "ClusterIP") }} + clusterIP: {{ .Values.service.clusterIP }} + {{- end }} + {{- if or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort") }} + externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy | quote }} + {{- end }} + {{- if and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerSourceRanges }} + loadBalancerSourceRanges: {{- toYaml .Values.service.loadBalancerSourceRanges | nindent 4 }} + {{- end }} + {{- if (and (eq .Values.service.type "LoadBalancer") (not (empty .Values.service.loadBalancerIP))) }} loadBalancerIP: {{ .Values.service.loadBalancerIP }} {{- end }} - {{- if (or (eq .Values.service.type "LoadBalancer") (eq .Values.service.type "NodePort")) }} - externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy | quote }} + {{- if .Values.service.sessionAffinity }} + sessionAffinity: {{ .Values.service.sessionAffinity }} + {{- end }} + {{- if .Values.service.sessionAffinityConfig }} + sessionAffinityConfig: {{- include "common.tplvalues.render" (dict "value" .Values.service.sessionAffinityConfig "context" $) | nindent 4 }} {{- end }} ports: - name: http - port: {{ .Values.service.port }} + port: {{ coalesce .Values.service.ports.http .Values.service.port }} targetPort: http {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePorts.http)))}} nodePort: {{ .Values.service.nodePorts.http }} {{- end }} - {{- if .Values.service.httpsPort }} + {{- if or .Values.service.ports.https .Values.service.httpsPort }} - name: https - port: {{ .Values.service.httpsPort }} + port: {{ coalesce .Values.service.ports.https .Values.service.httpsPort }} targetPort: https {{- if (and (eq .Values.service.type "NodePort") (not (empty .Values.service.nodePorts.https)))}} nodePort: {{ .Values.service.nodePorts.https }} {{- end }} - {{- end }} + {{- end }} + {{- if .Values.service.extraPorts }} + {{- include "common.tplvalues.render" (dict "value" .Values.service.extraPorts "context" $) | nindent 4 }} + {{- end }} selector: {{ include "common.labels.matchLabels" . | nindent 4 }} diff --git a/bitnami/mediawiki/values.yaml b/bitnami/mediawiki/values.yaml index 5f526b1db2..28eabd38c3 100644 --- a/bitnami/mediawiki/values.yaml +++ b/bitnami/mediawiki/values.yaml @@ -49,11 +49,12 @@ extraDeploy: [] ## @param image.tag MediaWiki image tag (immutable tags are recommended) ## @param image.pullPolicy Image pull policy ## @param image.pullSecrets Specify docker-registry secret names as an array +## @param image.debug Enable MediaWiki image debug mode ## image: registry: docker.io repository: bitnami/mediawiki - tag: 1.37.1-debian-10-r0 + tag: 1.37.1-debian-10-r20 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -67,6 +68,9 @@ image: ## - myRegistryKeySecretName ## pullSecrets: [] + ## Enable debug mode + ## + debug: false ## @param hostAliases [array] Deployment pod host aliases ## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/ ## @@ -120,6 +124,9 @@ command: [] ## @param args Override default container args (useful when using custom images) ## args: [] +## @param lifecycleHooks for the Mediawiki container(s) to automate configuration before or after startup +## +lifecycleHooks: {} ## @param extraEnvVars Extra environment variables to be set on Mediawki container ## Example: ## extraEnvVars: @@ -153,10 +160,12 @@ podSecurityContext: ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod ## @param containerSecurityContext.enabled Enable Mediawiki containers' SecurityContext ## @param containerSecurityContext.runAsUser User ID to run Mediawiki containers +## @param containerSecurityContext.runAsNonRoot Set Mediawiki container's Security Context runAsNonRoot ## containerSecurityContext: enabled: true runAsUser: 1001 + runAsNonRoot: true ## Mediawiki resource requests and limits ## ref: https://kubernetes.io/docs/user-guide/compute-resources/ ## We usually recommend not to specify default resources and to leave this as a conscious @@ -175,6 +184,32 @@ resources: requests: memory: 512Mi cpu: 300m +## Mediawiki containers' startup probe. +## Configure extra options for startup probe +## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes +## @param startupProbe.enabled Enable startupProbe +## @param startupProbe.httpGet.path Request path for startupProbe +## @param startupProbe.httpGet.port Port for startupProbe +## @param startupProbe.httpGet.httpHeaders [array] Headers for startupProbe +## @param startupProbe.initialDelaySeconds Initial delay seconds for startupProbe +## @param startupProbe.periodSeconds Period seconds for startupProbe +## @param startupProbe.timeoutSeconds Timeout seconds for startupProbe +## @param startupProbe.failureThreshold Failure threshold for startupProbe +## @param startupProbe.successThreshold Success threshold for startupProbe +## +startupProbe: + enabled: false + httpGet: + path: /api.php?action=query&meta=siteinfo&format=none + port: http + httpHeaders: + - name: Host + value: "{{ include \"mediawiki.host\" . }}" + initialDelaySeconds: 120 + periodSeconds: 10 + timeoutSeconds: 5 + failureThreshold: 6 + successThreshold: 1 ## Mediawiki containers' liveness probe. ## Configure extra options for liveness probe ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes @@ -227,6 +262,9 @@ readinessProbe: timeoutSeconds: 5 failureThreshold: 6 successThreshold: 1 +## @param customStartupProbe Override default startup probe +## +customStartupProbe: {} ## @param customLivenessProbe Override default liveness probe ## customLivenessProbe: {} @@ -282,6 +320,18 @@ nodeSelector: {} ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ ## tolerations: [] +## @param priorityClassName Mediawiki pods' priorityClassName +## +priorityClassName: "" +## @param schedulerName Name of the k8s scheduler (other than default) +## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/ +## +schedulerName: "" +## @param topologySpreadConstraints Topology Spread Constraints for pod assignment +## https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ +## The value is evaluated as a template +## +topologySpreadConstraints: [] ## @param extraVolumes Optionally specify extra list of additional volumes for Mediawki pods ## extraVolumes: [] @@ -330,12 +380,16 @@ persistence: ## If defined, PVC must be created manually before volume will be bound ## existingClaim: "" - ## @param persistence.accessMode PVC Access Mode for MediaWiki volume + ## @param persistence.accessModes [array] Persistent Volume access modes ## - accessMode: ReadWriteOnce + accessModes: + - ReadWriteOnce ## @param persistence.size PVC Storage Request for MediaWiki volume ## size: 8Gi + ## @param persistence.annotations Persistent Volume Claim annotations + ## + annotations: {} ## @section Traffic Exposure parameters @@ -348,16 +402,12 @@ service: ## For minikube, set this to NodePort, elsewhere use LoadBalancer ## type: LoadBalancer - ## @param service.loadBalancerIP Use serviceLoadBalancerIP to request a specific static IP, - ## otherwise leave blank + ## @param service.ports.http Service HTTP port + ## @param service.ports.https HTTPS Port. Set this to any value (recommended: 443) to enable the https service port ## - loadBalancerIP: "" - ## @param service.port Service HTTP port - ## - port: 80 - ## @param service.httpsPort HTTPS Port. Set this to any value (recommended: 443) to enable the https service port - ## - httpsPort: "" + ports: + http: 80 + https: 443 ## Use nodePorts to requests some specific ports when using NodePort ## @param service.nodePorts.http Kubernetes http node port ## @param service.nodePorts.https Kubernetes https node port @@ -372,6 +422,39 @@ service: ## ref https://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip ## externalTrafficPolicy: Cluster + ## @param service.clusterIP Mediawiki service Cluster IP + ## e.g.: + ## clusterIP: None + ## + clusterIP: "" + ## @param service.loadBalancerIP Mediawiki service Load Balancer IP + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-loadbalancer + ## + loadBalancerIP: "" + ## @param service.loadBalancerSourceRanges Mediawiki 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 service.extraPorts Extra ports to expose (normally used with the `sidecar` value) + ## + extraPorts: [] + ## @param service.annotations Additional custom annotations for Mediawiki service + ## + annotations: {} + ## @param service.sessionAffinity Session Affinity for Kubernetes service, can be "None" or "ClientIP" + ## If "ClientIP", consecutive client requests will be directed to the same Pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#virtual-ips-and-service-proxies + ## + sessionAffinity: None + ## @param service.sessionAffinityConfig Additional settings for the sessionAffinity + ## sessionAffinityConfig: + ## clientIP: + ## timeoutSeconds: 300 + ## + sessionAffinityConfig: {} ## Configure the ingress resource that allows you to access the Mediawiki installation. Set up the URL ## ref: https://kubernetes.io/docs/user-guide/ingress/ ## @@ -451,6 +534,11 @@ ingress: ## certificate: ## secrets: [] + ## @param ingress.ingressClassName IngressClass that will be be used to implement the Ingress (Kubernetes 1.18+) + ## This is supported in Kubernetes 1.18+ and required if you have more than one IngressClass marked as the default for your cluster . + ## ref: https://kubernetes.io/blog/2020/04/02/improvements-to-the-ingress-api-in-kubernetes-1.18/ + ## + ingressClassName: "" ## @section Database parameters @@ -553,7 +641,7 @@ metrics: image: registry: docker.io repository: bitnami/apache-exporter - tag: 0.10.1-debian-10-r83 + tag: 0.11.0-debian-10-r18 pullPolicy: IfNotPresent ## Optionally specify an array of imagePullSecrets. ## Secrets must be manually created in the namespace. @@ -594,15 +682,27 @@ metrics: ## @param metrics.serviceMonitor.scrapeTimeout The timeout after which the scrape is ended ## scrapeTimeout: "" - ## @param metrics.serviceMonitor.relabellings Metrics relabellings to add to the scrape endpoint + ## @param metrics.serviceMonitor.relabelings RelabelConfigs to apply to samples before scraping + ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#relabelconfig ## - relabellings: [] - ## @param metrics.serviceMonitor.honorLabels Labels to honor to add to the scrape endpoint + relabelings: [] + ## @param metrics.serviceMonitor.metricRelabelings MetricRelabelConfigs to apply to samples before ingestion + ## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#relabelconfig + ## + metricRelabelings: [] + ## @param metrics.serviceMonitor.selector ServiceMonitor selector labels + ## ref: https://github.com/bitnami/charts/tree/master/bitnami/prometheus-operator#prometheus-configuration + ## + ## selector: + ## prometheus: my-prometheus + ## + selector: {} + ## @param metrics.serviceMonitor.labels Extra labels for the ServiceMonitor + ## + labels: {} + ## @param metrics.serviceMonitor.honorLabels honorLabels chooses the metric's labels on collisions with target labels ## honorLabels: false - ## @param metrics.serviceMonitor.additionalLabels Additional custom labels for the ServiceMonitor - ## - additionalLabels: {} ## @section NetworkPolicy parameters