diff --git a/README.md b/README.md index 0c778e777..f9740d78f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # The Bitnami Library for Kubernetes -Popular applications, provided by [Bitnami](https://bitnami.com), ready to launch on Kubernetes using [Kubernetes Helm](https://github.com/kubernetes/helm). +Popular applications, provided by [Bitnami](https://bitnami.com), ready to launch on Kubernetes using [Kubernetes Helm](https://github.com/helm/helm). ## TL;DR @@ -9,34 +9,34 @@ $ helm repo add bitnami https://charts.bitnami.com/bitnami $ helm search bitnami ``` -## Upstreamed charts (contributed to [kubernetes/charts](https://github.com/kubernetes/charts)) +## Upstreamed charts (contributed to [helm/charts](https://github.com/helm/charts)) -- [Dokuwiki](https://github.com/kubernetes/charts/tree/master/stable/dokuwiki) -- [Drupal](https://github.com/kubernetes/charts/tree/master/stable/drupal) -- [Ghost](https://github.com/kubernetes/charts/tree/master/stable/ghost) -- [JasperReports](https://github.com/kubernetes/charts/tree/master/stable/jasperreports) -- [Joomla!](https://github.com/kubernetes/charts/tree/master/stable/joomla) -- [Magento](https://github.com/kubernetes/charts/tree/master/stable/magento) -- [MariaDB](https://github.com/kubernetes/charts/tree/master/stable/mariadb) -- [MediaWiki](https://github.com/kubernetes/charts/tree/master/stable/mediawiki) -- [MongoDB](https://github.com/kubernetes/charts/tree/master/stable/mongodb) -- [Moodle](https://github.com/kubernetes/charts/tree/master/stable/moodle) -- [Odoo](https://github.com/kubernetes/charts/tree/master/stable/odoo) -- [OpenCart](https://github.com/kubernetes/charts/tree/master/stable/opencart) -- [OrangeHRM](https://github.com/kubernetes/charts/tree/master/stable/orangehrm) -- [Osclass](https://github.com/kubernetes/charts/tree/master/stable/osclass) -- [OwnCloud](https://github.com/kubernetes/charts/tree/master/stable/owncloud) -- [Parse](https://github.com/kubernetes/charts/tree/master/stable/parse) -- [Phabricator](https://github.com/kubernetes/charts/tree/master/stable/phabricator) -- [phpBB](https://github.com/kubernetes/charts/tree/master/stable/phpbb) -- [PrestaShop](https://github.com/kubernetes/charts/tree/master/stable/prestashop) -- [RabbitMQ](https://github.com/kubernetes/charts/tree/master/stable/rabbitmq) -- [Redis](https://github.com/kubernetes/charts/tree/master/stable/redis) -- [Redmine](https://github.com/kubernetes/charts/tree/master/stable/redmine) -- [SugarCRM](https://github.com/kubernetes/charts/tree/master/stable/sugarcrm) -- [SuiteCRM](https://github.com/kubernetes/charts/tree/master/stable/suitecrm) -- [TestLink](https://github.com/kubernetes/charts/tree/master/stable/testlink) -- [WordPress](https://github.com/kubernetes/charts/tree/master/stable/wordpress) +- [Dokuwiki](https://github.com/helm/charts/tree/master/stable/dokuwiki) +- [Drupal](https://github.com/helm/charts/tree/master/stable/drupal) +- [Ghost](https://github.com/helm/charts/tree/master/stable/ghost) +- [JasperReports](https://github.com/helm/charts/tree/master/stable/jasperreports) +- [Joomla!](https://github.com/helm/charts/tree/master/stable/joomla) +- [Magento](https://github.com/helm/charts/tree/master/stable/magento) +- [MariaDB](https://github.com/helm/charts/tree/master/stable/mariadb) +- [MediaWiki](https://github.com/helm/charts/tree/master/stable/mediawiki) +- [MongoDB](https://github.com/helm/charts/tree/master/stable/mongodb) +- [Moodle](https://github.com/helm/charts/tree/master/stable/moodle) +- [Odoo](https://github.com/helm/charts/tree/master/stable/odoo) +- [OpenCart](https://github.com/helm/charts/tree/master/stable/opencart) +- [OrangeHRM](https://github.com/helm/charts/tree/master/stable/orangehrm) +- [Osclass](https://github.com/helm/charts/tree/master/stable/osclass) +- [OwnCloud](https://github.com/helm/charts/tree/master/stable/owncloud) +- [Parse](https://github.com/helm/charts/tree/master/stable/parse) +- [Phabricator](https://github.com/helm/charts/tree/master/stable/phabricator) +- [phpBB](https://github.com/helm/charts/tree/master/stable/phpbb) +- [PrestaShop](https://github.com/helm/charts/tree/master/stable/prestashop) +- [RabbitMQ](https://github.com/helm/charts/tree/master/stable/rabbitmq) +- [Redis](https://github.com/helm/charts/tree/master/stable/redis) +- [Redmine](https://github.com/helm/charts/tree/master/stable/redmine) +- [SugarCRM](https://github.com/helm/charts/tree/master/stable/sugarcrm) +- [SuiteCRM](https://github.com/helm/charts/tree/master/stable/suitecrm) +- [TestLink](https://github.com/helm/charts/tree/master/stable/testlink) +- [WordPress](https://github.com/helm/charts/tree/master/stable/wordpress) ## Bitnami charts @@ -77,11 +77,11 @@ The above command creates a new cluster named `my-cluster`. You can name the clu Helm is a tool for managing Kubernetes charts. Charts are packages of pre-configured Kubernetes resources. -To install Helm, refer to the [Helm install guide](https://github.com/kubernetes/helm#install) and ensure that the `helm` binary is in the `PATH` of your shell. +To install Helm, refer to the [Helm install guide](https://github.com/helm/helm#install) and ensure that the `helm` binary is in the `PATH` of your shell. ### Add Repo -The stable charts are contributed to the upstream [kubernetes/charts](https://github.com/kubernetes/charts) repository. The following command allows you to download and install all the charts from this repository, both the bitnami and the upstreamed ones. +The stable charts are contributed to the upstream [helm/charts](https://github.com/helm/charts) repository. The following command allows you to download and install all the charts from this repository, both the bitnami and the upstreamed ones. ```bash $ helm repo add bitnami https://charts.bitnami.com/bitnami @@ -91,7 +91,7 @@ $ helm repo add bitnami https://charts.bitnami.com/bitnami Once you have installed the Helm client and initialized the Tiller server, you can deploy a Bitnami Helm Chart into a Kubernetes cluster. -Please refer to the [Quick Start guide](https://github.com/kubernetes/helm/blob/master/docs/quickstart.md) if you wish to get running in just a few commands, otherwise the [Using Helm Guide](https://github.com/kubernetes/helm/blob/master/docs/using_helm.md) provides detailed instructions on how to use the Helm client to manage packages on your Kubernetes cluster. +Please refer to the [Quick Start guide](https://github.com/helm/helm/blob/master/docs/quickstart.md) if you wish to get running in just a few commands, otherwise the [Using Helm Guide](https://github.com/helm/helm/blob/master/docs/using_helm.md) provides detailed instructions on how to use the Helm client to manage packages on your Kubernetes cluster. Useful Helm Client Commands: * View available charts: `helm search` diff --git a/_docs/README_TEMPLATE.md b/_docs/README_TEMPLATE.md index ccff90e37..b161bb7df 100644 --- a/_docs/README_TEMPLATE.md +++ b/_docs/README_TEMPLATE.md @@ -22,7 +22,7 @@ > **Sample** > -> This chart bootstraps a MediaWiki deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. The chart depends upon the [MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) for the database requirements of MediaWiki. +> This chart bootstraps a MediaWiki deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. The chart depends upon the [MariaDB chart](https://github.com/helm/charts/tree/master/stable/mariadb) for the database requirements of MediaWiki. > > The chart uses the [Bitnami MediaWiki Docker Image](https://hub.docker.com/r/bitnami/mediawiki) for setting up the MediaWiki deployment and is developed, contributed and maintained by [Bitnami](https://bitnami.com). diff --git a/bitnami/apache/Chart.yaml b/bitnami/apache/Chart.yaml index e25376545..6c97d0279 100644 --- a/bitnami/apache/Chart.yaml +++ b/bitnami/apache/Chart.yaml @@ -1,5 +1,5 @@ name: apache -version: 2.0.1 +version: 2.0.2 appVersion: 2.4.35 description: Chart for Apache HTTP Server keywords: diff --git a/bitnami/apache/README.md b/bitnami/apache/README.md index 9db7be924..aba86f002 100644 --- a/bitnami/apache/README.md +++ b/bitnami/apache/README.md @@ -16,6 +16,8 @@ Bitnami charts for Helm are carefully engineered, actively maintained and are th This chart bootstraps a [Apache](https://github.com/bitnami/bitnami-docker-apache) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Installing the Chart To install the chart with the release name `my-release`: diff --git a/bitnami/consul/Chart.yaml b/bitnami/consul/Chart.yaml index eb5aa9685..05256d2b5 100755 --- a/bitnami/consul/Chart.yaml +++ b/bitnami/consul/Chart.yaml @@ -2,13 +2,13 @@ name: consul home: https://www.consul.io/ sources: - https://github.com/bitnami/consul -version: 2.0.1 -appVersion: 1.0.6 +version: 2.0.4 +appVersion: 1.2.3 description: Highly available and distributed service discovery and key-value store designed with support for the modern data center to make distributed systems and configuration easy. icon: https://raw.githubusercontent.com/hashicorp/consul/bce3809dfca37b883828c3715b84143dd71c0f85/website/source/assets/images/favicons/android-chrome-512x512.png maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl diff --git a/bitnami/consul/README.md b/bitnami/consul/README.md index bb0b333e8..969d6c20b 100644 --- a/bitnami/consul/README.md +++ b/bitnami/consul/README.md @@ -13,6 +13,8 @@ $ helm install bitnami/consul This chart bootstraps a [Consul](https://github.com/bitnami/bitnami-docker-consul) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/bitnami/consul/templates/NOTES.txt b/bitnami/consul/templates/NOTES.txt index 6ce7b5c0a..bec369dde 100644 --- a/bitnami/consul/templates/NOTES.txt +++ b/bitnami/consul/templates/NOTES.txt @@ -3,7 +3,7 @@ Consul can be accessed within the cluster on port {{ .Values.serverPort }} at {{ template "consul.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local {{- if .Values.ui.service.enabled }} - + In order to access to the Consul Web UI: {{- if .Values.ui.ingress.enabled }} @@ -23,7 +23,8 @@ In order to access to the Consul Web UI: NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "consul.fullname" . }}-ui' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "consul.fullname" . }}-ui -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "consul.fullname" . }}-ui --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + echo "Consul URL: http://$SERVICE_IP:{{ .Values.uiPort }}/" {{- else if contains "ClusterIP" .Values.ui.service.type }} @@ -33,14 +34,14 @@ In order to access to the Consul Web UI: {{- end }} -Please take into account that you need to wait until a cluster leader is elected before using the Consul Web UI. - +Please take into account that you need to wait until a cluster leader is elected before using the Consul Web UI. + In order to check the status of the cluster you can run the following command: kubectl exec -it {{ template "consul.fullname" . }}-0 -- consul members Furthermore, to know which Consul node is the cluster leader run this other command: - + kubectl exec -it {{ template "consul.fullname" . }}-0 -- consul operator raft list-peers {{- end }} diff --git a/bitnami/consul/templates/ui-service.yaml b/bitnami/consul/templates/ui-service.yaml index 9055be37a..dcbecb832 100644 --- a/bitnami/consul/templates/ui-service.yaml +++ b/bitnami/consul/templates/ui-service.yaml @@ -8,7 +8,7 @@ metadata: chart: {{ template "consul.chart" . }} release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} - component: "ui" + component: ui spec: ports: - name: http diff --git a/bitnami/consul/values.yaml b/bitnami/consul/values.yaml index 428cc3ec8..ec2bc9042 100644 --- a/bitnami/consul/values.yaml +++ b/bitnami/consul/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/consul - tag: 1.0.6 + tag: 1.2.3-debian-9 ## 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 diff --git a/bitnami/elasticsearch/Chart.yaml b/bitnami/elasticsearch/Chart.yaml index ea0dd466d..4ef13fa89 100644 --- a/bitnami/elasticsearch/Chart.yaml +++ b/bitnami/elasticsearch/Chart.yaml @@ -1,6 +1,6 @@ name: elasticsearch -version: 4.0.0 -appVersion: 6.4.1 +version: 4.0.3 +appVersion: 6.4.2 description: A highly scalable open-source full-text search and analytics engine keywords: - elasticsearch diff --git a/bitnami/elasticsearch/README.md b/bitnami/elasticsearch/README.md index a1d1fd5dd..83189f4ad 100644 --- a/bitnami/elasticsearch/README.md +++ b/bitnami/elasticsearch/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/elasticsearch This chart bootstraps a [Elasticsearch](https://github.com/bitnami/bitnami-docker-elasticsearch) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.6+ with Beta APIs enabled diff --git a/bitnami/elasticsearch/templates/NOTES.txt b/bitnami/elasticsearch/templates/NOTES.txt index 5182d0a31..b55f5601e 100644 --- a/bitnami/elasticsearch/templates/NOTES.txt +++ b/bitnami/elasticsearch/templates/NOTES.txt @@ -28,7 +28,7 @@ NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "elasticsearch.coordinating.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "elasticsearch.coordinating.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "elasticsearch.coordinating.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") curl http://$SERVICE_IP:{{ .Values.coordinating.service.port }}/ {{- else if contains "ClusterIP" .Values.coordinating.service.type }} diff --git a/bitnami/elasticsearch/values-production.yaml b/bitnami/elasticsearch/values-production.yaml index 9e3c4971f..244b4a4cb 100644 --- a/bitnami/elasticsearch/values-production.yaml +++ b/bitnami/elasticsearch/values-production.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/elasticsearch - tag: 6.4.1-debian-9 + tag: 6.4.2-debian-9 ## 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 diff --git a/bitnami/elasticsearch/values.yaml b/bitnami/elasticsearch/values.yaml index c9c3cf55b..34939af6f 100644 --- a/bitnami/elasticsearch/values.yaml +++ b/bitnami/elasticsearch/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/elasticsearch - tag: 6.4.1-debian-9 + tag: 6.4.2-debian-9 ## 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 diff --git a/bitnami/etcd/Chart.yaml b/bitnami/etcd/Chart.yaml index c9a6073f2..f67e9ed8c 100644 --- a/bitnami/etcd/Chart.yaml +++ b/bitnami/etcd/Chart.yaml @@ -1,6 +1,6 @@ name: etcd -version: 1.1.0 -appVersion: 3.3.8 +version: 1.1.5 +appVersion: 3.3.9 description: etcd is a distributed key value store that provides a reliable way to store data across a cluster of machines keywords: - etcd diff --git a/bitnami/etcd/README.md b/bitnami/etcd/README.md index 36cd65113..574dc68e4 100644 --- a/bitnami/etcd/README.md +++ b/bitnami/etcd/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/etcd This chart bootstraps a [etcd](https://github.com/bitnami/bitnami-docker-etcd) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled @@ -83,6 +85,7 @@ The following tables lists the configurable parameters of the etcd chart and the | `persistence.accessMode` | PVC Access Mode for etcd volume | `ReadWriteOnce` | | `persistence.size` | PVC Storage Request for etcd volume | `8Gi` | | `persistence.annotations` | Annotations for the PVC | `{}` | +| `affinity` | Affinity and AntiAffinity rules for pod assignment | `{}` | | `nodeSelector` | Node labels for pod assignment | `{}` | | `tolerations` | Toleration labels for pod assignment | `[]` | | `resources` | CPU/Memory resource requests/limits | Memory: `256Mi`, CPU: `250m` | diff --git a/bitnami/etcd/templates/NOTES.txt b/bitnami/etcd/templates/NOTES.txt index f1d64517f..88c0de4be 100644 --- a/bitnami/etcd/templates/NOTES.txt +++ b/bitnami/etcd/templates/NOTES.txt @@ -44,7 +44,7 @@ To connect to your etcd server from outside the cluster execute the following co NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "etcd.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "etcd.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "etcd.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "etcd URL: http://$SERVICE_IP:2379/" {{- else if contains "ClusterIP" .Values.service.type }} diff --git a/bitnami/etcd/templates/statefulset.yaml b/bitnami/etcd/templates/statefulset.yaml index bcc7d8412..31cd7ab2a 100644 --- a/bitnami/etcd/templates/statefulset.yaml +++ b/bitnami/etcd/templates/statefulset.yaml @@ -47,6 +47,10 @@ spec: fsGroup: {{ .Values.securityContext.fsGroup }} runAsUser: {{ .Values.securityContext.runAsUser }} {{- end }} + {{- if .Values.affinity }} + affinity: +{{ toYaml .Values.affinity | indent 8 }} + {{- end }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 8 }} diff --git a/bitnami/etcd/templates/svc.yaml b/bitnami/etcd/templates/svc.yaml index 1683476c2..5aa1fe5b1 100644 --- a/bitnami/etcd/templates/svc.yaml +++ b/bitnami/etcd/templates/svc.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: type: {{ .Values.service.type }} - {{- if and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerIP -}} + {{- if and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerIP }} loadBalancerIP: {{ .Values.service.loadBalancerIP }} {{- end }} ports: diff --git a/bitnami/etcd/values-production.yaml b/bitnami/etcd/values-production.yaml index f0fbf23a4..a93317457 100644 --- a/bitnami/etcd/values-production.yaml +++ b/bitnami/etcd/values-production.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/etcd - tag: 3.3.8 + tag: 3.3.9-debian-9 ## 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 diff --git a/bitnami/etcd/values.yaml b/bitnami/etcd/values.yaml index e024022d1..562616da4 100644 --- a/bitnami/etcd/values.yaml +++ b/bitnami/etcd/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/etcd - tag: 3.3.8 + tag: 3.3.9-debian-9 ## 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 diff --git a/bitnami/external-dns/Chart.yaml b/bitnami/external-dns/Chart.yaml index 03d99bad4..031302034 100644 --- a/bitnami/external-dns/Chart.yaml +++ b/bitnami/external-dns/Chart.yaml @@ -1,6 +1,6 @@ name: external-dns -version: 1.0.0 -appVersion: 0.5.4 +version: 1.0.4 +appVersion: 0.5.7 description: ExternalDNS is a Kubernetes addon that configures public DNS servers with information about exposed Kubernetes services to make them discoverable. keywords: - external-dns diff --git a/bitnami/external-dns/README.md b/bitnami/external-dns/README.md index 3dd6c856b..6eaa1efe1 100644 --- a/bitnami/external-dns/README.md +++ b/bitnami/external-dns/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/external-dns This chart bootstraps a [ExternalDNS](https://github.com/bitnami/bitnami-docker-external-dns) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/bitnami/external-dns/templates/deployment.yaml b/bitnami/external-dns/templates/deployment.yaml index f9650f508..bade4f8ba 100644 --- a/bitnami/external-dns/templates/deployment.yaml +++ b/bitnami/external-dns/templates/deployment.yaml @@ -72,7 +72,7 @@ spec: {{- end }} {{- end }} {{- range .Values.sources }} - - --source={{ . }} + - --source={{ . }} {{- end }} {{- range .Values.domainFilters }} - --domain-filter={{ . }} @@ -153,11 +153,11 @@ spec: httpGet: path: /healthz port: {{ .Values.service.port }} - initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} - periodSeconds: {{ .Values.livenessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} - successThreshold: {{ .Values.livenessProbe.successThreshold }} - failureThreshold: {{ .Values.livenessProbe.failureThreshold }} + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} + timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} + successThreshold: {{ .Values.livenessProbe.successThreshold }} + failureThreshold: {{ .Values.livenessProbe.failureThreshold }} {{- end }} {{- if .Values.readinessProbe.enabled }} readinessProbe: diff --git a/bitnami/external-dns/templates/svc.yaml b/bitnami/external-dns/templates/svc.yaml index 82884b14b..e70ec0b6b 100644 --- a/bitnami/external-dns/templates/svc.yaml +++ b/bitnami/external-dns/templates/svc.yaml @@ -13,7 +13,7 @@ metadata: {{- end }} spec: type: {{ .Values.service.type }} - {{- if and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerIP -}} + {{- if and (eq .Values.service.type "LoadBalancer") .Values.service.loadBalancerIP }} loadBalancerIP: {{ .Values.service.loadBalancerIP }} {{- end }} ports: diff --git a/bitnami/external-dns/values.yaml b/bitnami/external-dns/values.yaml index 65af9d022..f1b613913 100755 --- a/bitnami/external-dns/values.yaml +++ b/bitnami/external-dns/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/external-dns - tag: 0.5.4 + tag: 0.5.7-debian-9 ## 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 diff --git a/bitnami/jenkins/Chart.yaml b/bitnami/jenkins/Chart.yaml index 5e0648161..abeaca8ca 100644 --- a/bitnami/jenkins/Chart.yaml +++ b/bitnami/jenkins/Chart.yaml @@ -1,5 +1,5 @@ name: jenkins -version: 1.0.0 +version: 1.1.2 appVersion: 2.138.1 description: The leading open source automation server keywords: diff --git a/bitnami/jenkins/README.md b/bitnami/jenkins/README.md index 599250ec0..d2eb1ca56 100644 --- a/bitnami/jenkins/README.md +++ b/bitnami/jenkins/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/jenkins This chart bootstraps a [Jenkins](https://github.com/bitnami/bitnami-docker-jenkins) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled @@ -52,6 +54,9 @@ The following tables lists the configurable parameters of the Jenkins chart and | `image.pullSecrets` | Specify image pull secrets | `nil` (does not add image pull secrets to deployed pods) | | `jenkinsUser` | User of the application | `user` | | `jenkinsPassword` | Application password | _random 10 character alphanumeric string_ | +| `jenkinsHome` | Jenkins home directory | `/opt/bitnami/jenkins/jenkins_home` | +| `disableInitialization` | Allows to disable the initial Bitnami configuration for Jenkins | `no` | +| `javaOpts` | Customize JVM parameters | `nil` | | `serviceType` | Kubernetes Service type | `LoadBalancer` | | `persistence.enabled` | Enable persistence using PVC | `true` | | `persistence.storageClass` | PVC Storage Class for Jenkins volume | `nil` (uses alpha storage class annotation) | diff --git a/bitnami/jenkins/templates/NOTES.txt b/bitnami/jenkins/templates/NOTES.txt index ce3ccf8ab..fb68e75d3 100644 --- a/bitnami/jenkins/templates/NOTES.txt +++ b/bitnami/jenkins/templates/NOTES.txt @@ -14,7 +14,7 @@ ** Please ensure an external IP is associated to the {{ template "fullname" . }} service before proceeding ** ** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }} ** - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "Jenkins URL: http://$SERVICE_IP/" {{- else if contains "ClusterIP" .Values.serviceType }} diff --git a/bitnami/jenkins/templates/deployment.yaml b/bitnami/jenkins/templates/deployment.yaml index d92352375..4f48cba70 100644 --- a/bitnami/jenkins/templates/deployment.yaml +++ b/bitnami/jenkins/templates/deployment.yaml @@ -31,12 +31,20 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - name: JENKINS_USERNAME - value: {{ default "" .Values.jenkinsUser | quote }} + value: {{ .Values.jenkinsUser | quote }} - name: JENKINS_PASSWORD valueFrom: secretKeyRef: name: {{ template "fullname" . }} key: jenkins-password + - name: JENKINS_HOME + value: {{ .Values.jenkinsHome | quote }} + - name: DISABLE_JENKINS_INITIALIZATION + value: {{ .Values.disableInitialization | quote }} + {{- if .Values.javaOpts }} + - name: JAVA_OPTS + value: {{ .Values.javaOpts | quote }} + {{- end }} ports: - name: http containerPort: 8080 diff --git a/bitnami/jenkins/values.yaml b/bitnami/jenkins/values.yaml index 53061fe2c..98bcd5ecc 100644 --- a/bitnami/jenkins/values.yaml +++ b/bitnami/jenkins/values.yaml @@ -15,7 +15,7 @@ image: ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ ## # pullSecrets: - # - myRegistrKeySecretName + # - myRegistrKeySecretName ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-jenkins#configuration @@ -28,6 +28,18 @@ jenkinsUser: user ## # jenkinsPassword: +## Jenkins home directory +## +homeDir: /opt/bitnami/jenkins/jenkins_home + +## Allows to disable the initial Bitnami configuration for Jenkins +## +disableInitialization: no + +## Customize JVM parameters +## +# javaOpts: + ## Kubernetes configuration ## For minikube, set this to NodePort, elsewhere use LoadBalancer ## diff --git a/bitnami/kafka/Chart.yaml b/bitnami/kafka/Chart.yaml index ef9b16fd0..ad66515d3 100644 --- a/bitnami/kafka/Chart.yaml +++ b/bitnami/kafka/Chart.yaml @@ -1,5 +1,5 @@ name: kafka -version: 1.0.0 +version: 1.0.2 appVersion: 2.0.0 description: Apache Kafka is a distributed streaming platform. keywords: diff --git a/bitnami/kafka/README.md b/bitnami/kafka/README.md index e9490d860..a201726f0 100644 --- a/bitnami/kafka/README.md +++ b/bitnami/kafka/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/kafka This chart bootstraps a [Kafka](https://github.com/bitnami/bitnami-docker-kafka) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/bitnami/kafka/templates/NOTES.txt b/bitnami/kafka/templates/NOTES.txt index 796275d8d..deb5e66e8 100644 --- a/bitnami/kafka/templates/NOTES.txt +++ b/bitnami/kafka/templates/NOTES.txt @@ -61,7 +61,7 @@ To connect to your Kafka server from outside the cluster execute the following c NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "kafka.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kafka.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kafka.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "Kafka URL: http://$SERVICE_IP:9092" {{- else if contains "ClusterIP" .Values.service.type }} diff --git a/bitnami/kafka/values-production.yaml b/bitnami/kafka/values-production.yaml index a910917dc..8f9ec3a0f 100644 --- a/bitnami/kafka/values-production.yaml +++ b/bitnami/kafka/values-production.yaml @@ -284,7 +284,7 @@ metrics: # memory: 100Mi ## Credits to the incubator/kafka chart for the JMX configuration. - ## https://github.com/kubernetes/charts/tree/master/incubator/kafka + ## https://github.com/helm/charts/tree/master/incubator/kafka ## ## Rules to apply to the Prometheus JMX Exporter. Note while lots of stats have been cleaned and exposed, ## there are still more stats to clean up and expose, others will never get exposed. They keep lots of duplicates diff --git a/bitnami/kafka/values.yaml b/bitnami/kafka/values.yaml index 642bff3ff..471975df2 100644 --- a/bitnami/kafka/values.yaml +++ b/bitnami/kafka/values.yaml @@ -284,7 +284,7 @@ metrics: # memory: 100Mi ## Credits to the incubator/kafka chart for the JMX configuration. - ## https://github.com/kubernetes/charts/tree/master/incubator/kafka + ## https://github.com/helm/charts/tree/master/incubator/kafka ## ## Rules to apply to the Prometheus JMX Exporter. Note while lots of stats have been cleaned and exposed, ## there are still more stats to clean up and expose, others will never get exposed. They keep lots of duplicates diff --git a/bitnami/kubeapps/Chart.yaml b/bitnami/kubeapps/Chart.yaml index bf3c710f4..791872643 100644 --- a/bitnami/kubeapps/Chart.yaml +++ b/bitnami/kubeapps/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: kubeapps -version: 0.5.1 -appVersion: v1.0.0-beta.1 +version: 0.6.1 +appVersion: v1.0.0-beta.2 description: Kubeapps is a dashboard for your Kubernetes cluster that makes it easy to deploy and manage applications in your cluster using Helm icon: https://raw.githubusercontent.com/kubeapps/kubeapps/master/docs/img/logo.png keywords: @@ -13,7 +13,7 @@ home: https://kubeapps.com sources: - https://github.com/kubeapps/kubeapps maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com - name: prydonius email: adnan@bitnami.com diff --git a/bitnami/kubeapps/README.md b/bitnami/kubeapps/README.md index fb801da49..a49e06fcd 100644 --- a/bitnami/kubeapps/README.md +++ b/bitnami/kubeapps/README.md @@ -1,4 +1,4 @@ -# Kubeapps +# Kubeapps [![Build Status](https://travis-ci.org/kubeapps/kubeapps.svg?branch=master)](https://travis-ci.org/kubeapps/kubeapps) @@ -50,7 +50,11 @@ The command deploys Kubeapps on the Kubernetes cluster in the `kubeapps` namespa ## Upgrading Kubeapps -To upgrade Kubeapps, first ensure you have the updated your local chart repository cache: +You can upgrade Kubeapps from the Kubeapps web interface. Select the namespace in which Kubeapps is installed (`kubeapps` if you followed the instructions in this guide) and click on the "Upgrade" button. Select the new version and confirm. + +> NOTE: If the chart values were modified when deploying Kubeapps the first time, those values need to be set again when upgrading. + +You can also use the Helm CLI to upgrade Kubeapps, first ensure you have updated your local chart repository cache: ```console $ helm repo update @@ -61,12 +65,9 @@ Now upgrade Kubeapps: ```console $ export RELEASE_NAME=kubeapps $ export NAMESPACE=kubeapps -$ export MONGODB_ROOT_PASSWORD=$(kubectl get secret --namespace $NAMESPACE $RELEASE_NAME-mongodb -o jsonpath="{.data.mongodb-root-password}" | base64 --decode) -$ helm upgrade $RELEASE_NAME bitnami/kubeapps --set mongodb.mongodbRootPassword=$MONGODB_ROOT_PASSWORD +$ helm upgrade $RELEASE_NAME bitnami/kubeapps ``` -The above commands ensure the MongoDB password is set to the existing password and not regenerated by the chart. - ## Uninstalling Kubeapps To uninstall/delete the `kubeapps` deployment: diff --git a/bitnami/kubeapps/requirements.lock b/bitnami/kubeapps/requirements.lock index 1d11ddf7b..861eb9fe7 100644 --- a/bitnami/kubeapps/requirements.lock +++ b/bitnami/kubeapps/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mongodb repository: https://kubernetes-charts.storage.googleapis.com - version: 4.3.1 + version: 4.3.7 digest: sha256:415440e73af7d4b02a10a15f28bb2fc095cbdffdc2e1676d76e0f0eaa1632d50 -generated: 2018-09-06T11:42:11.193527286-07:00 +generated: 2018-09-28T12:48:52.725939266+02:00 diff --git a/bitnami/kubeapps/templates/NOTES.txt b/bitnami/kubeapps/templates/NOTES.txt index 7b44b3239..e3ca5b433 100644 --- a/bitnami/kubeapps/templates/NOTES.txt +++ b/bitnami/kubeapps/templates/NOTES.txt @@ -35,13 +35,13 @@ To access Kubeapps from outside your K8s cluster, follow the steps below: NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status by running 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "kubeapps.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kubeapps.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "kubeapps.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "Kubeapps URL: http://$SERVICE_IP:{{ .Values.frontend.service.port }}" {{- else if contains "ClusterIP" .Values.frontend.service.type }} echo "Kubeapps URL: http://127.0.0.1:8080" - export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "kubeapps.fullname" . }}" -o name) + export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "kubeapps.fullname" . }}" -o jsonpath="{.items[0].metadata.name}") kubectl port-forward --namespace {{ .Release.Namespace }} $POD_NAME 8080:8080 {{- end }} diff --git a/bitnami/kubeapps/templates/_helpers.tpl b/bitnami/kubeapps/templates/_helpers.tpl index f94370919..7f8b5037b 100644 --- a/bitnami/kubeapps/templates/_helpers.tpl +++ b/bitnami/kubeapps/templates/_helpers.tpl @@ -68,6 +68,20 @@ Create name for the apprepository cleanup job {{ template "kubeapps.fullname" . }}-internal-apprepository-jobs-cleanup {{- end -}} +{{/* +Create name for the mongodb secret bootstrap job +*/}} +{{- define "kubeapps.mongodb-jobs-cleanup.fullname" -}} +{{ template "kubeapps.fullname" . }}-internal-mongodb-jobs-cleanup +{{- end -}} + +{{/* +Create name for the kubeapps upgrade job +*/}} +{{- define "kubeapps.kubeapps-jobs-upgrade.fullname" -}} +{{ template "kubeapps.fullname" . }}-internal-kubeapps-jobs-upgrade +{{- end -}} + {{/* Create name for the chartsvc based on the fullname */}} diff --git a/bitnami/kubeapps/templates/apprepository-deployment.yaml b/bitnami/kubeapps/templates/apprepository-deployment.yaml index 9b7a6f6af..b5f090fc1 100644 --- a/bitnami/kubeapps/templates/apprepository-deployment.yaml +++ b/bitnami/kubeapps/templates/apprepository-deployment.yaml @@ -30,7 +30,7 @@ spec: - --repo-sync-image={{ template "kubeapps.image" .Values.apprepository.syncImage }} - --namespace={{ .Release.Namespace }} - --mongo-url={{ template "kubeapps.mongodb.fullname" . }} - - --mongo-secret-name={{ template "kubeapps.mongodb.fullname" . }} + - --mongo-secret-name={{ .Values.mongodb.existingSecret }} resources: {{ toYaml .Values.apprepository.resources | indent 12 }} {{- with .Values.apprepository.nodeSelector }} diff --git a/bitnami/kubeapps/templates/apprepository-jobs-bootstrap.yaml b/bitnami/kubeapps/templates/apprepository-jobs-bootstrap.yaml index 05b3d557e..91a1d3fd0 100644 --- a/bitnami/kubeapps/templates/apprepository-jobs-bootstrap.yaml +++ b/bitnami/kubeapps/templates/apprepository-jobs-bootstrap.yaml @@ -19,7 +19,7 @@ spec: spec: containers: - name: kubectl - image: {{ template "kubeapps.image" .Values.apprepository.jobsImage }} + image: {{ template "kubeapps.image" .Values.hooks.image }} command: - kubectl - apply @@ -28,23 +28,21 @@ spec: volumeMounts: - mountPath: /tmp/apprepositories name: apprepositories-config - resources: -{{ toYaml .Values.apprepository.resources | indent 12 }} volumes: - name: apprepositories-config configMap: name: {{ template "kubeapps.apprepository-jobs-bootstrap.fullname" . }} restartPolicy: OnFailure serviceAccountName: {{ template "kubeapps.apprepository-jobs-bootstrap.fullname" . }} - {{- with .Values.apprepository.nodeSelector }} + {{- with .Values.hooks.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} {{- end }} - {{- with .Values.apprepository.affinity }} + {{- with .Values.hooks.affinity }} affinity: {{ toYaml . | indent 8 }} {{- end }} - {{- with .Values.apprepository.tolerations }} + {{- with.Values.hooks.tolerations }} tolerations: {{ toYaml . | indent 8 }} {{- end }} diff --git a/bitnami/kubeapps/templates/apprepository-jobs-cleanup.yaml b/bitnami/kubeapps/templates/apprepository-jobs-cleanup.yaml index e06000dac..179a54bd6 100644 --- a/bitnami/kubeapps/templates/apprepository-jobs-cleanup.yaml +++ b/bitnami/kubeapps/templates/apprepository-jobs-cleanup.yaml @@ -20,7 +20,7 @@ spec: spec: containers: - name: kubectl - image: {{ template "kubeapps.image" .Values.apprepository.jobsImage }} + image: {{ template "kubeapps.image" .Values.hooks.image }} command: - kubectl - delete @@ -28,19 +28,17 @@ spec: - -n - {{ .Release.Namespace }} - --all - resources: -{{ toYaml .Values.apprepository.resources | indent 12 }} restartPolicy: OnFailure serviceAccountName: {{ template "kubeapps.apprepository-jobs-cleanup.fullname" . }} - {{- with .Values.apprepository.nodeSelector }} + {{- with .Values.hooks.nodeSelector }} nodeSelector: {{ toYaml . | indent 8 }} {{- end }} - {{- with .Values.apprepository.affinity }} + {{- with .Values.hooks.affinity }} affinity: {{ toYaml . | indent 8 }} {{- end }} - {{- with .Values.apprepository.tolerations }} + {{- with .Values.hooks.tolerations }} tolerations: {{ toYaml . | indent 8 }} {{- end }} diff --git a/bitnami/kubeapps/templates/chartsvc-deployment.yaml b/bitnami/kubeapps/templates/chartsvc-deployment.yaml index b1b0093a0..d25a726df 100644 --- a/bitnami/kubeapps/templates/chartsvc-deployment.yaml +++ b/bitnami/kubeapps/templates/chartsvc-deployment.yaml @@ -31,7 +31,7 @@ spec: - name: MONGO_PASSWORD valueFrom: secretKeyRef: - name: {{ template "kubeapps.mongodb.fullname" . }} + name: {{ .Values.mongodb.existingSecret }} key: mongodb-root-password ports: - name: http diff --git a/bitnami/kubeapps/templates/kubeapps-jobs-upgrade-rbac.yaml b/bitnami/kubeapps/templates/kubeapps-jobs-upgrade-rbac.yaml new file mode 100644 index 000000000..73880ffe2 --- /dev/null +++ b/bitnami/kubeapps/templates/kubeapps-jobs-upgrade-rbac.yaml @@ -0,0 +1,57 @@ +{{- if .Values.rbac.create -}} +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: Role +metadata: + name: {{ template "kubeapps.kubeapps-jobs-upgrade.fullname" . }} + annotations: + helm.sh/hook: post-upgrade + helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-weight: "-10" + labels: + app: {{ template "kubeapps.kubeapps-jobs-upgrade.fullname" . }} + chart: {{ template "kubeapps.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +rules: +- apiGroups: + - kubeapps.com + resources: + - apprepositories + verbs: + - get + - create + - patch + - delete +- apiGroups: + - "" + resources: + - secrets + - pods + verbs: + - get + - list + - create + - delete +--- +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: RoleBinding +metadata: + name: {{ template "kubeapps.kubeapps-jobs-upgrade.fullname" . }} + annotations: + helm.sh/hook: post-upgrade + helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-weight: "-10" + labels: + app: {{ template "kubeapps.kubeapps-jobs-upgrade.fullname" . }} + chart: {{ template "kubeapps.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ template "kubeapps.kubeapps-jobs-upgrade.fullname" . }} +subjects: +- kind: ServiceAccount + name: {{ template "kubeapps.kubeapps-jobs-upgrade.fullname" . }} + namespace: {{ .Release.Namespace }} +{{- end -}} diff --git a/bitnami/kubeapps/templates/kubeapps-jobs-upgrade-serviceaccount.yaml b/bitnami/kubeapps/templates/kubeapps-jobs-upgrade-serviceaccount.yaml new file mode 100644 index 000000000..db65cc157 --- /dev/null +++ b/bitnami/kubeapps/templates/kubeapps-jobs-upgrade-serviceaccount.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ template "kubeapps.kubeapps-jobs-upgrade.fullname" . }} + annotations: + helm.sh/hook: post-upgrade + helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-weight: "-10" + labels: + app: {{ template "kubeapps.kubeapps-jobs-upgrade.fullname" . }} + chart: {{ template "kubeapps.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} diff --git a/bitnami/kubeapps/templates/kubeapps-jobs-upgrade.yaml b/bitnami/kubeapps/templates/kubeapps-jobs-upgrade.yaml new file mode 100644 index 000000000..885320284 --- /dev/null +++ b/bitnami/kubeapps/templates/kubeapps-jobs-upgrade.yaml @@ -0,0 +1,58 @@ +# This is a temporary upgrade hook for installating a version prior +# to 0.6 since the process of creating the mongodb secret changed +# It should be removed at https://github.com/kubeapps/kubeapps/issues/699 +# This Job creates the mongodb credentials secret if it doesn't exists +# and it resyncs the existing apprepositories. +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ template "kubeapps.kubeapps-jobs-upgrade.fullname" . }} + annotations: + helm.sh/hook: post-upgrade + helm.sh/hook-delete-policy: hook-succeeded + labels: + app: {{ template "kubeapps.kubeapps-jobs-upgrade.fullname" . }} + chart: {{ template "kubeapps.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + template: + metadata: + labels: + app: {{ template "kubeapps.kubeapps-jobs-upgrade.fullname" . }} + release: {{ .Release.Name }} + spec: + containers: + - name: kubectl + image: {{ template "kubeapps.image" .Values.hooks.image }} + command: + - /bin/sh + - -c + args: + - |- + # Recreate MongoDB secret if doesn't exists (happens for chart versions < 0.5.2) + if kubectl get secrets -n {{ .Release.Namespace }} {{ .Values.mongodb.existingSecret }}; then + # Secret exists, do nothing + echo "MongoDB secret found" + else + # Secret doesn't exists, create it and restart mongodb + kubectl create secret generic -n {{ .Release.Namespace }} {{ .Values.mongodb.existingSecret }} --from-literal mongodb-root-password=`cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1` + kubectl delete pods -n {{ .Release.Namespace }} -l app=mongodb,release={{ .Release.Name }} + kubectl rollout status -n {{ .Release.Namespace }} deployment/{{ .Release.Name }}-mongodb + # Re-sync repositories reseting resyncRequests + kubectl get apprepositories -o=name -n kubeapps {{ .Release.Namespace }} | xargs kubectl patch $1 -n {{ .Release.Namespace }} --type merge -p '{ "spec": { "resyncRequests": 0 } }' + fi + restartPolicy: OnFailure + serviceAccountName: {{ template "kubeapps.kubeapps-jobs-upgrade.fullname" . }} + {{- with .Values.hooks.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.hooks.affinity }} + affinity: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.hooks.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} + {{- end }} diff --git a/bitnami/kubeapps/templates/mongodb-jobs-cleanup-rbac.yaml b/bitnami/kubeapps/templates/mongodb-jobs-cleanup-rbac.yaml new file mode 100644 index 000000000..26e3d5af4 --- /dev/null +++ b/bitnami/kubeapps/templates/mongodb-jobs-cleanup-rbac.yaml @@ -0,0 +1,44 @@ +{{- if .Values.rbac.create -}} +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: Role +metadata: + name: {{ template "kubeapps.mongodb-jobs-cleanup.fullname" . }} + annotations: + helm.sh/hook: post-delete + helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-weight: "-10" + labels: + app: {{ template "kubeapps.mongodb-jobs-cleanup.fullname" . }} + chart: {{ template "kubeapps.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +rules: +- apiGroups: + - "" + resources: + - secrets + verbs: + - delete +--- +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: RoleBinding +metadata: + name: {{ template "kubeapps.mongodb-jobs-cleanup.fullname" . }} + annotations: + helm.sh/hook: post-delete + helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-weight: "-10" + labels: + app: {{ template "kubeapps.mongodb-jobs-cleanup.fullname" . }} + chart: {{ template "kubeapps.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: {{ template "kubeapps.mongodb-jobs-cleanup.fullname" . }} +subjects: +- kind: ServiceAccount + name: {{ template "kubeapps.mongodb-jobs-cleanup.fullname" . }} + namespace: {{ .Release.Namespace }} +{{- end -}} diff --git a/bitnami/kubeapps/templates/mongodb-jobs-cleanup-serviceaccount.yaml b/bitnami/kubeapps/templates/mongodb-jobs-cleanup-serviceaccount.yaml new file mode 100644 index 000000000..2a15fff49 --- /dev/null +++ b/bitnami/kubeapps/templates/mongodb-jobs-cleanup-serviceaccount.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: {{ template "kubeapps.mongodb-jobs-cleanup.fullname" . }} + annotations: + helm.sh/hook: post-delete + helm.sh/hook-delete-policy: hook-succeeded + helm.sh/hook-weight: "-10" + labels: + app: {{ template "kubeapps.mongodb-jobs-cleanup.fullname" . }} + chart: {{ template "kubeapps.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} diff --git a/bitnami/kubeapps/templates/mongodb-jobs-cleanup.yaml b/bitnami/kubeapps/templates/mongodb-jobs-cleanup.yaml new file mode 100644 index 000000000..2214c9548 --- /dev/null +++ b/bitnami/kubeapps/templates/mongodb-jobs-cleanup.yaml @@ -0,0 +1,41 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ template "kubeapps.mongodb-jobs-cleanup.fullname" . }} + annotations: + helm.sh/hook: post-delete + helm.sh/hook-delete-policy: hook-succeeded + labels: + app: {{ template "kubeapps.mongodb-jobs-cleanup.fullname" . }} + chart: {{ template "kubeapps.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +spec: + template: + metadata: + labels: + app: {{ template "kubeapps.mongodb-jobs-cleanup.fullname" . }} + release: {{ .Release.Name }} + spec: + containers: + - name: kubectl + image: {{ template "kubeapps.image" .Values.hooks.image }} + command: + - /bin/sh + args: + - -c + - "kubectl delete secret -n {{ .Release.Namespace }} {{ .Values.mongodb.existingSecret }} || true" + restartPolicy: OnFailure + serviceAccountName: {{ template "kubeapps.mongodb-jobs-cleanup.fullname" . }} + {{- with .Values.hooks.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.hooks.affinity }} + affinity: +{{ toYaml . | indent 8 }} + {{- end }} + {{- with .Values.hooks.tolerations }} + tolerations: +{{ toYaml . | indent 8 }} + {{- end }} diff --git a/bitnami/kubeapps/templates/mongodb-secret-bootstrap.yaml b/bitnami/kubeapps/templates/mongodb-secret-bootstrap.yaml new file mode 100644 index 000000000..1672842a6 --- /dev/null +++ b/bitnami/kubeapps/templates/mongodb-secret-bootstrap.yaml @@ -0,0 +1,14 @@ +{{- if .Values.mongodb.existingSecret -}} +apiVersion: v1 +kind: Secret +metadata: + name: {{ .Values.mongodb.existingSecret }} + annotations: + helm.sh/hook: pre-install + labels: + chart: {{ template "kubeapps.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +data: + mongodb-root-password: {{ randAlphaNum 10 | b64enc | quote }} +{{- end -}} diff --git a/bitnami/kubeapps/values.yaml b/bitnami/kubeapps/values.yaml index 9ea16cf93..58a6cfe46 100644 --- a/bitnami/kubeapps/values.yaml +++ b/bitnami/kubeapps/values.yaml @@ -55,17 +55,12 @@ apprepository: image: registry: docker.io repository: kubeapps/apprepository-controller - tag: v1.0.0-beta.1 + tag: v1.0.0-beta.2 # Image used to perform chart repository syncs syncImage: registry: docker.io repository: kubeapps/chart-repo - tag: v1.0.0-beta.1 - # This image is used in a Helm post-install hook to bootstrap the initialRepos below - jobsImage: - registry: docker.io - repository: lachlanevenson/k8s-kubectl - tag: v1.9.9 + tag: v1.0.0-beta.2 initialRepos: - name: stable url: https://kubernetes-charts.storage.googleapis.com @@ -87,6 +82,17 @@ apprepository: tolerations: [] affinity: {} +# Hooks are used to perform actions like populating apprepositories +# or creating required resources during installation or upgrade +hooks: + image: + registry: docker.io + repository: lachlanevenson/k8s-kubectl + tag: v1.9.9 + nodeSelector: {} + tolerations: [] + affinity: {} + # Tiller Proxy is a secure REST API on top of Helm's Tiller component used to # manage Helm chart releases in the cluster from Kubeapps. Set tillerProxy.host # to configure a different Tiller host to use. @@ -95,7 +101,7 @@ tillerProxy: image: registry: docker.io repository: kubeapps/tiller-proxy - tag: v1.0.0-beta.1 + tag: v1.0.0-beta.2 service: port: 8080 host: tiller-deploy.kube-system:44134 @@ -122,7 +128,7 @@ chartsvc: image: registry: docker.io repository: kubeapps/chartsvc - tag: v1.0.0-beta.1 + tag: v1.0.0-beta.2 service: port: 8080 # https://github.com/kubeapps/kubeapps/issues/478#issuecomment-422979262 @@ -157,7 +163,7 @@ dashboard: image: registry: docker.io repository: kubeapps/dashboard - tag: v1.0.0-beta.1 + tag: v1.0.0-beta.2 service: port: 8080 livenessProbe: @@ -188,6 +194,8 @@ mongodb: # Kubeapps uses MongoDB as a cache and persistence is not required persistence: enabled: false + # MongoDB credentials are handled by kubeapps to facilitate upgrades + existingSecret: kubeapps-mongodb # https://github.com/kubeapps/kubeapps/issues/478#issuecomment-422979262 resources: limits: diff --git a/bitnami/mean/Chart.yaml b/bitnami/mean/Chart.yaml index 7aae90875..d4046d541 100644 --- a/bitnami/mean/Chart.yaml +++ b/bitnami/mean/Chart.yaml @@ -1,5 +1,5 @@ name: mean -version: 4.0.0 +version: 4.0.2 appVersion: 3.6.4 description: MEAN is a free and open-source JavaScript software stack for building dynamic web sites and web applications. The MEAN stack is MongoDB, Express.js, Angular, and Node.js. Because all components of the MEAN stack support programs written in JavaScript, MEAN applications can be written in one language for both server-side and client-side execution environments. keywords: diff --git a/bitnami/mean/README.md b/bitnami/mean/README.md index 7c9981669..d64d49ddd 100644 --- a/bitnami/mean/README.md +++ b/bitnami/mean/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/mean This chart bootstraps a [NodeJS](https://github.com/bitnami/bitnami-docker-node) and a [MongoDB](https://github.com/bitnami/bitnami-docker-mongodb) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + It clones and deploys a Node.js application from a git repository. Defaults to a demo MEAN application: https://github.com/bitnami/sample-mean.git ## Prerequisites diff --git a/bitnami/mean/templates/NOTES.txt b/bitnami/mean/templates/NOTES.txt index dc258f3a9..4c9f0c9b6 100644 --- a/bitnami/mean/templates/NOTES.txt +++ b/bitnami/mean/templates/NOTES.txt @@ -12,7 +12,7 @@ NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc -w {{ template "mean.fullname" . }} --namespace {{ .Release.Namespace }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "mean.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "mean.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "MEAN app URL: http://$SERVICE_IP/" {{- else if contains "ClusterIP" .Values.service.type }} diff --git a/bitnami/memcached/Chart.yaml b/bitnami/memcached/Chart.yaml index a095b1c60..aba6988d7 100644 --- a/bitnami/memcached/Chart.yaml +++ b/bitnami/memcached/Chart.yaml @@ -1,5 +1,5 @@ name: memcached -version: 1.0.0 +version: 1.0.1 appVersion: 1.5.10 description: Chart for Memcached keywords: diff --git a/bitnami/memcached/README.md b/bitnami/memcached/README.md index 2125d79df..2ce795ea5 100644 --- a/bitnami/memcached/README.md +++ b/bitnami/memcached/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/memcached This chart bootstraps a [Memcached](https://github.com/bitnami/bitnami-docker-memcached) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/bitnami/metrics-server/Chart.yaml b/bitnami/metrics-server/Chart.yaml index a0e84fe56..10c6ecc5e 100644 --- a/bitnami/metrics-server/Chart.yaml +++ b/bitnami/metrics-server/Chart.yaml @@ -1,6 +1,6 @@ name: metrics-server -version: 2.0.0 -appVersion: 0.2.1 +version: 2.0.5 +appVersion: 0.3.1 description: Metrics Server is a cluster-wide aggregator of resource usage data. Metrics Server collects metrics from the Summary API, exposed by Kubelet on each node. keywords: - metrics-server diff --git a/bitnami/metrics-server/README.md b/bitnami/metrics-server/README.md index 27e4025ca..34b7e5088 100644 --- a/bitnami/metrics-server/README.md +++ b/bitnami/metrics-server/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/metrics-server This chart bootstraps a [Metrics Server](https://github.com/bitnami/bitnami-docker-metrics-server) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.8+ with Beta APIs enabled diff --git a/bitnami/metrics-server/templates/_helpers.tpl b/bitnami/metrics-server/templates/_helpers.tpl index dd2006d9a..4e90a0ff6 100644 --- a/bitnami/metrics-server/templates/_helpers.tpl +++ b/bitnami/metrics-server/templates/_helpers.tpl @@ -32,3 +32,11 @@ Create the name of the service account to use {{ default "default" .Values.serviceAccount.name }} {{- end -}} {{- end -}} + +{{/* +Return the proper metrics-server image name +*/}} +{{- define "metrics-server.image" -}} +{{- $tag := .Values.image.tag | toString -}} +{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository $tag -}} +{{- end -}} \ No newline at end of file diff --git a/bitnami/metrics-server/templates/cluster-role.yaml b/bitnami/metrics-server/templates/cluster-role.yaml index fc3ce5745..c756f31f2 100644 --- a/bitnami/metrics-server/templates/cluster-role.yaml +++ b/bitnami/metrics-server/templates/cluster-role.yaml @@ -19,4 +19,11 @@ rules: - get - list - watch + - apiGroups: + - "" + resources: + - nodes/stats + verbs: + - get + - create {{- end -}} diff --git a/bitnami/metrics-server/templates/deployment.yaml b/bitnami/metrics-server/templates/deployment.yaml index f54d597e2..3e4056ea9 100644 --- a/bitnami/metrics-server/templates/deployment.yaml +++ b/bitnami/metrics-server/templates/deployment.yaml @@ -27,13 +27,12 @@ spec: serviceAccountName: {{ template "metrics-server.serviceAccountName" . }} containers: - name: metrics-server - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + image: {{ template "metrics-server.image" . }} imagePullPolicy: {{ .Values.image.pullPolicy }} ports: - name: https containerPort: {{ .Values.securePort }} command: - metrics-server - - --source=kubernetes.summary_api:'' - --secure-port={{ .Values.securePort }} - + diff --git a/bitnami/metrics-server/values.yaml b/bitnami/metrics-server/values.yaml index 31946ff81..ddbc0aa1a 100644 --- a/bitnami/metrics-server/values.yaml +++ b/bitnami/metrics-server/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/metrics-server - tag: 0.2.1 + tag: 0.3.1-debian-9 ## 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 diff --git a/bitnami/mysql/Chart.yaml b/bitnami/mysql/Chart.yaml index 04bf006a7..46b0da28f 100644 --- a/bitnami/mysql/Chart.yaml +++ b/bitnami/mysql/Chart.yaml @@ -1,5 +1,5 @@ name: mysql -version: 4.0.2 +version: 4.0.5 appVersion: 5.7.23 description: Chart to create a Highly available MySQL cluster keywords: diff --git a/bitnami/mysql/README.md b/bitnami/mysql/README.md index 30f6a5806..885ce6741 100644 --- a/bitnami/mysql/README.md +++ b/bitnami/mysql/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/mysql This chart bootstraps a [MySQL](https://github.com/bitnami/bitnami-docker-mysql) replication cluster deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled @@ -43,72 +45,74 @@ The command removes all the Kubernetes components associated with the chart and The following tables lists the configurable parameters of the MySQL chart and their default values. -| Parameter | Description | Default | -|-------------------------------------------|-----------------------------------------------------|-------------------------------------------------------------------| -| `image.registry` | MySQL image registry | `docker.io` | -| `image.repository` | MySQL Image name | `bitnami/mysql` | -| `image.tag` | MySQL Image tag | `{VERSION}` | -| `image.pullPolicy` | MySQL image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | -| `image.pullSecrets` | Specify image pull secrets | `nil` (does not add image pull secrets to deployed pods) | -| `service.type` | Kubernetes service type | `ClusterIP` | -| `service.port` | MySQL service port | `3306` | -| `root.password` | Password for the `root` user | _random 10 character alphanumeric string_ | -| `db.user` | Username of new user to create | `nil` | -| `db.password` | Password for the new user | _random 10 character alphanumeric string if `db.user` is defined_ | -| `db.name` | Name for new database to create | `my_database` | -| `securityContext.enabled` | Enable security context | `true` | -| `securityContext.fsGroup` | Group ID for the container | `1001` | -| `securityContext.runAsUser` | User ID for the container | `1001` | `replication.enabled` | MySQL replication enabled | `true` | -| `replication.user` | MySQL replication user | `replicator` | -| `replication.password` | MySQL replication user password | _random 10 character alphanumeric string_ | -| `master.antiAffinity` | Master pod anti-affinity policy | `soft` | -| `master.persistence.enabled` | Enable persistence using a `PersistentVolumeClaim` | `true` | -| `master.persistence.existingClaim` | Provide an existing `PersistentVolumeClaim` | `nil` | -| `master.persistence.mountPath` | Configure existing `PersistentVolumeClaim` mount path | `""` | -| `master.persistence.annotations` | Persistent Volume Claim annotations | `{}` | -| `master.persistence.storageClass` | Persistent Volume Storage Class | `` | -| `master.persistence.accessModes` | Persistent Volume Access Modes | `[ReadWriteOnce]` | -| `master.persistence.size` | Persistent Volume Size | `8Gi` | -| `master.config` | Config file for the MySQL Master server | `_default values in the values.yaml file_` | -| `master.resources` | CPU/Memory resource requests/limits for master node | `{}` | -| `master.livenessProbe.enabled` | Turn on and off liveness probe (master) | `true` | -| `master.livenessProbe.initialDelaySeconds`| Delay before liveness probe is initiated (master) | `120` | -| `master.livenessProbe.periodSeconds` | How often to perform the probe (master) | `10` | -| `master.livenessProbe.timeoutSeconds` | When the probe times out (master) | `1` | -| `master.livenessProbe.successThreshold` | Minimum consecutive successes for the probe (master)| `1` | -| `master.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe (master) | `3` | -| `master.readinessProbe.enabled` | Turn on and off readiness probe (master) | `true` | -| `master.readinessProbe.initialDelaySeconds`| Delay before readiness probe is initiated (master) | `30` | -| `master.readinessProbe.periodSeconds` | How often to perform the probe (master) | `10` | -| `master.readinessProbe.timeoutSeconds` | When the probe times out (master) | `1` | -| `master.readinessProbe.successThreshold` | Minimum consecutive successes for the probe (master)| `1` | -| `master.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe (master) | `3` | -| `slave.replicas` | Desired number of slave replicas | `1` | -| `slave.antiAffinity` | Slave pod anti-affinity policy | `soft` | -| `slave.persistence.enabled` | Enable persistence using a `PersistentVolumeClaim` | `true` | -| `slave.persistence.annotations` | Persistent Volume Claim annotations | `{}` | -| `slave.persistence.storageClass` | Persistent Volume Storage Class | `` | -| `slave.persistence.accessModes` | Persistent Volume Access Modes | `[ReadWriteOnce]` | -| `slave.persistence.size` | Persistent Volume Size | `8Gi` | -| `slave.config` | Config file for the MySQL Slave replicas | `_default values in the values.yaml file_` | -| `slave.resources` | CPU/Memory resource requests/limits for slave node | `{}` | -| `slave.livenessProbe.enabled` | Turn on and off liveness probe (slave) | `true` | -| `slave.livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated (slave) | `120` | -| `slave.livenessProbe.periodSeconds` | How often to perform the probe (slave) | `10` | -| `slave.livenessProbe.timeoutSeconds` | When the probe times out (slave) | `1` | -| `slave.livenessProbe.successThreshold` | Minimum consecutive successes for the probe (slave) | `1` | -| `slave.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe (slave) | `3` | -| `slave.readinessProbe.enabled` | Turn on and off readiness probe (slave) | `true` | -| `slave.readinessProbe.initialDelaySeconds`| Delay before readiness probe is initiated (slave) | `30` | -| `slave.readinessProbe.periodSeconds` | How often to perform the probe (slave) | `10` | -| `slave.readinessProbe.timeoutSeconds` | When the probe times out (slave) | `1` | -| `slave.readinessProbe.successThreshold` | Minimum consecutive successes for the probe (slave) | `1` | -| `slave.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe (slave) | `3` | -| `metrics.enabled` | Start a side-car prometheus exporter | `false` | -| `metrics.image` | Exporter image name | `prom/mysqld-exporter` | -| `metrics.imageTag` | Exporter image tag | `v0.10.0` | -| `metrics.imagePullPolicy` | Exporter image pull policy | `IfNotPresent` | -| `metrics.resources` | Exporter resource requests/limit | `nil` | +| Parameter | Description | Default | +|-------------------------------------------|-------------------------------------------------------|-------------------------------------------------------------------| +| `image.registry` | MySQL image registry | `docker.io` | +| `image.repository` | MySQL Image name | `bitnami/mysql` | +| `image.tag` | MySQL Image tag | `{VERSION}` | +| `image.pullPolicy` | MySQL image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | +| `image.pullSecrets` | Specify image pull secrets | `nil` (does not add image pull secrets to deployed pods) | +| `service.type` | Kubernetes service type | `ClusterIP` | +| `service.port` | MySQL service port | `3306` | +| `root.password` | Password for the `root` user | _random 10 character alphanumeric string_ | +| `db.user` | Username of new user to create | `nil` | +| `db.password` | Password for the new user | _random 10 character alphanumeric string if `db.user` is defined_ | +| `db.name` | Name for new database to create | `my_database` | +| `securityContext.enabled` | Enable security context | `true` | +| `securityContext.fsGroup` | Group ID for the container | `1001` | +| `securityContext.runAsUser` | User ID for the container | `1001` | +| `replication.enabled` | MySQL replication enabled | `true` | +| `replication.user` | MySQL replication user | `replicator` | +| `replication.password` | MySQL replication user password | _random 10 character alphanumeric string_ | +| `master.antiAffinity` | Master pod anti-affinity policy | `soft` | +| `master.persistence.enabled` | Enable persistence using a `PersistentVolumeClaim` | `true` | +| `master.persistence.existingClaim` | Provide an existing `PersistentVolumeClaim` | `nil` | +| `master.persistence.mountPath` | Configure `PersistentVolumeClaim` mount path | `/bitnami/mysql` | +| `master.persistence.annotations` | Persistent Volume Claim annotations | `{}` | +| `master.persistence.storageClass` | Persistent Volume Storage Class | `` | +| `master.persistence.accessModes` | Persistent Volume Access Modes | `[ReadWriteOnce]` | +| `master.persistence.size` | Persistent Volume Size | `8Gi` | +| `master.config` | Config file for the MySQL Master server | `_default values in the values.yaml file_` | +| `master.resources` | CPU/Memory resource requests/limits for master node | `{}` | +| `master.livenessProbe.enabled` | Turn on and off liveness probe (master) | `true` | +| `master.livenessProbe.initialDelaySeconds`| Delay before liveness probe is initiated (master) | `120` | +| `master.livenessProbe.periodSeconds` | How often to perform the probe (master) | `10` | +| `master.livenessProbe.timeoutSeconds` | When the probe times out (master) | `1` | +| `master.livenessProbe.successThreshold` | Minimum consecutive successes for the probe (master) | `1` | +| `master.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe (master) | `3` | +| `master.readinessProbe.enabled` | Turn on and off readiness probe (master) | `true` | +| `master.readinessProbe.initialDelaySeconds`| Delay before readiness probe is initiated (master) | `30` | +| `master.readinessProbe.periodSeconds` | How often to perform the probe (master) | `10` | +| `master.readinessProbe.timeoutSeconds` | When the probe times out (master) | `1` | +| `master.readinessProbe.successThreshold` | Minimum consecutive successes for the probe (master) | `1` | +| `master.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe (master) | `3` | +| `slave.replicas` | Desired number of slave replicas | `1` | +| `slave.antiAffinity` | Slave pod anti-affinity policy | `soft` | +| `slave.persistence.enabled` | Enable persistence using a `PersistentVolumeClaim` | `true` | +| `slave.persistence.mountPath` | Configure `PersistentVolumeClaim` mount path | `/bitnami/mysql` | +| `slave.persistence.annotations` | Persistent Volume Claim annotations | `{}` | +| `slave.persistence.storageClass` | Persistent Volume Storage Class | `` | +| `slave.persistence.accessModes` | Persistent Volume Access Modes | `[ReadWriteOnce]` | +| `slave.persistence.size` | Persistent Volume Size | `8Gi` | +| `slave.config` | Config file for the MySQL Slave replicas | `_default values in the values.yaml file_` | +| `slave.resources` | CPU/Memory resource requests/limits for slave node | `{}` | +| `slave.livenessProbe.enabled` | Turn on and off liveness probe (slave) | `true` | +| `slave.livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated (slave) | `120` | +| `slave.livenessProbe.periodSeconds` | How often to perform the probe (slave) | `10` | +| `slave.livenessProbe.timeoutSeconds` | When the probe times out (slave) | `1` | +| `slave.livenessProbe.successThreshold` | Minimum consecutive successes for the probe (slave) | `1` | +| `slave.livenessProbe.failureThreshold` | Minimum consecutive failures for the probe (slave) | `3` | +| `slave.readinessProbe.enabled` | Turn on and off readiness probe (slave) | `true` | +| `slave.readinessProbe.initialDelaySeconds`| Delay before readiness probe is initiated (slave) | `30` | +| `slave.readinessProbe.periodSeconds` | How often to perform the probe (slave) | `10` | +| `slave.readinessProbe.timeoutSeconds` | When the probe times out (slave) | `1` | +| `slave.readinessProbe.successThreshold` | Minimum consecutive successes for the probe (slave) | `1` | +| `slave.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe (slave) | `3` | +| `metrics.enabled` | Start a side-car prometheus exporter | `false` | +| `metrics.image` | Exporter image name | `prom/mysqld-exporter` | +| `metrics.imageTag` | Exporter image tag | `v0.10.0` | +| `metrics.imagePullPolicy` | Exporter image pull policy | `IfNotPresent` | +| `metrics.resources` | Exporter resource requests/limit | `nil` | The above parameters map to the env variables defined in [bitnami/mysql](http://github.com/bitnami/bitnami-docker-mysql). For more information please refer to the [bitnami/mysql](http://github.com/bitnami/bitnami-docker-mysql) image documentation. diff --git a/bitnami/mysql/templates/master-statefulset.yaml b/bitnami/mysql/templates/master-statefulset.yaml index 05d746466..36eec6249 100644 --- a/bitnami/mysql/templates/master-statefulset.yaml +++ b/bitnami/mysql/templates/master-statefulset.yaml @@ -117,18 +117,18 @@ spec: resources: {{ toYaml .Values.master.resources | indent 10 }} volumeMounts: +{{- if .Values.master.persistence.existingClaim }} + - name: {{ .Values.master.persistence.existingClaim }} +{{- else }} - name: data - mountPath: /bitnami/mysql +{{- end }} + mountPath: {{ .Values.master.persistence.mountPath }} - name: custom-init-scripts mountPath: /docker-entrypoint-initdb.d {{- if .Values.master.config }} - name: config mountPath: /opt/bitnami/mysql/conf/my.cnf subPath: my.cnf -{{- if .Values.master.persistence.existingClaim }} - - name: {{ .Values.master.persistence.existingClaim }} - mountPath: {{ .Values.master.persistence.mountPath }} -{{- end }} {{- end }} {{- if .Values.metrics.enabled }} - name: metrics @@ -173,7 +173,7 @@ spec: - name: custom-init-scripts configMap: name: {{ template "mysql.master.fullname" . }}-init-scripts -{{- if .Values.master.persistence.enabled }} +{{- if and .Values.master.persistence.enabled ( not .Values.master.persistence.existingClaim ) }} volumeClaimTemplates: - metadata: name: data diff --git a/bitnami/mysql/templates/slave-statefulset.yaml b/bitnami/mysql/templates/slave-statefulset.yaml index b5ae2eac0..b49de33ec 100644 --- a/bitnami/mysql/templates/slave-statefulset.yaml +++ b/bitnami/mysql/templates/slave-statefulset.yaml @@ -65,22 +65,6 @@ spec: image: {{ template "mysql.image" . }} imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - - name: MYSQL_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "fullname" . }} - key: mysql-root-password - {{- if .Values.db.user }} - - name: MYSQL_USER - value: "{{ .Values.db.user }}" - - name: MYSQL_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "fullname" . }} - key: mysql-password - {{- end }} - - name: MYSQL_DATABASE - value: "{{ .Values.db.name }}" - name: MYSQL_REPLICATION_MODE value: "slave" - name: MYSQL_MASTER_HOST @@ -107,7 +91,7 @@ spec: {{- if .Values.slave.livenessProbe.enabled }} livenessProbe: exec: - command: ["sh", "-c", "exec mysqladmin status -uroot -p$MYSQL_ROOT_PASSWORD"] + command: ["sh", "-c", "exec mysqladmin status -uroot -p$MYSQL_MASTER_ROOT_PASSWORD"] initialDelaySeconds: {{ .Values.slave.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.slave.livenessProbe.periodSeconds }} timeoutSeconds: {{ .Values.slave.livenessProbe.timeoutSeconds }} @@ -117,7 +101,7 @@ spec: {{- if .Values.slave.readinessProbe.enabled }} readinessProbe: exec: - command: ["sh", "-c", "exec mysqladmin status -uroot -p$MYSQL_ROOT_PASSWORD"] + command: ["sh", "-c", "exec mysqladmin status -uroot -p$MYSQL_MASTER_ROOT_PASSWORD"] initialDelaySeconds: {{ .Values.slave.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.slave.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.slave.readinessProbe.timeoutSeconds }} @@ -128,7 +112,7 @@ spec: {{ toYaml .Values.slave.resources | indent 10 }} volumeMounts: - name: data - mountPath: /bitnami/mysql + mountPath: {{ .Values.slave.persistence.mountPath }} {{- if .Values.slave.config }} - name: config mountPath: /opt/bitnami/mysql/conf/my.cnf @@ -139,12 +123,12 @@ spec: image: {{ template "metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} env: - - name: MYSQL_ROOT_PASSWORD + - name: MYSQL_MASTER_ROOT_PASSWORD valueFrom: secretKeyRef: name: {{ template "fullname" . }} key: mysql-root-password - command: [ 'sh', '-c', 'DATA_SOURCE_NAME="root:$MYSQL_ROOT_PASSWORD@(localhost:3306)/" /bin/mysqld_exporter' ] + command: [ 'sh', '-c', 'DATA_SOURCE_NAME="root:$MYSQL_MASTER_ROOT_PASSWORD@(localhost:3306)/" /bin/mysqld_exporter' ] ports: - name: metrics containerPort: 9104 diff --git a/bitnami/mysql/values-production.yaml b/bitnami/mysql/values-production.yaml index b4c195c45..f40e585d9 100644 --- a/bitnami/mysql/values-production.yaml +++ b/bitnami/mysql/values-production.yaml @@ -85,10 +85,11 @@ master: ## If true, use a Persistent Volume Claim, If false, use emptyDir ## enabled: true + mountPath: /bitnami/mysql ## Enable persistence using an existing PVC ## # existingClaim: - # mountPath: + ## Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning @@ -170,6 +171,7 @@ slave: ## If true, use a Persistent Volume Claim, If false, use emptyDir ## enabled: true + mountPath: /bitnami/mysql # storageClass: "-" annotations: accessModes: diff --git a/bitnami/mysql/values.yaml b/bitnami/mysql/values.yaml index 4762f2fc4..94bbea4b5 100644 --- a/bitnami/mysql/values.yaml +++ b/bitnami/mysql/values.yaml @@ -86,10 +86,10 @@ master: ## If true, use a Persistent Volume Claim, If false, use emptyDir ## enabled: true + mountPath: /bitnami/mysql ## Enable persistence using an existing PVC ## # existingClaim: - # mountPath: ## Persistent Volume Storage Class ## If defined, storageClassName: ## If set to "-", storageClassName: "", which disables dynamic provisioning @@ -172,6 +172,7 @@ slave: ## If true, use a Persistent Volume Claim, If false, use emptyDir ## enabled: true + mountPath: /bitnami/mysql # storageClass: "-" annotations: accessModes: diff --git a/bitnami/nginx-ingress-controller/Chart.yaml b/bitnami/nginx-ingress-controller/Chart.yaml index ecb004a99..fb018fb45 100644 --- a/bitnami/nginx-ingress-controller/Chart.yaml +++ b/bitnami/nginx-ingress-controller/Chart.yaml @@ -1,6 +1,6 @@ name: nginx-ingress-controller -version: 1.0.0 -appVersion: 0.18.0 +version: 2.0.3 +appVersion: 0.19.0 description: Chart for the nginx Ingress controller keywords: - ingress diff --git a/bitnami/nginx-ingress-controller/README.md b/bitnami/nginx-ingress-controller/README.md index 788c0c6c1..581550ad7 100644 --- a/bitnami/nginx-ingress-controller/README.md +++ b/bitnami/nginx-ingress-controller/README.md @@ -14,6 +14,8 @@ Bitnami charts for Helm are carefully engineered, actively maintained and are th This chart bootstraps a [nginx-ingress](https://github.com/kubernetes/ingress-nginx) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.6+ diff --git a/bitnami/nginx-ingress-controller/templates/_helpers.tpl b/bitnami/nginx-ingress-controller/templates/_helpers.tpl index 77a9a9e79..6285744fa 100644 --- a/bitnami/nginx-ingress-controller/templates/_helpers.tpl +++ b/bitnami/nginx-ingress-controller/templates/_helpers.tpl @@ -65,3 +65,10 @@ Return the proper nginx-ingress-controller image name {{- $tag := .Values.image.tag | toString -}} {{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository $tag -}} {{- end -}} + +{{/* +Create chart name and version as used by the chart label. +*/}} +{{- define "nginx-ingress-controller.chart" -}} +{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}} +{{- end -}} \ No newline at end of file diff --git a/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml b/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml index 4cd27dd64..62d44d036 100644 --- a/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml +++ b/bitnami/nginx-ingress-controller/templates/controller-daemonset.yaml @@ -28,6 +28,7 @@ spec: {{- end }} labels: app: {{ template "nginx-ingress.name" . }} + chart: {{ template "nginx-ingress-controller.chart" . }} component: "{{ .Values.name }}" release: {{ .Release.Name }} {{- if .Values.podLabels }} @@ -42,6 +43,9 @@ spec: {{- if .Values.priorityClassName }} priorityClassName: "{{ .Values.priorityClassName }}" {{- end }} + securityContext: + fsGroup: {{ .Values.securityContext.fsGroup }} + runAsUser: {{ .Values.securityContext.runAsUser }} containers: - name: {{ template "nginx-ingress.name" . }}-{{ .Values.name }} image: "{{ template "nginx-ingress-controller.image" . }}" @@ -53,20 +57,12 @@ spec: args: - /nginx-ingress-controller - --default-backend-service={{ if .Values.defaultBackend.enabled }}{{ .Release.Namespace }}/{{ template "nginx-ingress.defaultBackend.fullname" . }}{{ else }}{{ .Values.defaultBackendService }}{{ end }} - {{- if and (semverCompare ">=0.9.0-beta.1" .Values.image.tag) .Values.publishService.enabled }} + {{- if .Values.publishService.enabled }} - --publish-service={{ template "nginx-ingress.publishServicePath" . }} {{- end }} - {{- if (semverCompare ">=0.9.0-beta.1" .Values.image.tag) }} - --election-id={{ .Values.electionID }} - {{- end }} - {{- if (semverCompare ">=0.9.0-beta.1" .Values.image.tag) }} - --ingress-class={{ .Values.ingressClass }} - {{- end }} - {{- if (semverCompare ">=0.9.0-beta.1" .Values.image.tag) }} - --configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.fullname" . }} - {{- else }} - - --nginx-configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.fullname" . }} - {{- end }} {{- if .Values.tcp }} - --tcp-services-configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.fullname" . }}-tcp {{- end }} @@ -83,16 +79,10 @@ spec: - --{{ $key }} {{- end }} {{- end }} - {{- if (semverCompare ">=0.16.0" .Values.image.tag) }} securityContext: capabilities: - drop: - - ALL - add: - - NET_BIND_SERVICE - fsGroup: {{ .Values.securityContext.fsGroup }} - runAsUser: {{ .Values.securityContext.runAsUser }} - {{- end }} + drop: ["ALL"] + add: ["NET_BIND_SERVICE"] env: - name: POD_NAME valueFrom: diff --git a/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml b/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml index da74b664f..7b62f443f 100644 --- a/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml +++ b/bitnami/nginx-ingress-controller/templates/controller-deployment.yaml @@ -28,6 +28,7 @@ spec: {{- end }} labels: app: {{ template "nginx-ingress.name" . }} + chart: {{ template "nginx-ingress-controller.chart" . }} component: "{{ .Values.name }}" release: {{ .Release.Name }} {{- if .Values.podLabels }} @@ -42,6 +43,9 @@ spec: {{- if .Values.priorityClassName }} priorityClassName: "{{ .Values.priorityClassName }}" {{- end }} + securityContext: + fsGroup: {{ .Values.securityContext.fsGroup }} + runAsUser: {{ .Values.securityContext.runAsUser }} containers: - name: {{ template "nginx-ingress.name" . }}-{{ .Values.name }} image: "{{ template "nginx-ingress-controller.image" . }}" @@ -53,20 +57,12 @@ spec: args: - /nginx-ingress-controller - --default-backend-service={{ if .Values.defaultBackend.enabled }}{{ .Release.Namespace }}/{{ template "nginx-ingress.defaultBackend.fullname" . }}{{ else }}{{ .Values.defaultBackendService }}{{ end }} - {{- if and (semverCompare ">=0.9.0-beta.1" .Values.image.tag) .Values.publishService.enabled }} + {{- if .Values.publishService.enabled }} - --publish-service={{ template "nginx-ingress.publishServicePath" . }} {{- end }} - {{- if (semverCompare ">=0.9.0-beta.1" .Values.image.tag) }} - --election-id={{ .Values.electionID }} - {{- end }} - {{- if (semverCompare ">=0.9.0-beta.1" .Values.image.tag) }} - --ingress-class={{ .Values.ingressClass }} - {{- end }} - {{- if (semverCompare ">=0.9.0-beta.1" .Values.image.tag) }} - --configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.fullname" . }} - {{- else }} - - --nginx-configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.fullname" . }} - {{- end }} {{- if .Values.tcp }} - --tcp-services-configmap={{ .Release.Namespace }}/{{ template "nginx-ingress.fullname" . }}-tcp {{- end }} @@ -83,16 +79,10 @@ spec: - --{{ $key }} {{- end }} {{- end }} - {{- if (semverCompare ">=0.16.0" .Values.image.tag) }} securityContext: capabilities: - drop: - - ALL - add: - - NET_BIND_SERVICE - fsGroup: {{ .Values.securityContext.fsGroup }} - runAsUser: {{ .Values.securityContext.runAsUser }} - {{- end }} + drop: ["ALL"] + add: ["NET_BIND_SERVICE"] env: - name: POD_NAME valueFrom: diff --git a/bitnami/nginx-ingress-controller/values.yaml b/bitnami/nginx-ingress-controller/values.yaml index da749cb08..e5d149eed 100644 --- a/bitnami/nginx-ingress-controller/values.yaml +++ b/bitnami/nginx-ingress-controller/values.yaml @@ -4,7 +4,7 @@ name: controller image: registry: docker.io repository: bitnami/nginx-ingress-controller - tag: 0.18.0-debian-9 + tag: 0.19.0-debian-9 ## 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 diff --git a/bitnami/nginx/Chart.yaml b/bitnami/nginx/Chart.yaml index f27ec85be..e6480844b 100644 --- a/bitnami/nginx/Chart.yaml +++ b/bitnami/nginx/Chart.yaml @@ -1,5 +1,5 @@ name: nginx -version: 1.0.0 +version: 1.0.1 appVersion: 1.14.0 description: Chart for the nginx server keywords: diff --git a/bitnami/nginx/README.md b/bitnami/nginx/README.md index 08228964e..8b5631d98 100644 --- a/bitnami/nginx/README.md +++ b/bitnami/nginx/README.md @@ -12,7 +12,9 @@ $ helm install bitnami/nginx Bitnami charts for Helm are carefully engineered, actively maintained and are the quickest and easiest way to deploy containers on a Kubernetes cluster that are ready to handle production workloads. -This chart bootstraps a [NGINX](https://github.com/bitnami/bitnami-docker-nginx) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +This chart bootstraps a [NGINX Open Source](https://github.com/bitnami/bitnami-docker-nginx) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. + +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. ## Installing the Chart @@ -22,7 +24,7 @@ To install the chart with the release name `my-release`: $ helm install --name my-release bitnami/nginx ``` -The command deploys NGINX on the Kubernetes cluster in the default configuration. +The command deploys NGINX Open Source on the Kubernetes cluster in the default configuration. > **Tip**: List all releases using `helm list` @@ -38,16 +40,16 @@ The command removes all the Kubernetes components associated with the chart and ## Configuration -The following tables lists the configurable parameters of the NGINX chart and their default values. +The following tables lists the configurable parameters of the NGINX Open Source chart and their default values. | Parameter | Description | Default | | ------------------------- | ------------------------------ | --------------------------------------------------------- | -| `image.registry` | Nginx image registry | `docker.io` | -| `image.repository` | Nginx Image name | `bitnami/nginx` | -| `image.tag` | Nginx Image tag | `{VERSION}` | -| `image.pullPolicy` | Nginx image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | +| `image.registry` | NGINX image registry | `docker.io` | +| `image.repository` | NGINX Image name | `bitnami/nginx` | +| `image.tag` | NGINX Image tag | `{VERSION}` | +| `image.pullPolicy` | NGINX image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | | `image.pullSecrets` | Specify image pull secrets | `nil` (does not add image pull secrets to deployed pods) | -| `vhost` | Custom nginx virtual host | `nil` | +| `vhost` | Custom NGINX virtual host | `nil` | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, diff --git a/bitnami/node/Chart.yaml b/bitnami/node/Chart.yaml index 4cf5dd711..80d605dac 100644 --- a/bitnami/node/Chart.yaml +++ b/bitnami/node/Chart.yaml @@ -1,5 +1,5 @@ name: node -version: 6.0.0 +version: 6.0.2 appVersion: 10.7.0 description: Event-driven I/O server-side JavaScript environment based on V8 keywords: diff --git a/bitnami/node/README.md b/bitnami/node/README.md index a3910ffd4..884049db9 100644 --- a/bitnami/node/README.md +++ b/bitnami/node/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/node This chart bootstraps a [Node](https://github.com/bitnami/bitnami-docker-node) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + It clones and deploys a Node.js application from a git repository. Optionally you can set un an Ingress resource to access your application and provision an external database using the k8s service catalog and the Open Service Broker for Azure. ## Prerequisites diff --git a/bitnami/node/templates/NOTES.txt b/bitnami/node/templates/NOTES.txt index 40f794858..a245510fe 100644 --- a/bitnami/node/templates/NOTES.txt +++ b/bitnami/node/templates/NOTES.txt @@ -12,7 +12,7 @@ NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc -w {{ template "node.fullname" . }} --namespace {{ .Release.Namespace }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "node.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "node.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "Node app URL: http://$SERVICE_IP/" {{- else if contains "ClusterIP" .Values.service.type }} diff --git a/bitnami/postgresql/Chart.yaml b/bitnami/postgresql/Chart.yaml index 92b6d526c..198c7826d 100644 --- a/bitnami/postgresql/Chart.yaml +++ b/bitnami/postgresql/Chart.yaml @@ -1,5 +1,5 @@ name: postgresql -version: 3.0.0 +version: 3.0.2 appVersion: 10.5.0 description: Chart for PostgreSQL keywords: diff --git a/bitnami/postgresql/README.md b/bitnami/postgresql/README.md index cbc5c001f..b9613f28b 100644 --- a/bitnami/postgresql/README.md +++ b/bitnami/postgresql/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/postgresql This chart bootstraps a [PostgreSQL](https://github.com/bitnami/bitnami-docker-postgresql) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/bitnami/postgresql/templates/NOTES.txt b/bitnami/postgresql/templates/NOTES.txt index 05a530e1a..a85ddbb94 100644 --- a/bitnami/postgresql/templates/NOTES.txt +++ b/bitnami/postgresql/templates/NOTES.txt @@ -35,19 +35,19 @@ To connect to your database from outside the cluster execute the following comma export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}") export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "postgresql.fullname" . }}) - {{ if .Values.postgresqlPassword }}PGPASSWORD={{ .Values.postgresqlPassword}} "{{- end }}psql --host $NODE_IP --port $NODE_PORT -U {{ .Values.postgresqlUsername }} + {{ if .Values.postgresqlPassword }}PGPASSWORD={{ .Values.postgresqlPassword}} "{{- end }}psql --host $NODE_IP --port $NODE_PORT -U {{ .Values.postgresqlUsername }} {{- else if contains "LoadBalancer" .Values.service.type }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "postgresql.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "postgresql.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') - {{ if .Values.postgresqlPassword }}PGPASSWORD={{ .Values.postgresqlPassword}} "{{- end }}psql --host $SERVICE_IP --port {{ .Values.service.port }} -U {{ .Values.postgresqlUsername }} + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "postgresql.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") + {{ if .Values.postgresqlPassword }}PGPASSWORD={{ .Values.postgresqlPassword}} "{{- end }}psql --host $SERVICE_IP --port {{ .Values.service.port }} -U {{ .Values.postgresqlUsername }} {{- else if contains "ClusterIP" .Values.service.type }} kubectl port-forward --namespace {{ .Release.Namespace }} svc/{{ template "postgresql.fullname" . }} 5432:5432 & - {{ if .Values.postgresqlPassword }}PGPASSWORD={{ .Values.postgresqlPassword}} "{{- end }}psql --host 127.0.0.1 -U {{ .Values.postgresqlUsername }} + {{ if .Values.postgresqlPassword }}PGPASSWORD={{ .Values.postgresqlPassword}} "{{- end }}psql --host 127.0.0.1 -U {{ .Values.postgresqlUsername }} {{- end }} diff --git a/bitnami/postgresql/templates/_helpers.tpl b/bitnami/postgresql/templates/_helpers.tpl index f8bcfcfb1..b064fde20 100644 --- a/bitnami/postgresql/templates/_helpers.tpl +++ b/bitnami/postgresql/templates/_helpers.tpl @@ -3,26 +3,26 @@ Expand the name of the chart. */}} {{- define "postgresql.name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 24 -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Create a default fully qualified app name. -We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "postgresql.fullname" -}} {{- $name := default .Chart.Name .Values.nameOverride -}} -{{- printf "%s-%s" .Release.Name $name | trunc 24 -}} +{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} {{/* Create a default fully qualified app name. -We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). +We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} {{- define "postgresql.master.fullname" -}} {{- $name := default .Chart.Name .Values.nameOverride -}} {{- if .Values.replication.enabled -}} -{{- printf "%s-%s-%s" .Release.Name $name "master" | trunc 61 | trimSuffix "-" -}} +{{- printf "%s-%s-%s" .Release.Name $name "master" | trunc 63 | trimSuffix "-" -}} {{- else -}} {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} {{- end -}} diff --git a/bitnami/tensorflow-inception/Chart.yaml b/bitnami/tensorflow-inception/Chart.yaml index 7d6baa5b4..ab203dab0 100755 --- a/bitnami/tensorflow-inception/Chart.yaml +++ b/bitnami/tensorflow-inception/Chart.yaml @@ -1,5 +1,5 @@ name: tensorflow-inception -version: 1.0.0 +version: 1.0.2 appVersion: 1.10.1 description: Open-source software library for serving machine learning models keywords: diff --git a/bitnami/tensorflow-inception/README.md b/bitnami/tensorflow-inception/README.md index cd6cf0dca..6818ff71e 100755 --- a/bitnami/tensorflow-inception/README.md +++ b/bitnami/tensorflow-inception/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/tensorflow-inception This chart bootstraps a TensorFlow Serving Inception v3 pod on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled @@ -65,7 +67,7 @@ The following tables lists the configurable parameters of the TensorFlow Incepti | `server.image.tag` | TensorFlow Serving Image tag | `{VERSION}` | | `server.image.pullPolicy` | TensorFlow Serving image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | | `server.image.pullSecrets` | Specify image pull secrets | `nil` (does not add image pull secrets to deployed pods) | -| `server.port` | Tensorflow server port | `9000` | +| `server.port` | Tensorflow server port | `8500` | | `client.image.registry` | TensorFlow Inception image registry | `docker.io` | | `client.image.repository` | TensorFlow Inception Image name | `bitnami/tensorflow-inception` | | `client.image.tag` | TensorFlow Inception Image tag | `{VERSION}` | diff --git a/bitnami/tensorflow-inception/templates/deployment.yaml b/bitnami/tensorflow-inception/templates/deployment.yaml index eeef1fa2b..91890164c 100644 --- a/bitnami/tensorflow-inception/templates/deployment.yaml +++ b/bitnami/tensorflow-inception/templates/deployment.yaml @@ -16,7 +16,7 @@ spec: template: metadata: labels: - app: tensorflow-serving + app: {{ template "fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: "{{ .Release.Name }}" spec: diff --git a/bitnami/tensorflow-inception/templates/svc.yaml b/bitnami/tensorflow-inception/templates/svc.yaml index 2320530d2..4ec245b0b 100644 --- a/bitnami/tensorflow-inception/templates/svc.yaml +++ b/bitnami/tensorflow-inception/templates/svc.yaml @@ -13,4 +13,4 @@ spec: - port: {{ .Values.server.port }} protocol: TCP selector: - app: tensorflow-serving + app: {{ template "fullname" . }} diff --git a/bitnami/tensorflow-inception/values.yaml b/bitnami/tensorflow-inception/values.yaml index 200b8435b..ec68070bd 100755 --- a/bitnami/tensorflow-inception/values.yaml +++ b/bitnami/tensorflow-inception/values.yaml @@ -5,7 +5,7 @@ server: image: registry: docker.io repository: bitnami/tensorflow-serving - tag: 1.6.0 + tag: 1.10.1-debian-9 ## 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 @@ -16,8 +16,8 @@ server: ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ ## # pullSecrets: - # - myRegistrKeySecretName - port: 9000 + # - myRegistrKeySecretName + port: 8500 ## TensorFlow Inception image version ## ref: https://hub.docker.com/r/bitnami/tensorflow-inception/tags/ @@ -37,7 +37,7 @@ client: ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ ## # pullSecrets: - # - myRegistrKeySecretName + # - myRegistrKeySecretName ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' diff --git a/bitnami/tomcat/Chart.yaml b/bitnami/tomcat/Chart.yaml index 652829f36..a79a675bf 100644 --- a/bitnami/tomcat/Chart.yaml +++ b/bitnami/tomcat/Chart.yaml @@ -1,5 +1,5 @@ name: tomcat -version: 1.0.0 +version: 1.0.2 appVersion: 8.5.34 description: Chart for Apache Tomcat keywords: diff --git a/bitnami/tomcat/README.md b/bitnami/tomcat/README.md index 15bfdca4b..a2b8e8d1a 100644 --- a/bitnami/tomcat/README.md +++ b/bitnami/tomcat/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/tomcat This chart bootstraps a [Tomcat](https://github.com/bitnami/bitnami-docker-tomcat) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/bitnami/tomcat/templates/NOTES.txt b/bitnami/tomcat/templates/NOTES.txt index 0e692bafb..a54a1e981 100644 --- a/bitnami/tomcat/templates/NOTES.txt +++ b/bitnami/tomcat/templates/NOTES.txt @@ -14,7 +14,7 @@ ** Please ensure an external IP is associated to the {{ template "fullname" . }} service before proceeding ** ** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }} ** - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo URL : http://$SERVICE_IP/ echo Management URL : http://$SERVICE_IP/manager {{- else if contains "ClusterIP" .Values.serviceType }} diff --git a/bitnami/wildfly/Chart.yaml b/bitnami/wildfly/Chart.yaml index 98658be78..b76157c94 100644 --- a/bitnami/wildfly/Chart.yaml +++ b/bitnami/wildfly/Chart.yaml @@ -1,5 +1,5 @@ name: wildfly -version: 1.0.0 +version: 1.0.2 appVersion: 14.0.1 description: Chart for Wildfly keywords: diff --git a/bitnami/wildfly/README.md b/bitnami/wildfly/README.md index 5646fe83e..933544aaa 100644 --- a/bitnami/wildfly/README.md +++ b/bitnami/wildfly/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/wildfly This chart bootstraps a [WildFly](https://github.com/bitnami/bitnami-docker-wildfly) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/bitnami/wildfly/templates/NOTES.txt b/bitnami/wildfly/templates/NOTES.txt index 23fdeb35b..e6f5f777a 100644 --- a/bitnami/wildfly/templates/NOTES.txt +++ b/bitnami/wildfly/templates/NOTES.txt @@ -14,7 +14,7 @@ ** Please ensure an external IP is associated to the {{ template "fullname" . }} service before proceeding ** ** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }} ** - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo URL : http://$SERVICE_IP/ echo Management Url : http://$SERVICE_IP:9990/ {{- else if contains "ClusterIP" .Values.serviceType }} diff --git a/bitnami/zookeeper/Chart.yaml b/bitnami/zookeeper/Chart.yaml index d749db4ec..b71b96ca6 100644 --- a/bitnami/zookeeper/Chart.yaml +++ b/bitnami/zookeeper/Chart.yaml @@ -1,5 +1,5 @@ name: zookeeper -version: 1.0.0 +version: 1.0.3 appVersion: 3.4.12 description: A centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services for distributed applications. keywords: diff --git a/bitnami/zookeeper/README.md b/bitnami/zookeeper/README.md index 3921c9ecc..189068d25 100644 --- a/bitnami/zookeeper/README.md +++ b/bitnami/zookeeper/README.md @@ -12,6 +12,8 @@ $ helm install bitnami/zookeeper This chart bootstraps a [Zookeeper](https://github.com/bitnami/bitnami-docker-zookeeper) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/bitnami/zookeeper/templates/NOTES.txt b/bitnami/zookeeper/templates/NOTES.txt index f62061816..d37138bb3 100644 --- a/bitnami/zookeeper/templates/NOTES.txt +++ b/bitnami/zookeeper/templates/NOTES.txt @@ -39,7 +39,7 @@ To connect to your ZooKeeper server from outside the cluster execute the followi NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "zookeeper.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "zookeeper.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "zookeeper.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") zkCli.sh $SERVICE_IP:2181 {{- else if contains "ClusterIP" .Values.service.type }} diff --git a/bitnami/zookeeper/templates/statefulset.yaml b/bitnami/zookeeper/templates/statefulset.yaml index 711ee7ab1..ababc253d 100644 --- a/bitnami/zookeeper/templates/statefulset.yaml +++ b/bitnami/zookeeper/templates/statefulset.yaml @@ -91,7 +91,7 @@ spec: {{- $electionPort := int .Values.service.electionPort }} {{- $releaseNamespace := .Release.Namespace }} {{- $zookeeperFullname := include "zookeeper.fullname" . }} - {{- $zookeeperHeadlessServiceName := printf "%s-%s" $zookeeperFullname "headless" | trunc 24 }} + {{- $zookeeperHeadlessServiceName := printf "%s-%s" $zookeeperFullname "headless" | trunc 63 }} value: {{range $i, $e := until $replicaCount }}{{ $zookeeperFullname }}-{{ $e }}.{{ $zookeeperHeadlessServiceName }}.{{ $releaseNamespace }}.svc.cluster.local:{{ $followerPort }}:{{ $electionPort }} {{ end }} {{- if .Values.auth.enabled }} - name: ZOO_ENABLE_AUTH diff --git a/upstreamed/dokuwiki/Chart.yaml b/upstreamed/dokuwiki/Chart.yaml index 0958f505b..034ed200c 100644 --- a/upstreamed/dokuwiki/Chart.yaml +++ b/upstreamed/dokuwiki/Chart.yaml @@ -1,5 +1,5 @@ name: dokuwiki -version: 3.0.1 +version: 3.0.3 appVersion: 0.20180422.201805030840 description: DokuWiki is a standards-compliant, simple to use wiki optimized for creating documentation. It is targeted at developer teams, workgroups, and small companies. diff --git a/upstreamed/dokuwiki/README.md b/upstreamed/dokuwiki/README.md index b76fd5e19..a85d03815 100644 --- a/upstreamed/dokuwiki/README.md +++ b/upstreamed/dokuwiki/README.md @@ -12,6 +12,8 @@ $ helm install stable/dokuwiki This chart bootstraps a [DokuWiki](https://github.com/bitnami/bitnami-docker-dokuwiki) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/dokuwiki/templates/NOTES.txt b/upstreamed/dokuwiki/templates/NOTES.txt index ee525cdf8..6b41468fe 100644 --- a/upstreamed/dokuwiki/templates/NOTES.txt +++ b/upstreamed/dokuwiki/templates/NOTES.txt @@ -25,7 +25,7 @@ ** Please ensure an external IP is associated to the {{ template "dokuwiki.fullname" . }} service before proceeding ** ** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "dokuwiki.fullname" . }} ** - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "dokuwiki.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "dokuwiki.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "URL: http://$SERVICE_IP/" {{- else if contains "ClusterIP" .Values.service.type }} diff --git a/upstreamed/drupal/Chart.yaml b/upstreamed/drupal/Chart.yaml index a52a13fc1..425c55ba6 100644 --- a/upstreamed/drupal/Chart.yaml +++ b/upstreamed/drupal/Chart.yaml @@ -1,5 +1,5 @@ name: drupal -version: 2.0.0 +version: 2.0.3 appVersion: 8.6.1 description: One of the most versatile open source content management systems. keywords: @@ -15,6 +15,6 @@ icon: https://bitnami.com/assets/stacks/drupal/img/drupal-stack-220x234.png sources: - https://github.com/bitnami/bitnami-docker-drupal maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl diff --git a/upstreamed/drupal/README.md b/upstreamed/drupal/README.md index 636f60066..59bfabe4a 100644 --- a/upstreamed/drupal/README.md +++ b/upstreamed/drupal/README.md @@ -14,6 +14,8 @@ This chart bootstraps a [Drupal](https://github.com/bitnami/bitnami-docker-drupa It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment as a database for the Drupal application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/drupal/requirements.lock b/upstreamed/drupal/requirements.lock index 69dbff95c..aeb25e469 100644 --- a/upstreamed/drupal/requirements.lock +++ b/upstreamed/drupal/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.4.1 -digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 -generated: 2018-09-11T11:30:42.296215466Z + version: 5.0.4 +digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c +generated: 2018-09-25T11:23:40.285763588+02:00 diff --git a/upstreamed/drupal/requirements.yaml b/upstreamed/drupal/requirements.yaml index 4ea7e0e5c..a828b3769 100644 --- a/upstreamed/drupal/requirements.yaml +++ b/upstreamed/drupal/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/drupal/templates/NOTES.txt b/upstreamed/drupal/templates/NOTES.txt index 6e8aed56a..811c6adbf 100644 --- a/upstreamed/drupal/templates/NOTES.txt +++ b/upstreamed/drupal/templates/NOTES.txt @@ -16,7 +16,7 @@ NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "drupal.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "drupal.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "drupal.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "Drupal URL: http://$SERVICE_IP/" {{- else if contains "ClusterIP" .Values.serviceType }} diff --git a/upstreamed/ghost/Chart.yaml b/upstreamed/ghost/Chart.yaml index 7a8b889f8..42f351987 100644 --- a/upstreamed/ghost/Chart.yaml +++ b/upstreamed/ghost/Chart.yaml @@ -1,6 +1,6 @@ name: ghost -version: 5.0.1 -appVersion: 2.1.3 +version: 5.0.3 +appVersion: 2.1.4 description: A simple, powerful publishing platform that allows you to share your stories with the world keywords: diff --git a/upstreamed/ghost/README.md b/upstreamed/ghost/README.md index 9ba569d69..7cff6f8d1 100644 --- a/upstreamed/ghost/README.md +++ b/upstreamed/ghost/README.md @@ -14,6 +14,8 @@ This chart bootstraps a [Ghost](https://github.com/bitnami/bitnami-docker-ghost) It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the Ghost application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/ghost/values.yaml b/upstreamed/ghost/values.yaml index 0b277d042..4db9b8310 100644 --- a/upstreamed/ghost/values.yaml +++ b/upstreamed/ghost/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/ghost - tag: 2.1.3-debian-9 + tag: 2.1.4-debian-9 ## 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 diff --git a/upstreamed/jasperreports/Chart.yaml b/upstreamed/jasperreports/Chart.yaml index 960919095..4ba784b24 100644 --- a/upstreamed/jasperreports/Chart.yaml +++ b/upstreamed/jasperreports/Chart.yaml @@ -1,5 +1,5 @@ name: jasperreports -version: 3.0.0 +version: 3.0.3 appVersion: 7.1.0 description: The JasperReports server can be used as a stand-alone or embedded reporting and BI server that offers web-based reporting, analytic tools and visualization, @@ -15,7 +15,7 @@ home: http://community.jaspersoft.com/project/jasperreports-server sources: - https://github.com/bitnami/bitnami-docker-jasperreports maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl icon: https://bitnami.com/assets/stacks/jasperserver/img/jasperserver-stack-110x117.png diff --git a/upstreamed/jasperreports/README.md b/upstreamed/jasperreports/README.md index e5e0d7ffb..42aac6131 100644 --- a/upstreamed/jasperreports/README.md +++ b/upstreamed/jasperreports/README.md @@ -14,6 +14,8 @@ This chart bootstraps a [JasperReports](https://github.com/bitnami/bitnami-docke It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which bootstraps a MariaDB deployment required by the JasperReports application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/jasperreports/requirements.lock b/upstreamed/jasperreports/requirements.lock index 90d8a6bd7..2b5c4a4eb 100644 --- a/upstreamed/jasperreports/requirements.lock +++ b/upstreamed/jasperreports/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.2.6 -digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 -generated: 2018-07-09T11:16:50.79597791Z + version: 5.0.4 +digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c +generated: 2018-09-25T11:30:38.012477426+02:00 diff --git a/upstreamed/jasperreports/requirements.yaml b/upstreamed/jasperreports/requirements.yaml index 4ea7e0e5c..a828b3769 100644 --- a/upstreamed/jasperreports/requirements.yaml +++ b/upstreamed/jasperreports/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/jasperreports/templates/NOTES.txt b/upstreamed/jasperreports/templates/NOTES.txt index 39b60c712..c36d47d59 100644 --- a/upstreamed/jasperreports/templates/NOTES.txt +++ b/upstreamed/jasperreports/templates/NOTES.txt @@ -14,7 +14,7 @@ ** Please ensure an external IP is associated to the {{ template "jasperreports.fullname" . }} service before proceeding ** ** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "jasperreports.fullname" . }} ** - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "jasperreports.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "jasperreports.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "JasperReports URL: http://$SERVICE_IP/jasperserver/" {{- else if contains "ClusterIP" .Values.serviceType }} diff --git a/upstreamed/joomla/Chart.yaml b/upstreamed/joomla/Chart.yaml index 0900633db..7eb3be99b 100644 --- a/upstreamed/joomla/Chart.yaml +++ b/upstreamed/joomla/Chart.yaml @@ -1,5 +1,5 @@ name: joomla -version: 3.0.0 +version: 3.0.3 appVersion: 3.8.12 description: PHP content management system (CMS) for publishing web content keywords: diff --git a/upstreamed/joomla/README.md b/upstreamed/joomla/README.md index 3e497a9ce..94ac0e800 100644 --- a/upstreamed/joomla/README.md +++ b/upstreamed/joomla/README.md @@ -14,6 +14,8 @@ This chart bootstraps a [Joomla!](https://github.com/bitnami/bitnami-docker-joom It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which bootstraps a MariaDB deployment required by the Joomla! application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/joomla/requirements.lock b/upstreamed/joomla/requirements.lock index e52b3323c..dfeaa216a 100644 --- a/upstreamed/joomla/requirements.lock +++ b/upstreamed/joomla/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.4.0 -digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 -generated: 2018-08-29T08:55:54.398261977Z + version: 5.0.4 +digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c +generated: 2018-09-25T11:33:11.310241409+02:00 diff --git a/upstreamed/joomla/requirements.yaml b/upstreamed/joomla/requirements.yaml index 7b86c4485..a828b3769 100644 --- a/upstreamed/joomla/requirements.yaml +++ b/upstreamed/joomla/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ - condition: mariadb.enabled \ No newline at end of file + condition: mariadb.enabled diff --git a/upstreamed/joomla/templates/NOTES.txt b/upstreamed/joomla/templates/NOTES.txt index dcb3fdce7..009d8f446 100644 --- a/upstreamed/joomla/templates/NOTES.txt +++ b/upstreamed/joomla/templates/NOTES.txt @@ -26,7 +26,7 @@ NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "joomla.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "joomla.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "joomla.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "Joomla! URL: http://$SERVICE_IP/" {{- else if contains "ClusterIP" .Values.service.type }} diff --git a/upstreamed/magento/Chart.yaml b/upstreamed/magento/Chart.yaml index ee872d1ad..bdf8304ea 100644 --- a/upstreamed/magento/Chart.yaml +++ b/upstreamed/magento/Chart.yaml @@ -1,5 +1,5 @@ name: magento -version: 3.0.0 +version: 3.0.3 appVersion: 2.2.6 description: A feature-rich flexible e-commerce solution. It includes transaction options, multi-store functionality, loyalty programs, product categorization and shopper filtering, promotion rules, and more. keywords: @@ -12,7 +12,7 @@ home: https://magento.com/ sources: - https://github.com/bitnami/bitnami-docker-magento maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl icon: https://bitnami.com/assets/stacks/magento/img/magento-stack-110x117.png diff --git a/upstreamed/magento/README.md b/upstreamed/magento/README.md index fdf199dfd..03f9f40d9 100644 --- a/upstreamed/magento/README.md +++ b/upstreamed/magento/README.md @@ -14,6 +14,8 @@ This chart bootstraps a [Magento](https://github.com/bitnami/bitnami-docker-mage It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment as a database for the Magento application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/magento/requirements.lock b/upstreamed/magento/requirements.lock index fbda032ed..c56f25d5e 100644 --- a/upstreamed/magento/requirements.lock +++ b/upstreamed/magento/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.4.2 -digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 -generated: 2018-09-19T08:55:16.161228356Z + version: 5.0.4 +digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c +generated: 2018-09-25T11:35:19.787082498+02:00 diff --git a/upstreamed/magento/requirements.yaml b/upstreamed/magento/requirements.yaml index 4ea7e0e5c..a828b3769 100644 --- a/upstreamed/magento/requirements.yaml +++ b/upstreamed/magento/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/mariadb/Chart.yaml b/upstreamed/mariadb/Chart.yaml index af0c97e0b..9c928037f 100644 --- a/upstreamed/mariadb/Chart.yaml +++ b/upstreamed/mariadb/Chart.yaml @@ -1,5 +1,5 @@ name: mariadb -version: 5.0.4 +version: 5.0.9 appVersion: 10.1.36 description: Fast, reliable, scalable, and easy to use open-source relational database system. MariaDB Server is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software. Highly available MariaDB cluster. keywords: @@ -14,6 +14,6 @@ sources: - https://github.com/bitnami/bitnami-docker-mariadb - https://github.com/prometheus/mysqld_exporter maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl diff --git a/upstreamed/mariadb/README.md b/upstreamed/mariadb/README.md index cdb55f43c..7228af167 100644 --- a/upstreamed/mariadb/README.md +++ b/upstreamed/mariadb/README.md @@ -14,6 +14,8 @@ $ helm install stable/mariadb This chart bootstraps a [MariaDB](https://github.com/bitnami/bitnami-docker-mariadb) replication cluster deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled @@ -53,6 +55,7 @@ The following table lists the configurable parameters of the MariaDB chart and t | `image.pullPolicy` | MariaDB image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | | `image.pullSecrets` | Specify image pull secrets | `nil` (does not add image pull secrets to deployed pods) | | `service.type` | Kubernetes service type | `ClusterIP` | +| `service.clusterIp` | Specific cluster IP when service type is cluster IP. Use None for headless service | `nil` | | `service.port` | MySQL service port | `3306` | | `rootUser.password` | Password for the `root` user | _random 10 character alphanumeric string_ | | `rootUser.forcePassword` | Force users to specify a password | `false` | @@ -62,6 +65,8 @@ The following table lists the configurable parameters of the MariaDB chart and t | `replication.enabled` | MariaDB replication enabled | `true` | | `replication.user` | MariaDB replication user | `replicator` | | `replication.password` | MariaDB replication user password | _random 10 character alphanumeric string_ | +| `master.annotations[].key` | key for the the annotation list item | `nil` | +| `master.annotations[].value` | value for the the annotation list item | `nil` | | `master.affinity` | Master affinity (in addition to master.antiAffinity when set) | `{}` | | `master.antiAffinity` | Master pod anti-affinity policy | `soft` | | `master.tolerations` | List of node taints to tolerate (master) | `[]` | @@ -87,6 +92,8 @@ The following table lists the configurable parameters of the MariaDB chart and t | `master.readinessProbe.successThreshold` | Minimum consecutive successes for the probe (master)| `1` | | `master.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe (master) | `3` | | `slave.replicas` | Desired number of slave replicas | `1` | +| `slave.annotations[].key` | key for the the annotation list item | `nil` | +| `slave.annotations[].value` | value for the the annotation list item | `nil` | | `slave.affinity` | Slave affinity (in addition to slave.antiAffinity when set) | `{}` | | `slave.antiAffinity` | Slave pod anti-affinity policy | `soft` | | `slave.tolerations` | List of node taints to tolerate for (slave) | `[]` | diff --git a/upstreamed/mariadb/templates/master-statefulset.yaml b/upstreamed/mariadb/templates/master-statefulset.yaml index b1b1af67c..e08962cc7 100644 --- a/upstreamed/mariadb/templates/master-statefulset.yaml +++ b/upstreamed/mariadb/templates/master-statefulset.yaml @@ -20,6 +20,12 @@ spec: type: RollingUpdate template: metadata: + {{- if .Values.master.annotations }} + annotations: + {{- range .Values.master.annotations }} + {{ .key }}: '{{ .value }}' + {{- end }} + {{- end }} labels: app: "{{ template "mariadb.name" . }}" component: "master" @@ -191,7 +197,6 @@ spec: name: data labels: app: "{{ template "mariadb.name" . }}" - chart: {{ template "mariadb.chart" . }} component: "master" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} diff --git a/upstreamed/mariadb/templates/master-svc.yaml b/upstreamed/mariadb/templates/master-svc.yaml index 8fd07fd97..56810b44b 100644 --- a/upstreamed/mariadb/templates/master-svc.yaml +++ b/upstreamed/mariadb/templates/master-svc.yaml @@ -14,6 +14,11 @@ metadata: {{- end }} spec: type: {{ .Values.service.type }} + {{- if eq .Values.service.type "ClusterIP" }} + {{- if .Values.service.clusterIp }} + clusterIP: {{ .Values.service.clusterIp }} + {{- end }} + {{- end }} ports: - name: mysql port: {{ .Values.service.port }} diff --git a/upstreamed/mariadb/templates/slave-statefulset.yaml b/upstreamed/mariadb/templates/slave-statefulset.yaml index 56340af29..b2b00e4b2 100644 --- a/upstreamed/mariadb/templates/slave-statefulset.yaml +++ b/upstreamed/mariadb/templates/slave-statefulset.yaml @@ -21,6 +21,12 @@ spec: type: RollingUpdate template: metadata: + {{- if .Values.slave.annotations }} + annotations: + {{- range .Values.slave.annotations }} + {{ .key }}: '{{ .value }}' + {{- end }} + {{- end }} labels: app: "{{ template "mariadb.name" . }}" component: "slave" @@ -77,22 +83,6 @@ spec: image: {{ template "mariadb.image" . }} imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: - - name: MARIADB_ROOT_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.fullname" . }} - key: mariadb-root-password - {{- if .Values.db.user }} - - name: MARIADB_USER - value: "{{ .Values.db.user }}" - - name: MARIADB_PASSWORD - valueFrom: - secretKeyRef: - name: {{ template "mariadb.fullname" . }} - key: mariadb-password - {{- end }} - - name: MARIADB_DATABASE - value: "{{ .Values.db.name }}" - name: MARIADB_REPLICATION_MODE value: "slave" - name: MARIADB_MASTER_HOST @@ -119,7 +109,7 @@ spec: {{- if .Values.slave.livenessProbe.enabled }} livenessProbe: exec: - command: ["sh", "-c", "exec mysqladmin status -uroot -p$MARIADB_ROOT_PASSWORD"] + command: ["sh", "-c", "exec mysqladmin status -uroot -p$MARIADB_MASTER_ROOT_PASSWORD"] initialDelaySeconds: {{ .Values.slave.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.slave.livenessProbe.periodSeconds }} timeoutSeconds: {{ .Values.slave.livenessProbe.timeoutSeconds }} @@ -129,7 +119,7 @@ spec: {{- if .Values.slave.readinessProbe.enabled }} readinessProbe: exec: - command: ["sh", "-c", "exec mysqladmin status -uroot -p$MARIADB_ROOT_PASSWORD"] + command: ["sh", "-c", "exec mysqladmin status -uroot -p$MARIADB_MASTER_ROOT_PASSWORD"] initialDelaySeconds: {{ .Values.slave.readinessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.slave.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.slave.readinessProbe.timeoutSeconds }} @@ -151,12 +141,12 @@ spec: image: {{ template "metrics.image" . }} imagePullPolicy: {{ .Values.metrics.image.pullPolicy | quote }} env: - - name: MARIADB_ROOT_PASSWORD + - name: MARIADB_MASTER_ROOT_PASSWORD valueFrom: secretKeyRef: name: {{ template "mariadb.fullname" . }} key: mariadb-root-password - command: [ 'sh', '-c', 'DATA_SOURCE_NAME="root:$MARIADB_ROOT_PASSWORD@(localhost:3306)/" /bin/mysqld_exporter' ] + command: [ 'sh', '-c', 'DATA_SOURCE_NAME="root:$MARIADB_MASTER_ROOT_PASSWORD@(localhost:3306)/" /bin/mysqld_exporter' ] ports: - name: metrics containerPort: 9104 @@ -187,7 +177,6 @@ spec: name: data labels: app: "{{ template "mariadb.name" . }}" - chart: {{ template "mariadb.chart" . }} component: "slave" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} diff --git a/upstreamed/mariadb/templates/slave-svc.yaml b/upstreamed/mariadb/templates/slave-svc.yaml index 54bc8f3dc..c41ecb752 100644 --- a/upstreamed/mariadb/templates/slave-svc.yaml +++ b/upstreamed/mariadb/templates/slave-svc.yaml @@ -15,6 +15,11 @@ metadata: {{- end }} spec: type: {{ .Values.service.type }} + {{- if eq .Values.service.type "ClusterIP" }} + {{- if .Values.service.clusterIp }} + clusterIP: {{ .Values.service.clusterIp }} + {{- end }} + {{- end }} ports: - name: mysql port: {{ .Values.service.port }} diff --git a/upstreamed/mariadb/values-production.yaml b/upstreamed/mariadb/values-production.yaml index fca7a703e..f5fbc373f 100644 --- a/upstreamed/mariadb/values-production.yaml +++ b/upstreamed/mariadb/values-production.yaml @@ -20,6 +20,7 @@ image: service: ## Kubernetes service type, ClusterIP and NodePort are supported at present type: ClusterIP + # clusterIp: None port: 3306 ## Specify the nodePort value for the LoadBalancer and NodePort service types. ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport @@ -75,6 +76,12 @@ replication: forcePassword: true master: + ## Mariadb Master additional pod annotations + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + # annotations: + # - key: key1 + # value: value1 + ## Affinity for pod assignment ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity ## @@ -176,6 +183,13 @@ master: slave: replicas: 2 + + ## Mariadb Slave additional pod annotations + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + # annotations: + # - key: key1 + # value: value1 + ## Affinity for pod assignment ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity ## diff --git a/upstreamed/mariadb/values.yaml b/upstreamed/mariadb/values.yaml index c47c35630..2ecc5d26e 100644 --- a/upstreamed/mariadb/values.yaml +++ b/upstreamed/mariadb/values.yaml @@ -20,6 +20,7 @@ image: service: ## Kubernetes service type, ClusterIP and NodePort are supported at present type: ClusterIP + # clusterIp: None port: 3306 ## Specify the nodePort value for the LoadBalancer and NodePort service types. ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport @@ -75,6 +76,12 @@ replication: forcePassword: false master: + ## Mariadb Master additional pod annotations + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + # annotations: + # - key: key1 + # value: value1 + ## Affinity for pod assignment ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity ## @@ -176,6 +183,12 @@ master: slave: replicas: 1 + ## Mariadb Slave additional pod annotations + ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/ + # annotations: + # - key: key1 + # value: value1 + ## Affinity for pod assignment ## Ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity ## diff --git a/upstreamed/mediawiki/Chart.yaml b/upstreamed/mediawiki/Chart.yaml index 3b799b6be..28a8b95c3 100644 --- a/upstreamed/mediawiki/Chart.yaml +++ b/upstreamed/mediawiki/Chart.yaml @@ -1,5 +1,5 @@ name: mediawiki -version: 4.0.1 +version: 4.0.4 appVersion: 1.31.1 description: Extremely powerful, scalable software and a feature-rich wiki implementation that uses PHP to process and display data stored in a database. @@ -15,6 +15,6 @@ keywords: sources: - https://github.com/bitnami/bitnami-docker-mediawiki maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl diff --git a/upstreamed/mediawiki/README.md b/upstreamed/mediawiki/README.md index 5cf53544f..d23272297 100644 --- a/upstreamed/mediawiki/README.md +++ b/upstreamed/mediawiki/README.md @@ -14,6 +14,8 @@ This chart bootstraps a [MediaWiki](https://github.com/bitnami/bitnami-docker-me It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the MediaWiki application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/mediawiki/requirements.lock b/upstreamed/mediawiki/requirements.lock index f710e5688..509b5fa3f 100644 --- a/upstreamed/mediawiki/requirements.lock +++ b/upstreamed/mediawiki/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.4.2 -digest: sha256:5cb42bb2a3015c1a452f31ac1b35a9f5626bc742eebff8f8487a6b760d51e3e9 -generated: 2018-09-21T01:15:34.480709196Z + version: 5.0.4 +digest: sha256:7043c28f05b6aac3615a61e609bddc958b51bea717afa81455d7d34641cdd906 +generated: 2018-09-25T11:40:02.188164295+02:00 diff --git a/upstreamed/mediawiki/requirements.yaml b/upstreamed/mediawiki/requirements.yaml index de8faa14f..56aec6b96 100644 --- a/upstreamed/mediawiki/requirements.yaml +++ b/upstreamed/mediawiki/requirements.yaml @@ -1,6 +1,6 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled tags: diff --git a/upstreamed/mediawiki/templates/NOTES.txt b/upstreamed/mediawiki/templates/NOTES.txt index 6c0c7a324..5dd529089 100644 --- a/upstreamed/mediawiki/templates/NOTES.txt +++ b/upstreamed/mediawiki/templates/NOTES.txt @@ -26,7 +26,7 @@ NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "mediawiki.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "mediawiki.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "mediawiki.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "Mediawiki URL: http://$SERVICE_IP/" {{- else if contains "ClusterIP" .Values.service.type }} diff --git a/upstreamed/mongodb/Chart.yaml b/upstreamed/mongodb/Chart.yaml index 79df72a23..6193ad611 100644 --- a/upstreamed/mongodb/Chart.yaml +++ b/upstreamed/mongodb/Chart.yaml @@ -1,6 +1,6 @@ name: mongodb -version: 4.3.5 -appVersion: 4.0.2 +version: 4.3.10 +appVersion: 4.0.3 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications. keywords: - mongodb diff --git a/upstreamed/mongodb/README.md b/upstreamed/mongodb/README.md index afc56346a..3b429988e 100644 --- a/upstreamed/mongodb/README.md +++ b/upstreamed/mongodb/README.md @@ -12,6 +12,8 @@ $ helm install stable/mongodb This chart bootstraps a [MongoDB](https://github.com/bitnami/bitnami-docker-mongodb) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled @@ -84,6 +86,7 @@ The following table lists the configurable parameters of the MongoDB chart and t | `persistence.accessMode` | Use volume as ReadOnly or ReadWrite | `ReadWriteOnce` | | `persistence.size` | Size of data volume | `8Gi` | | `persistence.annotations` | Persistent Volume annotations | `{}` | +| `persistence.existingClaim` | Name of an existing PVC to use (avoids creating one if this is given) | `nil` | | `livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | `30` | | `livenessProbe.periodSeconds` | How often to perform the probe | `10` | | `livenessProbe.timeoutSeconds` | When the probe times out | `5` | diff --git a/upstreamed/mongodb/templates/NOTES.txt b/upstreamed/mongodb/templates/NOTES.txt index 18b9032ca..af810019b 100644 --- a/upstreamed/mongodb/templates/NOTES.txt +++ b/upstreamed/mongodb/templates/NOTES.txt @@ -55,7 +55,7 @@ To connect to your database from outside the cluster execute the following comma NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "mongodb.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "mongodb.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "mongodb.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") mongo --host $SERVICE_IP --port {{ .Values.service.nodePort }} {{- if .Values.usePassword }} -p $MONGODB_ROOT_PASSWORD{{- end }} {{- else if contains "ClusterIP" .Values.service.type }} diff --git a/upstreamed/mongodb/templates/deployment-standalone.yaml b/upstreamed/mongodb/templates/deployment-standalone.yaml index 8d600512f..b5165dbb2 100644 --- a/upstreamed/mongodb/templates/deployment-standalone.yaml +++ b/upstreamed/mongodb/templates/deployment-standalone.yaml @@ -18,6 +18,7 @@ spec: labels: app: {{ template "mongodb.name" . }} release: "{{ .Release.Name }}" + chart: {{ template "mongodb.chart" . }} {{- if .Values.podAnnotations }} annotations: {{ toYaml .Values.podAnnotations | indent 8 }} diff --git a/upstreamed/mongodb/values-production.yaml b/upstreamed/mongodb/values-production.yaml index 288daee5b..fdf8d0c85 100644 --- a/upstreamed/mongodb/values-production.yaml +++ b/upstreamed/mongodb/values-production.yaml @@ -8,7 +8,7 @@ image: ## Bitnami MongoDB image tag ## ref: https://hub.docker.com/r/bitnami/mongodb/tags/ ## - tag: 4.0.2-debian-9 + tag: 4.0.3-debian-9 ## Specify a imagePullPolicy ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/upstreamed/mongodb/values.yaml b/upstreamed/mongodb/values.yaml index a2be82ad7..bc8fb5e4e 100644 --- a/upstreamed/mongodb/values.yaml +++ b/upstreamed/mongodb/values.yaml @@ -8,7 +8,7 @@ image: ## Bitnami MongoDB image tag ## ref: https://hub.docker.com/r/bitnami/mongodb/tags/ ## - tag: 4.0.2-debian-9 + tag: 4.0.3-debian-9 ## Specify a imagePullPolicy ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images diff --git a/upstreamed/moodle/Chart.yaml b/upstreamed/moodle/Chart.yaml index dc08875c0..791872245 100644 --- a/upstreamed/moodle/Chart.yaml +++ b/upstreamed/moodle/Chart.yaml @@ -1,5 +1,5 @@ name: moodle -version: 3.0.0 +version: 3.0.3 appVersion: 3.5.2 description: Moodle is a learning platform designed to provide educators, administrators and learners with a single robust, secure and integrated system to create personalised diff --git a/upstreamed/moodle/README.md b/upstreamed/moodle/README.md index df93ae900..32939b1f7 100644 --- a/upstreamed/moodle/README.md +++ b/upstreamed/moodle/README.md @@ -14,6 +14,8 @@ This chart bootstraps a [Moodle](https://github.com/bitnami/bitnami-docker-moodl It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the Moodle application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/moodle/requirements.lock b/upstreamed/moodle/requirements.lock index b76a6aeda..d4ea98e97 100644 --- a/upstreamed/moodle/requirements.lock +++ b/upstreamed/moodle/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.4.0 -digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 -generated: 2018-09-08T19:21:59.263919526Z + version: 5.0.4 +digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c +generated: 2018-09-25T11:42:15.186850414+02:00 diff --git a/upstreamed/moodle/requirements.yaml b/upstreamed/moodle/requirements.yaml index 4ea7e0e5c..a828b3769 100644 --- a/upstreamed/moodle/requirements.yaml +++ b/upstreamed/moodle/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/moodle/templates/NOTES.txt b/upstreamed/moodle/templates/NOTES.txt index 31a81eb8e..42d464300 100644 --- a/upstreamed/moodle/templates/NOTES.txt +++ b/upstreamed/moodle/templates/NOTES.txt @@ -27,7 +27,7 @@ ** Please ensure an external IP is associated to the {{ template "moodle.fullname" . }} service before proceeding ** ** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "moodle.fullname" . }} ** - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "moodle.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "moodle.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "Moodle URL: http://$SERVICE_IP/" {{- else if contains "ClusterIP" .Values.serviceType }} diff --git a/upstreamed/nats/Chart.yaml b/upstreamed/nats/Chart.yaml index b89c2c547..b32f199ad 100644 --- a/upstreamed/nats/Chart.yaml +++ b/upstreamed/nats/Chart.yaml @@ -1,5 +1,5 @@ name: nats -version: 1.0.0 +version: 1.0.2 appVersion: 1.3.0 description: An open-source, cloud-native messaging system keywords: diff --git a/upstreamed/nats/README.md b/upstreamed/nats/README.md index 182f1b1b0..4a592c847 100644 --- a/upstreamed/nats/README.md +++ b/upstreamed/nats/README.md @@ -12,6 +12,8 @@ $ helm install stable/nats This chart bootstraps a [NATS](https://github.com/bitnami/bitnami-docker-nats) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/nats/templates/NOTES.txt b/upstreamed/nats/templates/NOTES.txt index 671284ee3..7f275f53e 100644 --- a/upstreamed/nats/templates/NOTES.txt +++ b/upstreamed/nats/templates/NOTES.txt @@ -65,7 +65,7 @@ To access the Monitoring svc from outside the cluster, follow the steps below: NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "nats.fullname" . }}-monitoring' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "nats.fullname" . }}-monitoring -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "nats.fullname" . }}-monitoring --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "Monitoring URL: http://$SERVICE_IP/" {{- else if contains "ClusterIP" .Values.monitoringService.type }} diff --git a/upstreamed/odoo/Chart.yaml b/upstreamed/odoo/Chart.yaml index 16d53ef60..c5560c3a8 100644 --- a/upstreamed/odoo/Chart.yaml +++ b/upstreamed/odoo/Chart.yaml @@ -1,5 +1,5 @@ name: odoo -version: 3.0.0 +version: 3.0.2 appVersion: 11.0.20180915 description: A suite of web based open source business apps. home: https://www.odoo.com/ diff --git a/upstreamed/odoo/README.md b/upstreamed/odoo/README.md index d1efec26d..a335e8068 100644 --- a/upstreamed/odoo/README.md +++ b/upstreamed/odoo/README.md @@ -14,6 +14,8 @@ $ helm install stable/odoo This chart bootstraps a [Odoo](https://github.com/bitnami/bitnami-docker-odoo) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/odoo/templates/NOTES.txt b/upstreamed/odoo/templates/NOTES.txt index 3501a5836..e99c8ecc8 100644 --- a/upstreamed/odoo/templates/NOTES.txt +++ b/upstreamed/odoo/templates/NOTES.txt @@ -25,7 +25,7 @@ ** Please ensure an external IP is associated to the {{ template "odoo.fullname" . }} service before proceeding ** ** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "odoo.fullname" . }} ** - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "odoo.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "odoo.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "Odoo URL: http://$SERVICE_IP/" {{- else if contains "ClusterIP" .Values.service.type }} diff --git a/upstreamed/opencart/Chart.yaml b/upstreamed/opencart/Chart.yaml index 720e14ba0..c0e78aaf5 100644 --- a/upstreamed/opencart/Chart.yaml +++ b/upstreamed/opencart/Chart.yaml @@ -1,5 +1,5 @@ name: opencart -version: 3.0.1 +version: 3.0.3 appVersion: 3.0.2-0 description: A free and open source e-commerce platform for online merchants. It provides a professional and reliable foundation for a successful online store. diff --git a/upstreamed/opencart/README.md b/upstreamed/opencart/README.md index 08d7469b4..e14c85edf 100644 --- a/upstreamed/opencart/README.md +++ b/upstreamed/opencart/README.md @@ -14,6 +14,8 @@ This chart bootstraps an [OpenCart](https://github.com/bitnami/bitnami-docker-op It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the OpenCart application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/opencart/requirements.lock b/upstreamed/opencart/requirements.lock index 9fe0b03ef..b23d6437c 100644 --- a/upstreamed/opencart/requirements.lock +++ b/upstreamed/opencart/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.2.6 -digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 -generated: 2018-07-09T11:08:18.116395174Z + version: 5.0.4 +digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c +generated: 2018-09-25T11:43:52.539515518+02:00 diff --git a/upstreamed/opencart/requirements.yaml b/upstreamed/opencart/requirements.yaml index 4ea7e0e5c..a828b3769 100644 --- a/upstreamed/opencart/requirements.yaml +++ b/upstreamed/opencart/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/orangehrm/Chart.yaml b/upstreamed/orangehrm/Chart.yaml index b5890d0c6..8c8674e10 100644 --- a/upstreamed/orangehrm/Chart.yaml +++ b/upstreamed/orangehrm/Chart.yaml @@ -1,5 +1,5 @@ name: orangehrm -version: 3.0.0 +version: 3.0.3 appVersion: 4.1.2 description: OrangeHRM is a free HR management system that offers a wealth of modules to suit the needs of your business. @@ -15,7 +15,7 @@ home: https://www.orangehrm.com sources: - https://github.com/bitnami/bitnami-docker-orangehrm maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl icon: https://bitnami.com/assets/stacks/orangehrm/img/orangehrm-stack-110x117.png diff --git a/upstreamed/orangehrm/README.md b/upstreamed/orangehrm/README.md index 1f464060f..4fcad2fee 100644 --- a/upstreamed/orangehrm/README.md +++ b/upstreamed/orangehrm/README.md @@ -14,6 +14,8 @@ This chart bootstraps an [OrangeHRM](https://github.com/bitnami/bitnami-docker-o It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the OrangeHRM application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/orangehrm/requirements.lock b/upstreamed/orangehrm/requirements.lock index 817a3531f..642aca3f2 100644 --- a/upstreamed/orangehrm/requirements.lock +++ b/upstreamed/orangehrm/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.4.0 -digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 -generated: 2018-08-30T11:26:34.944682874Z + version: 5.0.4 +digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c +generated: 2018-09-25T11:46:12.001683527+02:00 diff --git a/upstreamed/orangehrm/requirements.yaml b/upstreamed/orangehrm/requirements.yaml index 4ea7e0e5c..a828b3769 100644 --- a/upstreamed/orangehrm/requirements.yaml +++ b/upstreamed/orangehrm/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/orangehrm/templates/NOTES.txt b/upstreamed/orangehrm/templates/NOTES.txt index 8ba504ead..5206d8f1a 100644 --- a/upstreamed/orangehrm/templates/NOTES.txt +++ b/upstreamed/orangehrm/templates/NOTES.txt @@ -15,7 +15,7 @@ ** Please ensure an external IP is associated to the {{ template "orangehrm.fullname" . }} service before proceeding ** ** Watch the status using: kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "orangehrm.fullname" . }} ** - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "orangehrm.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "orangehrm.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "OrangeHRM URL: http://$SERVICE_IP/" {{- else if contains "ClusterIP" .Values.serviceType }} diff --git a/upstreamed/osclass/Chart.yaml b/upstreamed/osclass/Chart.yaml index e60b1d04b..d030a71ad 100644 --- a/upstreamed/osclass/Chart.yaml +++ b/upstreamed/osclass/Chart.yaml @@ -1,5 +1,5 @@ name: osclass -version: 3.0.0 +version: 3.0.3 appVersion: 3.7.4 description: Osclass is a php script that allows you to quickly create and manage your own free classifieds site. @@ -13,7 +13,7 @@ home: https://osclass.org/ sources: - https://github.com/bitnami/bitnami-docker-osclass maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl icon: https://bitnami.com/assets/stacks/osclass/img/osclass-stack-110x117.png diff --git a/upstreamed/osclass/README.md b/upstreamed/osclass/README.md index 38c7658df..e624b495f 100644 --- a/upstreamed/osclass/README.md +++ b/upstreamed/osclass/README.md @@ -14,6 +14,8 @@ This chart bootstraps an [Osclass](https://github.com/bitnami/bitnami-docker-osc It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the Osclass application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/osclass/requirements.lock b/upstreamed/osclass/requirements.lock index b7ad4edf8..54514ee67 100644 --- a/upstreamed/osclass/requirements.lock +++ b/upstreamed/osclass/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.2.5 -digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 -generated: 2018-07-06T16:35:44.117826969Z + version: 5.0.4 +digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c +generated: 2018-09-25T11:48:30.289513274+02:00 diff --git a/upstreamed/osclass/requirements.yaml b/upstreamed/osclass/requirements.yaml index 4ea7e0e5c..a828b3769 100644 --- a/upstreamed/osclass/requirements.yaml +++ b/upstreamed/osclass/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/owncloud/Chart.yaml b/upstreamed/owncloud/Chart.yaml index fe2392033..24b24c315 100644 --- a/upstreamed/owncloud/Chart.yaml +++ b/upstreamed/owncloud/Chart.yaml @@ -1,5 +1,5 @@ name: owncloud -version: 3.0.0 +version: 3.0.2 appVersion: 10.0.10 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: diff --git a/upstreamed/owncloud/README.md b/upstreamed/owncloud/README.md index 4fbdbe03b..ba9c3db52 100644 --- a/upstreamed/owncloud/README.md +++ b/upstreamed/owncloud/README.md @@ -14,6 +14,8 @@ This chart bootstraps an [ownCloud](https://github.com/bitnami/bitnami-docker-ow It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the ownCloud application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/owncloud/requirements.lock b/upstreamed/owncloud/requirements.lock index 101c36140..5fb8d4b38 100644 --- a/upstreamed/owncloud/requirements.lock +++ b/upstreamed/owncloud/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.4.2 -digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 -generated: 2018-09-18T11:13:37.723691433Z + version: 5.0.4 +digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c +generated: 2018-09-25T11:49:59.281075519+02:00 diff --git a/upstreamed/owncloud/requirements.yaml b/upstreamed/owncloud/requirements.yaml index 4ea7e0e5c..a828b3769 100644 --- a/upstreamed/owncloud/requirements.yaml +++ b/upstreamed/owncloud/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/parse/Chart.yaml b/upstreamed/parse/Chart.yaml index 80055a65f..1b5fa399c 100644 --- a/upstreamed/parse/Chart.yaml +++ b/upstreamed/parse/Chart.yaml @@ -1,5 +1,5 @@ name: parse -version: 3.0.0 +version: 3.0.2 appVersion: 3.0.0 description: Parse is a platform that enables users to add a scalable and powerful backend to launch a full-featured app for iOS, Android, JavaScript, Windows, Unity, and more. keywords: diff --git a/upstreamed/parse/README.md b/upstreamed/parse/README.md index 41fc4246d..5b2c0ff7d 100644 --- a/upstreamed/parse/README.md +++ b/upstreamed/parse/README.md @@ -12,6 +12,8 @@ $ helm install stable/parse This chart bootstraps a [Parse](https://github.com/bitnami/bitnami-docker-parse) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/parse/templates/NOTES.txt b/upstreamed/parse/templates/NOTES.txt index 882b8819e..56de56e32 100644 --- a/upstreamed/parse/templates/NOTES.txt +++ b/upstreamed/parse/templates/NOTES.txt @@ -20,7 +20,7 @@ Parse Server NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "parse.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "parse.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}'):{{ .Values.server.port }} + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "parse.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}"):{{ .Values.server.port }} {{- else if contains "ClusterIP" .Values.serviceType }} diff --git a/upstreamed/phabricator/Chart.yaml b/upstreamed/phabricator/Chart.yaml index 9d40a2294..c9808b3d5 100644 --- a/upstreamed/phabricator/Chart.yaml +++ b/upstreamed/phabricator/Chart.yaml @@ -1,6 +1,6 @@ name: phabricator -version: 3.0.1 -appVersion: 2018.38.0 +version: 3.0.5 +appVersion: 2018.39.0 description: Collection of open source web applications that help software companies build better software. keywords: - phabricator @@ -20,7 +20,7 @@ home: https://www.phacility.com/phabricator/ sources: - https://github.com/bitnami/bitnami-docker-phabricator maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl icon: https://bitnami.com/assets/stacks/phabricator/img/phabricator-stack-110x117.png diff --git a/upstreamed/phabricator/README.md b/upstreamed/phabricator/README.md index 598975908..d8894df94 100644 --- a/upstreamed/phabricator/README.md +++ b/upstreamed/phabricator/README.md @@ -14,6 +14,8 @@ This chart bootstraps a [Phabricator](https://github.com/bitnami/bitnami-docker- It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the Phabricator application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/phabricator/requirements.lock b/upstreamed/phabricator/requirements.lock index bbf68dd0e..229dc9f48 100644 --- a/upstreamed/phabricator/requirements.lock +++ b/upstreamed/phabricator/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.4.2 -digest: sha256:24134c936ea3fe53c0b99529efc97db98284daa3a8fbd22ab79e8d1c8ba441c9 -generated: 2018-09-17T17:16:45.285990192Z + version: 5.0.7 +digest: sha256:e09c8ca7126923a30e39f442c3863b44684d4eb3f7b6dc869f0206da4463f416 +generated: 2018-10-02T16:38:19.210013204Z diff --git a/upstreamed/phabricator/requirements.yaml b/upstreamed/phabricator/requirements.yaml index 1966821ad..b5efd9a65 100644 --- a/upstreamed/phabricator/requirements.yaml +++ b/upstreamed/phabricator/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/upstreamed/phabricator/values.yaml b/upstreamed/phabricator/values.yaml index 42f762f86..c458578c3 100644 --- a/upstreamed/phabricator/values.yaml +++ b/upstreamed/phabricator/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/phabricator - tag: 2018.38.0-debian-9 + tag: 2018.39.0-debian-9 ## 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 diff --git a/upstreamed/phpbb/Chart.yaml b/upstreamed/phpbb/Chart.yaml index d5494bd01..34519a311 100644 --- a/upstreamed/phpbb/Chart.yaml +++ b/upstreamed/phpbb/Chart.yaml @@ -1,5 +1,5 @@ name: phpbb -version: 3.0.0 +version: 3.0.3 appVersion: 3.2.3 description: Community forum that supports the notion of users and groups, file attachments, full-text search, notifications and more. @@ -13,6 +13,6 @@ icon: https://bitnami.com/assets/stacks/phpbb/img/phpbb-stack-220x234.png sources: - https://github.com/bitnami/bitnami-docker-phpbb maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl diff --git a/upstreamed/phpbb/README.md b/upstreamed/phpbb/README.md index 308020476..a971c089d 100644 --- a/upstreamed/phpbb/README.md +++ b/upstreamed/phpbb/README.md @@ -14,6 +14,8 @@ This chart bootstraps a [phpBB](https://github.com/bitnami/bitnami-docker-phpbb) It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the phpBB application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/phpbb/requirements.lock b/upstreamed/phpbb/requirements.lock index 119fc1f3e..adc8b11ac 100644 --- a/upstreamed/phpbb/requirements.lock +++ b/upstreamed/phpbb/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.4.2 -digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 -generated: 2018-09-13T16:31:37.380433339Z + version: 5.0.4 +digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c +generated: 2018-09-25T11:54:08.872296213+02:00 diff --git a/upstreamed/phpbb/requirements.yaml b/upstreamed/phpbb/requirements.yaml index 4ea7e0e5c..a828b3769 100644 --- a/upstreamed/phpbb/requirements.yaml +++ b/upstreamed/phpbb/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/phpbb/templates/NOTES.txt b/upstreamed/phpbb/templates/NOTES.txt index 8dfe89bff..7e53671cc 100644 --- a/upstreamed/phpbb/templates/NOTES.txt +++ b/upstreamed/phpbb/templates/NOTES.txt @@ -13,7 +13,7 @@ NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "phpbb.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "phpbb.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "phpbb.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "phpBB URL: http://$SERVICE_IP/" {{- else if contains "ClusterIP" .Values.serviceType }} diff --git a/upstreamed/phpmyadmin/Chart.yaml b/upstreamed/phpmyadmin/Chart.yaml index 6de63a3a6..5428366d2 100644 --- a/upstreamed/phpmyadmin/Chart.yaml +++ b/upstreamed/phpmyadmin/Chart.yaml @@ -1,5 +1,5 @@ name: phpmyadmin -version: 1.1.0 +version: 1.1.2 appVersion: 4.8.2 description: phpMyAdmin is an mysql administration frontend keywords: @@ -11,6 +11,6 @@ icon: https://upload.wikimedia.org/wikipedia/commons/thumb/4/4f/PhpMyAdmin_logo. sources: - https://github.com/bitnami/bitnami-docker-phpmyadmin maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl diff --git a/upstreamed/phpmyadmin/README.md b/upstreamed/phpmyadmin/README.md index 270fe3b52..06daf784e 100644 --- a/upstreamed/phpmyadmin/README.md +++ b/upstreamed/phpmyadmin/README.md @@ -12,6 +12,8 @@ $ helm install stable/phpmyadmin This chart bootstraps a [phpMyAdmin](https://github.com/bitnami/bitnami-docker-phpmyadmin) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.8+ with Beta APIs enabled diff --git a/upstreamed/phpmyadmin/templates/NOTES.txt b/upstreamed/phpmyadmin/templates/NOTES.txt index 78a285332..dff97d82b 100644 --- a/upstreamed/phpmyadmin/templates/NOTES.txt +++ b/upstreamed/phpmyadmin/templates/NOTES.txt @@ -19,7 +19,7 @@ NOTE: It may take a few minutes for the LoadBalancer IP to be available. You can watch the status of by running 'kubectl get svc -w {{ template "phpmyadmin.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "phpmyadmin.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "phpmyadmin.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "phpMyAdmin URL: http://$SERVICE_IP:{{ .Values.service.port }}" {{- else if contains "ClusterIP" .Values.service.type }} diff --git a/upstreamed/prestashop/Chart.yaml b/upstreamed/prestashop/Chart.yaml index 74d783a47..c65ad3932 100644 --- a/upstreamed/prestashop/Chart.yaml +++ b/upstreamed/prestashop/Chart.yaml @@ -1,6 +1,6 @@ name: prestashop -version: 3.1.0 -appVersion: 1.7.4-2 +version: 3.1.4 +appVersion: 1.7.4-3 description: A popular open source ecommerce solution. Professional tools are easily accessible to increase online sales including instant guest checkout, abandoned cart reminders and automated Email marketing. @@ -14,7 +14,7 @@ home: https://prestashop.com/ sources: - https://github.com/bitnami/bitnami-docker-prestashop maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl icon: https://bitnami.com/assets/stacks/prestashop/img/prestashop-stack-110x117.png diff --git a/upstreamed/prestashop/README.md b/upstreamed/prestashop/README.md index b265493b4..82011318b 100644 --- a/upstreamed/prestashop/README.md +++ b/upstreamed/prestashop/README.md @@ -14,6 +14,8 @@ This chart bootstraps a [PrestaShop](https://github.com/bitnami/bitnami-docker-p It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the PrestaShop application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.5+ with Beta APIs enabled diff --git a/upstreamed/prestashop/requirements.lock b/upstreamed/prestashop/requirements.lock index 4a4af184e..c79564cd6 100644 --- a/upstreamed/prestashop/requirements.lock +++ b/upstreamed/prestashop/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.2.7 -digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 -generated: 2018-07-11T12:46:32.968678865Z + version: 5.0.8 +digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c +generated: 2018-10-04T13:28:11.27444912Z diff --git a/upstreamed/prestashop/requirements.yaml b/upstreamed/prestashop/requirements.yaml index 4ea7e0e5c..a828b3769 100644 --- a/upstreamed/prestashop/requirements.yaml +++ b/upstreamed/prestashop/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/prestashop/values.yaml b/upstreamed/prestashop/values.yaml index 23115a772..ff885fc06 100644 --- a/upstreamed/prestashop/values.yaml +++ b/upstreamed/prestashop/values.yaml @@ -4,7 +4,7 @@ image: registry: docker.io repository: bitnami/prestashop - tag: 1.7.4-2-debian-9 + tag: 1.7.4-3-debian-9 ## 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 diff --git a/upstreamed/rabbitmq/Chart.yaml b/upstreamed/rabbitmq/Chart.yaml index dacf33f78..e21c68ce2 100644 --- a/upstreamed/rabbitmq/Chart.yaml +++ b/upstreamed/rabbitmq/Chart.yaml @@ -1,5 +1,5 @@ name: rabbitmq -version: 3.2.0 +version: 3.3.6 appVersion: 3.7.8 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP) keywords: diff --git a/upstreamed/rabbitmq/README.md b/upstreamed/rabbitmq/README.md index b6d8a30c8..f7b7a5477 100644 --- a/upstreamed/rabbitmq/README.md +++ b/upstreamed/rabbitmq/README.md @@ -12,6 +12,8 @@ $ helm install stable/rabbitmq This chart bootstraps a [RabbitMQ](https://github.com/bitnami/bitnami-docker-rabbitmq) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.8+ @@ -60,7 +62,11 @@ The following table lists the configurable parameters of the RabbitMQ chart and | `rabbitmq.nodePort` | Node port override, if serviceType NodePort | _random avaliable between 30000-32767_ | | `rabbitmq.managerPort` | RabbitMQ Manager port | `15672` | | `rabbitmq.diskFreeLimit` | Disk free limit | `"6GiB"` | -| `rabbitmq.plugins` | configuration file for plugins to enable | `[rabbitmq_management,rabbitmq_peer_discovery_k8s].` | +| `rabbitmq.plugins` | configuration file for plugins to enable | `[rabbitmq_management,rabbitmq_peer_discovery_k8s].` | +| `rabbitmq.clustering.address_type` | Switch clustering mode | `ip` or `hostname` +| `rabbitmq.clustering.k8s_domain` | Customize internal k8s cluster domain | `cluster.local` + +| `rabbitmq.ulimitNofiles` | Max File Descriptor limit | `65536` | | `rabbitmq.configuration` | rabbitmq.conf content | see values.yaml | | `serviceType` | Kubernetes Service type | `ClusterIP` | | `persistence.enabled` | Use a PVC to persist data | `false` | diff --git a/upstreamed/rabbitmq/templates/NOTES.txt b/upstreamed/rabbitmq/templates/NOTES.txt index 2bbe9f8f1..f7794c752 100644 --- a/upstreamed/rabbitmq/templates/NOTES.txt +++ b/upstreamed/rabbitmq/templates/NOTES.txt @@ -34,7 +34,7 @@ Obtain the LoadBalancer IP: NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "rabbitmq.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "rabbitmq.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "rabbitmq.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") To Access the RabbitMQ AMQP port: diff --git a/upstreamed/rabbitmq/templates/statefulset.yaml b/upstreamed/rabbitmq/templates/statefulset.yaml index 9b86c89e4..a4241353a 100644 --- a/upstreamed/rabbitmq/templates/statefulset.yaml +++ b/upstreamed/rabbitmq/templates/statefulset.yaml @@ -8,7 +8,7 @@ metadata: release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" spec: - serviceName: {{ template "rabbitmq.fullname" . }} + serviceName: {{ template "rabbitmq.fullname" . }}-headless replicas: {{ .Values.replicas }} selector: matchLabels: @@ -55,16 +55,17 @@ spec: - bash - -ec - | + mkdir -p /opt/bitnami/rabbitmq/.rabbitmq/ + mkdir -p /opt/bitnami/rabbitmq/etc/rabbitmq/ #persist the erlang cookie in both places for server and cli tools echo $RABBITMQ_ERL_COOKIE > /opt/bitnami/rabbitmq/var/lib/rabbitmq/.erlang.cookie cp /opt/bitnami/rabbitmq/var/lib/rabbitmq/.erlang.cookie /opt/bitnami/rabbitmq/.rabbitmq/ #change permission so only the user has access to the cookie file - chmod 600 /opt/bitnami/rabbitmq/.rabbitmq/.erlang.cookie - chmod 600 /opt/bitnami/rabbitmq/var/lib/rabbitmq/.erlang.cookie - + chmod 600 /opt/bitnami/rabbitmq/.rabbitmq/.erlang.cookie /opt/bitnami/rabbitmq/var/lib/rabbitmq/.erlang.cookie #copy the mounted configuration to both places cp /opt/bitnami/rabbitmq/conf/* /opt/bitnami/rabbitmq/etc/rabbitmq - + # Apply resources limits + ulimit -n "${RABBITMQ_ULIMIT_NOFILES}" #replace the default password that is generated sed -i "s/CHANGEME/$RABBITMQ_PASSWORD/g" /opt/bitnami/rabbitmq/etc/rabbitmq/rabbitmq.conf exec rabbitmq-server @@ -89,9 +90,7 @@ spec: {{- if .Values.livenessProbe.enabled }} livenessProbe: exec: - command: - - rabbitmqctl - - status + command: ["sh", "-c", "test \"$(curl -f --user {{ .Values.rabbitmq.username }}:$RABBITMQ_PASSWORD 127.0.0.1:{{ .Values.rabbitmq.managerPort }}/api/healthchecks/node)\" = '{\"status\":\"ok\"}'"] initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} periodSeconds: {{ .Values.livenessProbe.periodSeconds }} @@ -101,9 +100,7 @@ spec: {{- if .Values.readinessProbe.enabled }} readinessProbe: exec: - command: - - rabbitmqctl - - status + command: ["sh", "-c", "test \"$(curl -f --user {{ .Values.rabbitmq.username }}:$RABBITMQ_PASSWORD 127.0.0.1:{{ .Values.rabbitmq.managerPort }}/api/healthchecks/node)\" = '{\"status\":\"ok\"}'"] initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} periodSeconds: {{ .Values.readinessProbe.periodSeconds }} @@ -113,20 +110,39 @@ spec: env: {{- if .Values.image.debug}} - name: BASH_DEBUG - value: 1 + value: "1" - name: NAMI_DEBUG - value: 1 + value: "1" {{- end }} - name: MY_POD_IP valueFrom: fieldRef: fieldPath: status.podIP - - name: RABBITMQ_USE_LONGNAME - value: "true" + - name: MY_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: MY_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: K8S_SERVICE_NAME + value: "{{ template "rabbitmq.fullname" . }}-headless" + - name: K8S_ADDRESS_TYPE + value: {{ .Values.rabbitmq.clustering.address_type }} + {{- if (eq "hostname" .Values.rabbitmq.clustering.address_type) }} + - name: RABBITMQ_NODENAME + value: "rabbit@$(MY_POD_NAME).$(K8S_SERVICE_NAME).$(MY_POD_NAMESPACE).svc.{{ .Values.rabbitmq.clustering.k8s_domain }}" + - name: K8S_HOSTNAME_SUFFIX + value: ".$(K8S_SERVICE_NAME).$(MY_POD_NAMESPACE).svc.{{ .Values.rabbitmq.clustering.k8s_domain }}" + {{- else }} - name: RABBITMQ_NODENAME value: "rabbit@$(MY_POD_IP)" - - name: K8S_SERVICE_NAME - value: "{{ template "rabbitmq.fullname" . }}" + {{- end }} + - name: RABBITMQ_ULIMIT_NOFILES + value: {{ .Values.rabbitmq.ulimitNofiles | quote }} + - name: RABBITMQ_USE_LONGNAME + value: "true" - name: RABBITMQ_ERL_COOKIE valueFrom: secretKeyRef: diff --git a/upstreamed/rabbitmq/templates/svc-headless.yaml b/upstreamed/rabbitmq/templates/svc-headless.yaml new file mode 100644 index 000000000..888bd2583 --- /dev/null +++ b/upstreamed/rabbitmq/templates/svc-headless.yaml @@ -0,0 +1,30 @@ +apiVersion: v1 +kind: Service +metadata: + name: {{ template "rabbitmq.fullname" . }}-headless + labels: + app: {{ template "rabbitmq.name" . }} + chart: {{ template "rabbitmq.chart" . }} + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +spec: + clusterIP: None + ports: + - name: epmd + port: 4369 + targetPort: epmd + - name: amqp + port: {{ .Values.rabbitmq.amqpPort }} + targetPort: amqp + {{- if (and (eq .Values.serviceType "NodePort") (not (empty .Values.rabbitmq.nodePort))) }} + nodePort: {{ .Values.rabbitmq.nodePort }} + {{- end }} + - name: dist + port: {{ .Values.rabbitmq.distPort }} + targetPort: dist + - name: stats + port: {{ .Values.rabbitmq.managerPort }} + targetPort: stats + selector: + app: {{ template "rabbitmq.name" . }} + release: "{{ .Release.Name }}" diff --git a/upstreamed/rabbitmq/values-production.yaml b/upstreamed/rabbitmq/values-production.yaml index d8696046c..73bf1671c 100644 --- a/upstreamed/rabbitmq/values-production.yaml +++ b/upstreamed/rabbitmq/values-production.yaml @@ -30,12 +30,12 @@ rbacEnabled: true ## section of specific values for rabbitmq rabbitmq: ## RabbitMQ application username - ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq/blob/master/README.md#creating-a-database-user-on-first-run + ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq#environment-variables ## username: user ## RabbitMQ application password - ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq/blob/master/README.md#creating-a-database-user-on-first-run + ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq#environment-variables ## # password: @@ -65,16 +65,26 @@ rabbitmq: ## diskFreeLimit: '"6GiB"' + ## RabbitMQ Max File Descriptors + ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq#environment-variables + ## ref: https://www.rabbitmq.com/install-debian.html#kernel-resource-limits + ## + ulimitNofiles: '65536' + ## Plugins to enable plugins: |- [rabbitmq_management,rabbitmq_peer_discovery_k8s]. + ## Clustering settings + clustering: + address_type: ip + k8s_domain: cluster.local + ## Configution file content configuration: |- ## Clustering cluster_formation.peer_discovery_backend = rabbit_peer_discovery_k8s cluster_formation.k8s.host = kubernetes.default.svc.cluster.local - cluster_formation.k8s.address_type = ip cluster_formation.node_cleanup.interval = 10 cluster_formation.node_cleanup.only_log_warning = false cluster_partition_handling = autoheal diff --git a/upstreamed/rabbitmq/values.yaml b/upstreamed/rabbitmq/values.yaml index 9eaf1165f..874b643b8 100644 --- a/upstreamed/rabbitmq/values.yaml +++ b/upstreamed/rabbitmq/values.yaml @@ -28,13 +28,13 @@ rbacEnabled: true ## section of specific values for rabbitmq rabbitmq: - ## RabbitMQ application username - ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq/blob/master/README.md#creating-a-database-user-on-first-run + ## RabbitMQ application username + ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq#environment-variables ## username: user ## RabbitMQ application password - ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq/blob/master/README.md#creating-a-database-user-on-first-run + ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq#environment-variables ## # password: @@ -74,16 +74,26 @@ rabbitmq: ## diskFreeLimit: '"6GiB"' + ## RabbitMQ Max File Descriptors + ## ref: https://github.com/bitnami/bitnami-docker-rabbitmq#environment-variables + ## ref: https://www.rabbitmq.com/install-debian.html#kernel-resource-limits + ## + ulimitNofiles: '65536' + ## Plugins to enable plugins: |- [rabbitmq_management, rabbitmq_peer_discovery_k8s]. + ## Clustering settings + clustering: + address_type: ip + k8s_domain: cluster.local + ## Configution file content configuration: |- ## Clustering cluster_formation.peer_discovery_backend = rabbit_peer_discovery_k8s cluster_formation.k8s.host = kubernetes.default.svc.cluster.local - cluster_formation.k8s.address_type = ip cluster_formation.node_cleanup.interval = 10 cluster_formation.node_cleanup.only_log_warning = true cluster_partition_handling = autoheal diff --git a/upstreamed/redis/Chart.yaml b/upstreamed/redis/Chart.yaml index a3f99446c..c25a68f8b 100644 --- a/upstreamed/redis/Chart.yaml +++ b/upstreamed/redis/Chart.yaml @@ -1,5 +1,5 @@ name: redis -version: 4.0.1 +version: 4.1.2 appVersion: 4.0.11 description: Open source, advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets. keywords: @@ -11,6 +11,6 @@ icon: https://bitnami.com/assets/stacks/redis/img/redis-stack-220x234.png sources: - https://github.com/bitnami/bitnami-docker-redis maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl diff --git a/upstreamed/redis/README.md b/upstreamed/redis/README.md index 5a4befad9..6470fbfb3 100644 --- a/upstreamed/redis/README.md +++ b/upstreamed/redis/README.md @@ -18,6 +18,8 @@ $ helm install stable/redis --values values-production.yaml This chart bootstraps a [Redis](https://github.com/bitnami/bitnami-docker-redis) deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.8+ @@ -146,6 +148,10 @@ The following table lists the configurable parameters of the Redis chart and the | `master.readinessProbe.timeoutSeconds` | When the probe times out (redis master pod) | `1` | | `master.readinessProbe.successThreshold` | Minimum consecutive successes for the probe to be considered successful after having failed (redis master pod) | `1` | | `master.readinessProbe.failureThreshold` | Minimum consecutive failures for the probe to be considered failed after having succeeded. | `5` | +| `volumePermissions.image.registry` | Init container volume-permissions image registry | `docker.io` | +| `volumePermissions.image.repository` | Init container volume-permissions image name | `alpine` | +| `volumePermissions.image.tag` | Init container volume-permissions image tag | `3.8` | +| `volumePermissions.image.pullPolicy` | Init container volume-permissions image pull policy | `IfNotPresent` | | `slave.serviceType` | Kubernetes Service type (redis slave) | `LoadBalancer` | | `slave.service.nodePort` | Kubernetes Service nodePort (redis slave) | `nil` | | `slave.service.annotations` | annotations for redis slave service | {} | diff --git a/upstreamed/redis/templates/NOTES.txt b/upstreamed/redis/templates/NOTES.txt index 972035f27..d2b414419 100644 --- a/upstreamed/redis/templates/NOTES.txt +++ b/upstreamed/redis/templates/NOTES.txt @@ -76,7 +76,7 @@ To connect to your database from outside the cluster execute the following comma NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "redis.fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "redis.fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "redis.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") redis-cli -h $SERVICE_IP -p {{ .Values.master.service.nodePort }} {{- if .Values.usePassword }} -a $REDIS_PASSWORD{{ end }} {{- else if contains "ClusterIP" .Values.master.service.type }} diff --git a/upstreamed/redis/templates/_helpers.tpl b/upstreamed/redis/templates/_helpers.tpl index 8eb047a89..9efb959e1 100644 --- a/upstreamed/redis/templates/_helpers.tpl +++ b/upstreamed/redis/templates/_helpers.tpl @@ -62,6 +62,16 @@ Return the proper image name (for the metrics image) {{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} {{- end -}} +{{/* +Return the proper image name (for the init container volume-permissions image) +*/}} +{{- define "volumePermissions.image" -}} +{{- $registryName := .Values.volumePermissions.image.registry -}} +{{- $repositoryName := .Values.volumePermissions.image.repository -}} +{{- $tag := .Values.volumePermissions.image.tag | toString -}} +{{- printf "%s/%s:%s" $registryName $repositoryName $tag -}} +{{- end -}} + {{/* Return slave readiness probe */}} diff --git a/upstreamed/redis/templates/redis-master-statefulset.yaml b/upstreamed/redis/templates/redis-master-statefulset.yaml index 7a77518fb..eb4526b06 100644 --- a/upstreamed/redis/templates/redis-master-statefulset.yaml +++ b/upstreamed/redis/templates/redis-master-statefulset.yaml @@ -134,6 +134,19 @@ spec: mountPath: /opt/bitnami/redis/etc/redis.conf subPath: redis.conf {{- end }} + {{- if and ( and .Values.master.persistence.enabled (not .Values.persistence.existingClaim) ) .Values.master.securityContext.enabled }} + initContainers: + - name: volume-permissions + image: "{{ template "volumePermissions.image" . }}" + imagePullPolicy: {{ default "" .Values.volumePermissions.image.pullPolicy | quote }} + command: ["/bin/chown", "-R", "{{ .Values.master.securityContext.runAsUser }}:{{ .Values.master.securityContext.fsGroup }}", "{{ .Values.master.persistence.path }}"] + securityContext: + runAsUser: 0 + volumeMounts: + - name: redis-data + mountPath: {{ .Values.master.persistence.path }} + subPath: {{ .Values.master.persistence.subPath }} + {{- end }} volumes: - name: health configMap: diff --git a/upstreamed/redis/values-production.yaml b/upstreamed/redis/values-production.yaml index e71e28a93..abda34409 100644 --- a/upstreamed/redis/values-production.yaml +++ b/upstreamed/redis/values-production.yaml @@ -317,6 +317,18 @@ metrics: # podAnnotations: {} # podLabels: {} +## +## Init containers parameters: +## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup +## + +volumePermissions: + image: + registry: docker.io + repository: busybox + tag: latest + pullPolicy: IfNotPresent + ## Redis config file ## configmap: |- diff --git a/upstreamed/redis/values.yaml b/upstreamed/redis/values.yaml index 287929220..e2958451c 100644 --- a/upstreamed/redis/values.yaml +++ b/upstreamed/redis/values.yaml @@ -332,6 +332,18 @@ metrics: # podAnnotations: {} # podLabels: {} +## +## Init containers parameters: +## volumePermissions: Change the owner of the persist volume mountpoint to RunAsUser:fsGroup +## + +volumePermissions: + image: + registry: docker.io + repository: busybox + tag: latest + pullPolicy: IfNotPresent + ## Redis config file ## configmap: |- diff --git a/upstreamed/redmine/Chart.yaml b/upstreamed/redmine/Chart.yaml index 41edf725f..5cfd55579 100644 --- a/upstreamed/redmine/Chart.yaml +++ b/upstreamed/redmine/Chart.yaml @@ -1,5 +1,5 @@ name: redmine -version: 5.0.0 +version: 5.0.2 appVersion: 3.4.6 description: A flexible project management web application. keywords: diff --git a/upstreamed/redmine/README.md b/upstreamed/redmine/README.md index 6e8e073dc..9d75fb8e9 100644 --- a/upstreamed/redmine/README.md +++ b/upstreamed/redmine/README.md @@ -14,6 +14,8 @@ This chart bootstraps a [Redmine](https://github.com/bitnami/bitnami-docker-redm It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) and the [PostgreSQL chart](https://github.com/kubernetes/charts/tree/master/stable/postgresql) which are required for bootstrapping a MariaDB/PostgreSQL deployment for the database requirements of the Redmine application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/redmine/requirements.lock b/upstreamed/redmine/requirements.lock index d0ea7e6c3..143e9783b 100644 --- a/upstreamed/redmine/requirements.lock +++ b/upstreamed/redmine/requirements.lock @@ -1,9 +1,9 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.2.6 + version: 5.0.4 - name: postgresql repository: https://kubernetes-charts.storage.googleapis.com/ - version: 0.15.0 -digest: sha256:1c706ac1e882e4fab0b66929b1add73ab122fe810f3820eca5a49f9ce79b4909 -generated: 2018-07-09T13:59:59.347961443Z + version: 0.18.1 +digest: sha256:bd7da903db69d89a8de155f6259a2ef20de455280360674b2955bb6515c13eee +generated: 2018-09-25T11:26:31.244834331+02:00 diff --git a/upstreamed/redmine/requirements.yaml b/upstreamed/redmine/requirements.yaml index 54c426958..df2235b73 100644 --- a/upstreamed/redmine/requirements.yaml +++ b/upstreamed/redmine/requirements.yaml @@ -1,6 +1,6 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: databaseType.mariadb - name: postgresql diff --git a/upstreamed/suitecrm/Chart.yaml b/upstreamed/suitecrm/Chart.yaml index 9fcafe3e1..f3c9e131b 100644 --- a/upstreamed/suitecrm/Chart.yaml +++ b/upstreamed/suitecrm/Chart.yaml @@ -1,5 +1,5 @@ name: suitecrm -version: 3.1.0 +version: 3.1.2 appVersion: 7.10.9 description: SuiteCRM is a completely open source enterprise-grade Customer Relationship Management (CRM) application. SuiteCRM is a software fork of the popular customer relationship management (CRM) system SugarCRM. keywords: diff --git a/upstreamed/suitecrm/README.md b/upstreamed/suitecrm/README.md index e5e0d9862..7123777c2 100644 --- a/upstreamed/suitecrm/README.md +++ b/upstreamed/suitecrm/README.md @@ -14,6 +14,8 @@ This chart bootstraps a [SuiteCRM](https://github.com/bitnami/bitnami-docker-sui It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the SuiteCRM application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.5+ with Beta APIs enabled diff --git a/upstreamed/suitecrm/requirements.lock b/upstreamed/suitecrm/requirements.lock index ba110df97..d79e27764 100644 --- a/upstreamed/suitecrm/requirements.lock +++ b/upstreamed/suitecrm/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.4.2 -digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 -generated: 2018-09-13T16:51:30.170011575Z + version: 5.0.4 +digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c +generated: 2018-09-25T11:57:28.148036179+02:00 diff --git a/upstreamed/suitecrm/requirements.yaml b/upstreamed/suitecrm/requirements.yaml index 4ea7e0e5c..a828b3769 100644 --- a/upstreamed/suitecrm/requirements.yaml +++ b/upstreamed/suitecrm/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/testlink/Chart.yaml b/upstreamed/testlink/Chart.yaml index 66d673f9f..65dda538b 100644 --- a/upstreamed/testlink/Chart.yaml +++ b/upstreamed/testlink/Chart.yaml @@ -1,5 +1,5 @@ name: testlink -version: 3.0.0 +version: 3.0.3 appVersion: 1.9.17 description: Web-based test management system that facilitates software quality assurance. icon: https://bitnami.com/assets/stacks/testlink/img/testlink-stack-220x234.png @@ -12,6 +12,6 @@ home: http://www.testlink.org/ sources: - https://github.com/bitnami/bitnami-docker-testlink maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl diff --git a/upstreamed/testlink/README.md b/upstreamed/testlink/README.md index d299cced1..e2de7bb08 100644 --- a/upstreamed/testlink/README.md +++ b/upstreamed/testlink/README.md @@ -14,6 +14,8 @@ This chart bootstraps a [TestLink](https://github.com/bitnami/bitnami-docker-tes It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the TestLink application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/testlink/requirements.lock b/upstreamed/testlink/requirements.lock index c87c67531..3ef50c173 100644 --- a/upstreamed/testlink/requirements.lock +++ b/upstreamed/testlink/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.2.6 -digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 -generated: 2018-07-09T11:21:24.729436017Z + version: 5.0.4 +digest: sha256:0593b73b2163fbbbae061de1aa2b8280d43f8a423a91e1c7375c0b6c86784b1c +generated: 2018-09-25T11:58:55.304406377+02:00 diff --git a/upstreamed/testlink/requirements.yaml b/upstreamed/testlink/requirements.yaml index 4ea7e0e5c..a828b3769 100644 --- a/upstreamed/testlink/requirements.yaml +++ b/upstreamed/testlink/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/testlink/templates/NOTES.txt b/upstreamed/testlink/templates/NOTES.txt index 36df19a19..a13e2981b 100644 --- a/upstreamed/testlink/templates/NOTES.txt +++ b/upstreamed/testlink/templates/NOTES.txt @@ -12,7 +12,7 @@ NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "TestLink URL: http://$SERVICE_IP/" {{- else if contains "ClusterIP" .Values.serviceType }} diff --git a/upstreamed/wordpress/Chart.yaml b/upstreamed/wordpress/Chart.yaml index 417d7b507..c9bfa16e3 100644 --- a/upstreamed/wordpress/Chart.yaml +++ b/upstreamed/wordpress/Chart.yaml @@ -1,5 +1,5 @@ name: wordpress -version: 3.0.0 +version: 3.0.3 appVersion: 4.9.8 description: Web publishing platform for building blogs and websites. icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png @@ -15,6 +15,6 @@ home: http://www.wordpress.com/ sources: - https://github.com/bitnami/bitnami-docker-wordpress maintainers: -- name: bitnami-bot +- name: Bitnami email: containers@bitnami.com engine: gotpl diff --git a/upstreamed/wordpress/README.md b/upstreamed/wordpress/README.md index f3dd31301..01cb1e5c3 100644 --- a/upstreamed/wordpress/README.md +++ b/upstreamed/wordpress/README.md @@ -14,6 +14,8 @@ This chart bootstraps a [WordPress](https://github.com/bitnami/bitnami-docker-wo It also packages the [Bitnami MariaDB chart](https://github.com/kubernetes/charts/tree/master/stable/mariadb) which is required for bootstrapping a MariaDB deployment for the database requirements of the WordPress application. +Bitnami charts can be used with [Kubeapps](https://kubeapps.com/) for deployment and management of Helm Charts in clusters. + ## Prerequisites - Kubernetes 1.4+ with Beta APIs enabled diff --git a/upstreamed/wordpress/requirements.lock b/upstreamed/wordpress/requirements.lock index cb3439862..28c3b284d 100644 --- a/upstreamed/wordpress/requirements.lock +++ b/upstreamed/wordpress/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 4.3.1 -digest: sha256:82a0e5374376169d2ecf7d452c18a2ed93507f5d17c3393a1457f9ffad7e9b26 -generated: 2018-08-02T22:07:51.905271776Z + version: 5.0.4 +digest: sha256:5c711356a05ffeaffafba333092229eadc8ba3cc377b56861988517ac77b7609 +generated: 2018-09-25T12:00:13.171071112+02:00 diff --git a/upstreamed/wordpress/requirements.yaml b/upstreamed/wordpress/requirements.yaml index a894b8b3b..c8c0b665a 100644 --- a/upstreamed/wordpress/requirements.yaml +++ b/upstreamed/wordpress/requirements.yaml @@ -1,6 +1,6 @@ dependencies: - name: mariadb - version: 4.x.x + version: 5.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled tags: diff --git a/upstreamed/wordpress/templates/NOTES.txt b/upstreamed/wordpress/templates/NOTES.txt index 55626e4d1..9f520118b 100644 --- a/upstreamed/wordpress/templates/NOTES.txt +++ b/upstreamed/wordpress/templates/NOTES.txt @@ -13,7 +13,7 @@ NOTE: It may take a few minutes for the LoadBalancer IP to be available. Watch the status with: 'kubectl get svc --namespace {{ .Release.Namespace }} -w {{ template "fullname" . }}' - export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') + export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}") echo "WordPress URL: http://$SERVICE_IP/" echo "WordPress Admin URL: http://$SERVICE_IP/admin"