Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-16 06:47:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/several] Simplify image definition logic removing duplications (#7114)

Browse Source 
* [bitnami/solr] Simplify image definition logic removing duplications

* [bitnami/redmine] Simplify image definition logic removing duplications

* [bitnami/kafka] Simplify image definition logic removing duplications

* Fix READMEs

* [bitnami/grafana-operator] Simplify image definition logic removing duplications

* Add PR ID to the README

* Remove blank line
This commit is contained in:
Carlos Rodríguez Hernández
2021-08-02 13:29:35 +02:00
committed by GitHub
parent 481cc7edf7
commit 43e4eee921
24 changed files with 211 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/solr/Chart.yaml
View File

@@ -27,4 +27,4 @@ name: solr
sources:
- https://github.com/bitnami/bitnami-docker-solr
- https://lucene.apache.org/solr/
version: 1.0.5
version: 2.0.0

31
bitnami/solr/README.md
View File

@@ -224,11 +224,6 @@ The command removes all the Kubernetes components associated with the chart and
| Name | Description | Value |
| ------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------- |
| `exporter.enabled` | Start a side-car prometheus exporter | `false` |
| `exporter.image.registry` | Solr exporter image registry | `docker.io` |
| `exporter.image.repository` | Solr exporter image name | `bitnami/solr` |
| `exporter.image.tag` | Solr exporter image tag | `8.9.0-debian-10-r14` |
| `exporter.image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `exporter.image.pullSecrets` | Specify docker-registry secret names as an array | `[]` |
| `exporter.livenessProbe.enabled` | Enable livenessProbe | `true` |
| `exporter.livenessProbe.initialDelaySeconds` | Initial delay seconds for livenessProbe | `10` |
| `exporter.livenessProbe.periodSeconds` | Period seconds for livenessProbe | `5` |
@@ -365,6 +360,32 @@ Find more information about how to deal with common errors related to Bitnami’
## Upgrading
### To 2.0.0
In this version, the `image` block is defined once and is used in the different templates, while in the previous version, the `image` block was duplicated for the main container and the metrics one
```yaml
image:
registry: docker.io
repository: bitnami/solr
tag: 8.9.0
```
VS
```yaml
image:
registry: docker.io
repository: bitnami/solr
tag: 8.9.0
...
metrics:
image:
registry: docker.io
repository: bitnami/solr
tag: 8.9.0
```
See [PR#7114](https://github.com/bitnami/charts/pull/7114) for more info about the implemented changes
### To 1.0.0
This major updates the Zookeeper subchart to it newest major, 7.0.0, which renames all TLS-related settings. For more information on this subchart's major, please refer to [zookeeper upgrade notes](https://github.com/bitnami/charts/tree/master/bitnami/zookeeper#to-700).

1
bitnami/solr/templates/NOTES.txt
View File

@@ -63,7 +63,6 @@ To connect to your Solr from outside the cluster execute the following commands:
{{- end }}
{{- include "common.warnings.rollingTag" .Values.image }}
{{- include "common.warnings.rollingTag" .Values.exporter.image }}
{{- if .Values.authentication.enabled -}}
{{- $requiredPasswords := list -}}

7
bitnami/solr/templates/_helpers.tpl
View File

@@ -37,13 +37,6 @@ Return the proper Apache Solr image name
{{- include "common.images.image" (dict "imageRoot" .Values.image "global" .Values.global) -}}
{{- end -}}
{{/*
Return the proper Solr Exporter image name
*/}}
{{- define "exporter.image" -}}
{{- include "common.images.image" (dict "imageRoot" .Values.exporter.image "global" .Values.global) -}}
{{- end -}}
{{/*
Return the proper image name (for the init container volume-permissions image)
*/}}

4
bitnami/solr/templates/exporter-deployment.yaml
View File

@@ -66,8 +66,8 @@ spec:
{{- end }}
containers:
- name: solr-exporter
image: {{ include "exporter.image" . }}
imagePullPolicy: {{ .Values.exporter.image.pullPolicy }}
image: {{ include "solr.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
{{- if .Values.exporter.containerSecurityContext.enabled }}
securityContext: {{- omit .Values.exporter.containerSecurityContext "enabled" | toYaml | nindent 12 }}
{{- end }}

23
bitnami/solr/values.yaml
View File

@@ -590,29 +590,6 @@ exporter:
## @param exporter.enabled Start a side-car prometheus exporter
##
enabled: false
## @param exporter.image.registry Solr exporter image registry
## @param exporter.image.repository Solr exporter image name
## @param exporter.image.tag Solr exporter image tag
## @param exporter.image.pullPolicy Image pull policy
## @param exporter.image.pullSecrets Specify docker-registry secret names as an array
##
image:
registry: docker.io
repository: bitnami/solr
tag: 8.9.0-debian-10-r14
## 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
##
pullPolicy: IfNotPresent
## Optionally specify an array of imagePullSecrets.
## Secrets must be manually created in the namespace.
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
## e.g:
## pullSecrets:
## - myRegistryKeySecretName
##
pullSecrets: []
## Configure extra options for liveness probe
## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
## @param exporter.livenessProbe.enabled Enable livenessProbe