From 75ede5a1f9bfabfa19e08f8a00150b15df868a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Rodr=C3=ADguez=20Hern=C3=A1ndez?= Date: Tue, 19 Jan 2021 17:58:46 +0100 Subject: [PATCH] [bitnami/magento] Drop values-production.yaml support (#5113) --- bitnami/magento/Chart.yaml | 2 +- bitnami/magento/README.md | 10 - bitnami/magento/values-production.yaml | 555 ------------------------- 3 files changed, 1 insertion(+), 566 deletions(-) delete mode 100644 bitnami/magento/values-production.yaml diff --git a/bitnami/magento/Chart.yaml b/bitnami/magento/Chart.yaml index 2c6714752..77d4c5221 100644 --- a/bitnami/magento/Chart.yaml +++ b/bitnami/magento/Chart.yaml @@ -33,4 +33,4 @@ name: magento sources: - https://github.com/bitnami/bitnami-docker-magento - https://magento.com/ -version: 16.0.5 +version: 16.0.6 diff --git a/bitnami/magento/README.md b/bitnami/magento/README.md index 9b5db17d3..0d0145dc0 100644 --- a/bitnami/magento/README.md +++ b/bitnami/magento/README.md @@ -249,16 +249,6 @@ It is strongly recommended to use immutable tags in a production environment. Th Bitnami will release a new chart updating its containers if a new version of the main container, significant changes, or critical vulnerabilities exist. -### Production configuration - -This chart includes a `values-production.yaml` file where you can find some parameters oriented to production configuration in comparison to the regular `values.yaml`. You can use this file instead of the default one. - -- Start a side-car prometheus exporter: -```diff -- metrics.enabled: false -+ metrics.enabled: true -``` - ### Ingress This chart provides support for ingress resources. If you have an ingress controller installed on your cluster, such as [nginx-ingress-controller](https://github.com/bitnami/charts/tree/master/bitnami/nginx-ingress-controller) or [contour](https://github.com/bitnami/charts/tree/master/bitnami/contour) you can utilize the ingress controller to serve your application. diff --git a/bitnami/magento/values-production.yaml b/bitnami/magento/values-production.yaml deleted file mode 100644 index c36718021..000000000 --- a/bitnami/magento/values-production.yaml +++ /dev/null @@ -1,555 +0,0 @@ -## 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 and imagePullSecrets -## -# global: -# imageRegistry: myRegistryName -# imagePullSecrets: -# - myRegistryKeySecretName -# storageClass: myStorageClass - -## Bitnami Magento image version -## ref: https://hub.docker.com/r/bitnami/magento/tags/ -## -image: - registry: docker.io - repository: bitnami/magento - tag: 2.4.1-debian-10-r78 - ## Set to true if you would like to see extra information on logs - ## It turns BASH and NAMI debugging in minideb - ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging - ## - debug: false - ## 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/ - ## - # pullSecrets: - # - myRegistryKeySecretName - -## String to partially override common.names.fullname template (will maintain the release name) -## -# nameOverride: - -## String to fully override common.names.fullname template -## -# fullnameOverride: - -## Add labels to all the deployed resources -## -commonLabels: {} - -## Add annotations to all the deployed resources -## -commonAnnotations: {} - -## Kubernetes Cluster Domain -## -clusterDomain: cluster.local - -## Extra objects to deploy (value evaluated as a template) -## -extraDeploy: [] - -## Magento host to create application URLs -## ref: https://github.com/bitnami/bitnami-docker-magento#configuration -## -# magentoHost: - -## User of the application -## ref: https://github.com/bitnami/bitnami-docker-magento#configuration -## -magentoUsername: user - -## Application password -## Defaults to a random 10-character alphanumeric string if not set -## ref: https://github.com/bitnami/bitnami-docker-magento#configuration -## -# magentoPassword: - -## Admin email -## ref: https://github.com/bitnami/bitnami-docker-magento#configuration -## -magentoEmail: user@example.com - -## Prefix for Magento Admin -## ref: https://github.com/bitnami/bitnami-docker-magento#configuration -## -magentoAdminUri: admin - -## First Name -## ref: https://github.com/bitnami/bitnami-docker-magento#configuration -## -magentoFirstName: FirstName - -## Last Name -## ref: https://github.com/bitnami/bitnami-docker-magento#configuration -## -magentoLastName: LastName - -## Mode -## ref: https://github.com/bitnami/bitnami-docker-magento#configuration -## -magentoMode: developer - -## Use SSL to access the Magento Admin. Valid values: `true`, `false` -## ref: https://github.com/bitnami/bitnami-docker-magento#configuration -## -magentoUseSecureAdmin: false - -## Skip Magento Indexer reindex step during the initialization. Valid values: `true`, `false` -## -magentoSkipReindex: false - -## Set to `yes` to allow the container to be started with blank passwords -## ref: https://github.com/bitnami/bitnami-docker-magento#environment-variables -allowEmptyPassword: "yes" - -## Command and args for running the container (set to default if not set). Use array form -## -command: [] -args: [] - -## An array to add extra env vars -## Example: -## extraEnvVars: -## - name: FOO -## value: "bar" -## -extraEnvVars: [] - -## ConfigMap with extra environment variables -## -extraEnvVarsCM: - -## Secret with extra environment variables -## -extraEnvVarsSecret: - -## Strategy to use to update Pods -## -updateStrategy: - ## StrategyType - ## Can be set to RollingUpdate or OnDelete - ## - type: RollingUpdate - -## Magento pods' Security Context -## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container -## -podSecurityContext: - enabled: false - ## fsGroup: 1001 - -## Magento containers' SecurityContext -## ref: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod -## -containerSecurityContext: - enabled: false - ## runAsUser: 1001 - ## runAsNonRoot: true - -## Magento resource requests and limits -## ref: http://kubernetes.io/docs/user-guide/compute-resources/ -## -resources: - # We usually recommend not to specify default resources and to leave this as a conscious - # choice for the user. This also increases chances charts run on environments with little - # resources, such as Minikube. If you do want to specify resources, uncomment the following - # lines, adjust them as necessary, and remove the curly braces after 'resources:'. - limits: {} - # cpu: 200m - # memory: 256Mi - requests: - memory: 512Mi - cpu: 300m - -## Magento containers' liveness and readiness probes. -## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes -## -livenessProbe: - enabled: true - httpGet: - path: /index.php - port: http - httpHeaders: - - name: Host - value: "{{ include \"magento.host\" . }}" - initialDelaySeconds: 1000 - periodSeconds: 10 - timeoutSeconds: 5 - successThreshold: 1 - failureThreshold: 6 -readinessProbe: - enabled: true - httpGet: - path: /index.php - port: http - httpHeaders: - - name: Host - value: "{{ include \"magento.host\" . }}" - initialDelaySeconds: 30 - periodSeconds: 5 - timeoutSeconds: 3 - successThreshold: 1 - failureThreshold: 3 - -## Custom Liveness probes for Magento -## -customLivenessProbe: {} - -## Custom Rediness probes Magento -## -customReadinessProbe: {} - -## Pod extra labels -## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ -## -podLabels: {} - -## Annotations for server pods. -## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ -## -podAnnotations: {} - -## Pod affinity preset -## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity -## Allowed values: soft, hard -## -podAffinityPreset: "" - -## Pod anti-affinity preset -## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity -## Allowed values: soft, hard -## -podAntiAffinityPreset: soft - -## Node affinity preset -## Ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity -## Allowed values: soft, hard -## -nodeAffinityPreset: - ## Node affinity type - ## Allowed values: soft, hard - type: "" - ## Node label key to match - ## E.g. - ## key: "kubernetes.io/e2e-az-name" - ## - key: "" - ## Node label values to match - ## E.g. - ## values: - ## - e2e-az1 - ## - e2e-az2 - ## - values: [] - -## Affinity for pod assignment. Evaluated as a template. -## 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 -## -affinity: {} - -## Node labels for pod assignment. Evaluated as a template. -## ref: https://kubernetes.io/docs/user-guide/node-selection/ -## -nodeSelector: {} - -## Tolerations for pod assignment. Evaluated as a template. -## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ -## -tolerations: [] - -## Extra volumes to add to the deployment -## -extraVolumes: [] - -## Extra volume mounts to add to the container -## -extraVolumeMounts: [] - -## Add init containers to the Magento pods. -## Example: -## initContainers: -## - name: your-image-name -## image: your-image -## imagePullPolicy: Always -## ports: -## - name: portname -## containerPort: 1234 -## -initContainers: {} - -## Add sidecars to the Magento pods. -## Example: -## sidecars: -## - name: your-image-name -## image: your-image -## imagePullPolicy: Always -## ports: -## - name: portname -## containerPort: 1234 -## -sidecars: {} - -## Enable persistence using Persistent Volume Claims -## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ -## -persistence: - enabled: true - apache: - ## apache data Persistent Volume Storage Class - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - # storageClass: "-" - accessMode: ReadWriteOnce - size: 1Gi - magento: - ## magento data Persistent Volume Storage Class - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - # storageClass: "-" - accessMode: ReadWriteOnce - size: 8Gi - -## Kubernetes configuration -## For minikube, set this to NodePort, elsewhere use LoadBalancer -## -service: - type: LoadBalancer - # HTTP Port - port: 80 - # HTTPS Port - httpsPort: 443 - ## - ## loadBalancerIP: - ## nodePorts: - ## http: - ## https: - nodePorts: - http: "" - https: "" - ## Enable client source IP preservation - ## ref http://kubernetes.io/docs/tasks/access-application-cluster/create-external-load-balancer/#preserving-the-client-source-ip - ## - externalTrafficPolicy: Cluster - -## Ingress configuration -## -ingress: - ## Set to true to enable ingress record generation - ## - enabled: false - - ## Set this to true in order to add the corresponding annotations for cert-manager - ## - certManager: false - - ## When the ingress is enabled, a host pointing to this will be created - ## - hostname: magento.local - - ## Ingress annotations done as key:value pairs - ## For a full list of possible ingress annotations, please see - ## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/annotations.md - ## - ## If certManager is set to true, annotation kubernetes.io/tls-acme: "true" will automatically be set - ## - annotations: {} - - ## Enable TLS configuration for the hostname defined at ingress.hostname parameter - ## TLS certificates will be retrieved from a TLS secret with name: {{- printf "%s-tls" .Values.ingress.hostname }} - ## You can use the ingress.secrets parameter to create this TLS secret, relay on cert-manager to create it, or - ## let the chart create self-signed certificates for you - ## - tls: false - - ## 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 - ## Example: - ## extraHosts: - ## - name: magento.local - ## path: / - ## - extraHosts: [] - - ## The tls configuration for additional hostnames to be covered with this ingress record. - ## see: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls - ## Example: - ## extraTls: - ## - hosts: - ## - magento.local - ## secretName: magento.local-tls - ## - extraTls: [] - - ## 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 secretName set further up - ## - ## If it is not set and you're using cert-manager, this is unneeded, as it will create the secret for you - ## If it is not set and you're NOT using cert-manager either, self-signed certificates will be created - ## It is also possible to create and manage the certificates outside of this helm chart - ## Please see README.md for more information - ## - ## Example - ## secrets: - ## - name: magento.local-tls - ## key: "" - ## certificate: "" - ## - secrets: [] - -## Prometheus Exporter / Metrics -## -metrics: - enabled: true - image: - registry: docker.io - repository: bitnami/apache-exporter - tag: 0.8.0-debian-10-r272 - 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/ - ## - # pullSecrets: - # - myRegistryKeySecretName - ## Metrics exporter pod Annotation and Labels - ## - podAnnotations: - prometheus.io/scrape: "true" - prometheus.io/port: "9117" - ## Metrics exporter resource requests and limits - ## ref: http://kubernetes.io/docs/user-guide/compute-resources/ - ## - resources: {} - -## -## External database configuration -## -externalDatabase: - ## Use existing secret (ignores previous password) - ## must contain key `mariadb-password` - ## NOTE: When it's set, the `externalDatabase.password` parameter is ignored - # existingSecret: - - ## Database host - host: - - ## Database port - port: 3306 - - ## Database user - user: bn_magento - - ## Database password - password: - - ## Database name - database: bitnami_magento - -## -## External elasticsearch configuration -## -externalElasticsearch: - ## Elasticsearch host - host: - - ## Elasticsearch port - port: - -## -## MariaDB chart configuration -## -## https://github.com/bitnami/charts/blob/master/bitnami/mariadb/values.yaml -## -mariadb: - ## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters - ## - enabled: true - ## Override MariaDB default image as 10.5 is not supported https://devdocs.magento.com/guides/v2.4/install-gde/system-requirements.html#database - ## ref: https://github.com/bitnami/bitnami-docker-mariadb - image: - registry: docker.io - repository: bitnami/mariadb - tag: 10.4.17-debian-10-r63 - - ## MariaDB architecture. Allowed values: standalone or replication - ## - architecture: standalone - - ## MariaDB Authentication parameters - ## - auth: - ## MariaDB root password - ## ref: https://github.com/bitnami/bitnami-docker-mariadb#setting-the-root-password-on-first-run - ## - rootPassword: "" - ## MariaDB custom user and database - ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-on-first-run - ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-user-on-first-run - ## - database: bitnami_magento - username: bn_magento - password: "" - - primary: - ## Enable persistence using Persistent Volume Claims - ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ - ## - persistence: - enabled: true - ## mariadb data Persistent Volume Storage Class - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - storageClass: - accessModes: - - ReadWriteOnce - size: 8Gi - ## Set path in case you want to use local host path volumes (not recommended in production) - ## - hostPath: - ## Use an existing PVC - ## - existingClaim: - -## -## Elasticsearch chart configuration -## -## https://github.com/bitnami/charts/blob/master/bitnami/elasticsearch/values.yaml -## -elasticsearch: - ## Whether to deploy a elasticsearch server to use as magento's search engine - ## To use an external server set this to false and configure the externalElasticsearch parameters - enabled: true - ## Enable to perform the sysctl operation - sysctlImage: - enabled: true - ## Elasticsearch master-eligible node parameters - master: - replicas: 1 - ## Elasticsearch coordinating-only node parameters - coordinating: - replicas: 1 - ## Elasticsearch data node parameters - data: - replicas: 1