Merge branch 'master' into nginx-bash

2026-03-07 08:07:55 +08:00 · 2018-08-01 16:50:42 +02:00
parent cc6553121c 3f235358f4
commit d0dda75888
88 changed files with 143 additions and 52 deletions
--- a/bitnami/elasticsearch/Chart.yaml
+++ b/bitnami/elasticsearch/Chart.yaml
@@ -1,5 +1,5 @@
 name: elasticsearch
-version: 1.0.7
+version: 1.0.8
 appVersion: 6.3.2
 description: A highly scalable open-source full-text search and analytics engine
 keywords:
--- a/bitnami/elasticsearch/templates/data-statefulset.yaml
+++ b/bitnami/elasticsearch/templates/data-statefulset.yaml
@@ -13,6 +13,7 @@ spec:
    matchLabels:
      app: {{ template "elasticsearch.name" . }}
      release: {{ .Release.Name | quote }}
+      chart: {{ template "elasticsearch.chart" . }}
      role: "data"
  serviceName: "{{ template "data.fullname" . }}"
  replicas: {{ .Values.data.replicas }}
@@ -20,6 +21,7 @@ spec:
    metadata:
      labels:
        app: {{ template "elasticsearch.name" . }}
+        chart: {{ template "elasticsearch.chart" . }}
        release: {{ .Release.Name | quote }}
        role: "data"
    spec:
--- a/bitnami/elasticsearch/templates/master-deploy.yaml
+++ b/bitnami/elasticsearch/templates/master-deploy.yaml
@@ -14,6 +14,7 @@ spec:
    metadata:
      labels:
        app: {{ template "elasticsearch.name" . }}
+        chart: {{ template "elasticsearch.chart" . }}
        release: {{ .Release.Name | quote }}
        role: "master"
    spec:
--- a/bitnami/elasticsearch/templates/metrics-deploy.yaml
+++ b/bitnami/elasticsearch/templates/metrics-deploy.yaml
@@ -16,6 +16,7 @@ spec:
      labels:
        app: {{ template "elasticsearch.name" . }}
        release: {{ .Release.Name | quote }}
+        chart: {{ template "elasticsearch.chart" . }}
        role: "metrics"
    spec:
      {{- if .Values.image.pullSecrets }}
--- a/bitnami/jenkins/Chart.yaml
+++ b/bitnami/jenkins/Chart.yaml
@@ -1,5 +1,5 @@
 name: jenkins
-version: 0.4.72
+version: 0.4.73
 appVersion: 2.121.2
 description: The leading open source automation server
 keywords:
--- a/bitnami/jenkins/templates/deployment.yaml
+++ b/bitnami/jenkins/templates/deployment.yaml
@@ -12,6 +12,8 @@ spec:
    metadata:
      labels:
        app: {{ template "fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/bitnami/mean/Chart.yaml
+++ b/bitnami/mean/Chart.yaml
@@ -1,5 +1,5 @@
 name: mean
-version: 2.0.0
+version: 2.0.1
 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:
--- a/bitnami/mean/templates/deployment.yaml
+++ b/bitnami/mean/templates/deployment.yaml
@@ -14,6 +14,7 @@ spec:
      labels:
        app: {{ template "mean.name" . }}
        release: {{ .Release.Name | quote }}
+        chart: {{ template "mean.chart" . }}
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/bitnami/memcached/Chart.yaml
+++ b/bitnami/memcached/Chart.yaml
@@ -1,6 +1,6 @@
 name: memcached
-version: 0.4.32
-appVersion: 1.5.9-debian-9
+version: 0.4.34
+appVersion: 1.5.9
 description: Chart for Memcached
 keywords:
 - memcached
--- a/bitnami/memcached/templates/deployment.yaml
+++ b/bitnami/memcached/templates/deployment.yaml
@@ -12,6 +12,8 @@ spec:
    metadata:
      labels:
        app: {{ template "fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/bitnami/metrics-server/Chart.yaml
+++ b/bitnami/metrics-server/Chart.yaml
@@ -1,5 +1,5 @@
 name: metrics-server
-version: 0.0.2
+version: 0.0.3
 appVersion: 0.2.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:
--- a/bitnami/metrics-server/templates/metrics-server-deployment.yaml
+++ b/bitnami/metrics-server/templates/metrics-server-deployment.yaml
@@ -12,11 +12,13 @@ spec:
    matchLabels:
      app: {{ template "metrics-server.name" . }}
      release: {{ .Release.Name | quote }}
+      chart: {{ template "metrics-server.chart" . }}
  template:
    metadata:
      labels:
        app: {{ template "metrics-server.name" . }}
        release: {{ .Release.Name | quote }}
+        chart: {{ template "metrics-server.chart" . }}
    spec:
      serviceAccountName: {{ template "metrics-server.serviceAccountName" . }}
      containers:
--- a/bitnami/postgresql/Chart.yaml
+++ b/bitnami/postgresql/Chart.yaml
@@ -1,5 +1,5 @@
 name: postgresql
-version: 2.1.0
+version: 2.1.1
 appVersion: 10.4.0
 description: Chart for PostgreSQL
 keywords:
--- a/bitnami/postgresql/templates/metrics-deployment.yaml
+++ b/bitnami/postgresql/templates/metrics-deployment.yaml
@@ -14,6 +14,7 @@ spec:
      labels:
        release: "{{ .Release.Name }}"
        app: {{ template "postgresql.name" . }}
+        chart: {{ template "postgresql.chart" . }}
        role: metrics
      {{- if .Values.metrics.podLabels }}
 {{ toYaml .Values.metrics.podLabels | indent 8 }}
@@ -71,4 +72,4 @@ spec:
          containerPort: 9187
        resources:
 {{ toYaml .Values.metrics.resources | indent 10 }}
-{{- end }}
+{{- end }}
--- a/bitnami/tensorflow-inception/Chart.yaml
+++ b/bitnami/tensorflow-inception/Chart.yaml
@@ -1,5 +1,5 @@
 name: tensorflow-inception
-version: 0.0.11
+version: 0.0.12
 appVersion: 1.9.0
 description: Open-source software library for serving machine learning models
 keywords:
--- a/bitnami/tensorflow-inception/templates/deployment.yaml
+++ b/bitnami/tensorflow-inception/templates/deployment.yaml
@@ -13,6 +13,8 @@ spec:
    metadata:
      labels:
        app: tensorflow-serving
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.server.image.pullSecrets }}
      imagePullSecrets:
--- a/bitnami/tomcat/Chart.yaml
+++ b/bitnami/tomcat/Chart.yaml
@@ -1,6 +1,6 @@
 name: tomcat
-version: 0.4.28
-appVersion: 8.5.32-debian-9
+version: 0.4.30
+appVersion: 8.5.32
 description: Chart for Apache Tomcat
 keywords:
 - tomcat
--- a/bitnami/tomcat/templates/deployment.yaml
+++ b/bitnami/tomcat/templates/deployment.yaml
@@ -12,6 +12,8 @@ spec:
    metadata:
      labels:
        app: {{ template "fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/bitnami/wildfly/Chart.yaml
+++ b/bitnami/wildfly/Chart.yaml
@@ -1,6 +1,6 @@
 name: wildfly
-version: 0.4.15
-appVersion: 13.0.0-debian-9
+version: 0.4.17
+appVersion: 13.0.0
 description: Chart for Wildfly
 keywords:
 - wildfly
--- a/bitnami/wildfly/templates/deployment.yaml
+++ b/bitnami/wildfly/templates/deployment.yaml
@@ -12,6 +12,8 @@ spec:
    metadata:
      labels:
        app: {{ template "fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/bitnami/zookeeper/Chart.yaml
+++ b/bitnami/zookeeper/Chart.yaml
@@ -1,6 +1,6 @@
 name: zookeeper
-version: 0.0.3
-appVersion: 3.4.12-debian-9
+version: 0.0.4
+appVersion: 3.4.12
 description: A centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services for distributed applications.
 keywords:
 - zookeeper
--- a/upstreamed/dokuwiki/Chart.yaml
+++ b/upstreamed/dokuwiki/Chart.yaml
@@ -1,5 +1,5 @@
 name: dokuwiki
-version: 2.0.3
+version: 2.0.4
 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.
--- a/upstreamed/dokuwiki/templates/deployment.yaml
+++ b/upstreamed/dokuwiki/templates/deployment.yaml
@@ -12,6 +12,8 @@ spec:
    metadata:
      labels:
        app: {{ template "dokuwiki.name" . }}
+        chart: {{ template "dokuwiki.chart" . }}
+        release: {{ .Release.Name | quote }}
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/drupal/Chart.yaml
+++ b/upstreamed/drupal/Chart.yaml
@@ -1,5 +1,5 @@
 name: drupal
-version: 1.1.0
+version: 1.1.1
 appVersion: 8.5.5
 description: One of the most versatile open source content management systems.
 keywords:
--- a/upstreamed/drupal/templates/deployment.yaml
+++ b/upstreamed/drupal/templates/deployment.yaml
@@ -13,6 +13,8 @@ spec:
    metadata:
      labels:
        app: {{ template "drupal.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/ghost/Chart.yaml
+++ b/upstreamed/ghost/Chart.yaml
@@ -1,5 +1,5 @@
 name: ghost
-version: 4.0.9
+version: 4.0.10
 appVersion: 1.25.2
 description: A simple, powerful publishing platform that allows you to share your
  stories with the world
--- a/upstreamed/ghost/templates/deployment.yaml
+++ b/upstreamed/ghost/templates/deployment.yaml
@@ -14,6 +14,8 @@ spec:
    metadata:
      labels:
        app: {{ template "ghost.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/jasperreports/Chart.yaml
+++ b/upstreamed/jasperreports/Chart.yaml
@@ -1,5 +1,5 @@
 name: jasperreports
-version: 2.0.2
+version: 2.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,
--- a/upstreamed/jasperreports/templates/deployment.yaml
+++ b/upstreamed/jasperreports/templates/deployment.yaml
@@ -12,6 +12,8 @@ spec:
    metadata:
      labels:
        app: {{ template "jasperreports.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/joomla/Chart.yaml
+++ b/upstreamed/joomla/Chart.yaml
@@ -1,5 +1,5 @@
 name: joomla
-version: 2.0.4
+version: 2.0.5
 appVersion: 3.8.10
 description: PHP content management system (CMS) for publishing web content
 keywords:
--- a/upstreamed/joomla/templates/deployment.yaml
+++ b/upstreamed/joomla/templates/deployment.yaml
@@ -14,6 +14,8 @@ spec:
    metadata:
      labels:
        app: {{ template "joomla.fullname" . }}
+        chart: {{ template "joomla.chart" . }}
+        release: {{ .Release.Name | quote }}
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/magento/Chart.yaml
+++ b/upstreamed/magento/Chart.yaml
@@ -1,5 +1,5 @@
 name: magento
-version: 2.0.1
+version: 2.0.2
 appVersion: 2.2.4
 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:
--- a/upstreamed/magento/templates/deployment.yaml
+++ b/upstreamed/magento/templates/deployment.yaml
@@ -13,6 +13,8 @@ spec:
    metadata:
      labels:
        app: {{ template "magento.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/mariadb/Chart.yaml
+++ b/upstreamed/mariadb/Chart.yaml
@@ -1,5 +1,5 @@
 name: mariadb
-version: 4.3.0
+version: 4.3.1
 appVersion: 10.1.34
 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:
--- a/upstreamed/mariadb/templates/master-statefulset.yaml
+++ b/upstreamed/mariadb/templates/master-statefulset.yaml
@@ -19,6 +19,7 @@ spec:
        app: "{{ template "mariadb.name" . }}"
        component: "master"
        release: "{{ .Release.Name }}"
+        chart: {{ template "mariadb.chart" . }}
    spec:
      securityContext:
        runAsUser: 1001
--- a/upstreamed/mariadb/templates/slave-statefulset.yaml
+++ b/upstreamed/mariadb/templates/slave-statefulset.yaml
@@ -20,6 +20,7 @@ spec:
        app: "{{ template "mariadb.name" . }}"
        component: "slave"
        release: "{{ .Release.Name }}"
+        chart: {{ template "mariadb.chart" . }}
    spec:
      securityContext:
        runAsUser: 1001
--- a/upstreamed/mediawiki/Chart.yaml
+++ b/upstreamed/mediawiki/Chart.yaml
@@ -1,5 +1,5 @@
 name: mediawiki
-version: 3.0.3
+version: 3.0.4
 appVersion: 1.31.0
 description: Extremely powerful, scalable software and a feature-rich wiki implementation
  that uses PHP to process and display data stored in a database.
--- a/upstreamed/mediawiki/templates/deployment.yaml
+++ b/upstreamed/mediawiki/templates/deployment.yaml
@@ -14,6 +14,8 @@ spec:
    metadata:
      labels:
        app: {{ template "mediawiki.name" . }}
+        chart: {{ template "mediawiki.chart" . }}
+        release: {{ .Release.Name | quote }}
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/mongodb/Chart.yaml
+++ b/upstreamed/mongodb/Chart.yaml
@@ -1,5 +1,5 @@
 name: mongodb
-version: 4.0.1
+version: 4.0.4
 appVersion: 3.6.6
 description: NoSQL document-oriented database that stores JSON-like documents with dynamic schemas, simplifying the integration of data in content-driven applications.
 keywords:
--- a/upstreamed/mongodb/templates/deployment-standalone.yaml
+++ b/upstreamed/mongodb/templates/deployment-standalone.yaml
@@ -5,7 +5,7 @@ metadata:
  name: {{ template "mongodb.fullname" . }}
  labels:
    app: {{ template "mongodb.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "mongodb.chart" . }}
    release: "{{ .Release.Name }}"
    heritage: "{{ .Release.Service }}"
 spec:
@@ -14,6 +14,7 @@ spec:
      labels:
        app: {{ template "mongodb.name" . }}
        release: "{{ .Release.Name }}"
+        chart: {{ template "mongodb.chart" . }}
    spec:
      {{- if .Values.securityContext.enabled }}
      securityContext:
--- a/upstreamed/mongodb/templates/secrets.yaml
+++ b/upstreamed/mongodb/templates/secrets.yaml
@@ -5,7 +5,7 @@ metadata:
  name: {{ template "mongodb.fullname" . }}
  labels:
    app: {{ template "mongodb.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "mongodb.chart" . }}
    release: "{{ .Release.Name }}"
    heritage: "{{ .Release.Service }}"
 type: Opaque
--- a/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml
+++ b/upstreamed/mongodb/templates/statefulset-arbiter-rs.yaml
@@ -13,6 +13,7 @@ spec:
    matchLabels:
      app: {{ template "mongodb.name" . }}
      release: {{ .Release.Name }}
+      chart: {{ template "mongodb.chart" . }}
      component: arbiter
  serviceName: {{ template "mongodb.fullname" . }}-headless
  replicas: {{ .Values.replicaSet.replicas.arbiter }}
@@ -20,6 +21,7 @@ spec:
    metadata:
      labels:
        app: {{ template "mongodb.name" . }}
+        chart: {{ template "mongodb.chart" . }}
        release: {{ .Release.Name }}
        component: arbiter
    spec:
@@ -28,6 +30,10 @@ spec:
        fsGroup: {{ .Values.securityContext.fsGroup }}
        runAsUser: {{ .Values.securityContext.runAsUser }}
      {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
      {{- range .Values.image.pullSecrets }}
--- a/upstreamed/mongodb/templates/statefulset-primary-rs.yaml
+++ b/upstreamed/mongodb/templates/statefulset-primary-rs.yaml
@@ -14,12 +14,14 @@ spec:
  selector:
    matchLabels:
      app: {{ template "mongodb.name" . }}
+      chart: {{ template "mongodb.chart" . }}
      release: {{ .Release.Name }}
      component: primary
  template:
    metadata:
      labels:
        app: {{ template "mongodb.name" . }}
+        chart: {{ template "mongodb.chart" . }}
        release: {{ .Release.Name }}
        component: primary
    spec:
@@ -28,6 +30,10 @@ spec:
        fsGroup: {{ .Values.securityContext.fsGroup }}
        runAsUser: {{ .Values.securityContext.runAsUser }}
      {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
      {{- range .Values.image.pullSecrets }}
--- a/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml
+++ b/upstreamed/mongodb/templates/statefulset-secondary-rs.yaml
@@ -13,6 +13,7 @@ spec:
    matchLabels:
      app: {{ template "mongodb.name" . }}
      release: {{ .Release.Name }}
+      chart: {{ template "mongodb.chart" . }}
      component: secondary
  podManagementPolicy: "Parallel"
  serviceName: {{ template "mongodb.fullname" . }}-headless
@@ -21,6 +22,7 @@ spec:
    metadata:
      labels:
        app: {{ template "mongodb.name" . }}
+        chart: {{ template "mongodb.chart" . }}
        release: {{ .Release.Name }}
        component: secondary
    spec:
@@ -29,6 +31,10 @@ spec:
        fsGroup: {{ .Values.securityContext.fsGroup }}
        runAsUser: {{ .Values.securityContext.runAsUser }}
      {{- end }}
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end }}
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
      {{- range .Values.image.pullSecrets }}
--- a/upstreamed/mongodb/templates/svc-primary-rs.yaml
+++ b/upstreamed/mongodb/templates/svc-primary-rs.yaml
@@ -5,7 +5,7 @@ metadata:
  name: {{ template "mongodb.fullname" . }}
  labels:
    app: {{ template "mongodb.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "mongodb.chart" . }}
    release: "{{ .Release.Name }}"
    heritage: "{{ .Release.Service }}"
 spec:
@@ -21,4 +21,4 @@ spec:
    app: {{ template "mongodb.name" . }}
    release: "{{ .Release.Name }}"
    component: primary
-{{- end }}
+{{- end }}
--- a/upstreamed/mongodb/templates/svc-standalone.yaml
+++ b/upstreamed/mongodb/templates/svc-standalone.yaml
@@ -5,7 +5,7 @@ metadata:
  name: {{ template "mongodb.fullname" . }}
  labels:
    app: {{ template "mongodb.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+    chart: {{ template "mongodb.chart" . }}
    release: "{{ .Release.Name }}"
    heritage: "{{ .Release.Service }}"
 spec:
@@ -20,4 +20,4 @@ spec:
  selector:
    app: {{ template "mongodb.name" . }}
    release: "{{ .Release.Name }}"
-{{- end }}
+{{- end }}
--- a/upstreamed/moodle/Chart.yaml
+++ b/upstreamed/moodle/Chart.yaml
@@ -1,5 +1,5 @@
 name: moodle
-version: 2.0.2
+version: 2.0.3
 appVersion: 3.5.1
 description: Moodle is a learning platform designed to provide educators, administrators
  and learners with a single robust, secure and integrated system to create personalised
--- a/upstreamed/moodle/templates/deployment.yaml
+++ b/upstreamed/moodle/templates/deployment.yaml
@@ -12,6 +12,8 @@ spec:
    metadata:
      labels:
        app: {{ template "moodle.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.affinity }}
      affinity:
--- a/upstreamed/nats/Chart.yaml
+++ b/upstreamed/nats/Chart.yaml
@@ -1,5 +1,5 @@
 name: nats
-version: 0.0.3
+version: 0.0.4
 appVersion: 1.1.0
 description: An open-source, cloud-native messaging system
 keywords:
--- a/upstreamed/nats/templates/statefulset.yaml
+++ b/upstreamed/nats/templates/statefulset.yaml
@@ -18,11 +18,13 @@ spec:
  selector:
    matchLabels:
      app: "{{ template "nats.name" . }}"
+      chart: "{{ template "nats.chart" . }}"
      release: {{ .Release.Name | quote }}
  template:
    metadata:
      labels:
        app: "{{ template "nats.name" . }}"
+        chart: "{{ template "nats.chart" . }}"
        release: {{ .Release.Name | quote }}
        {{- if .Values.podLabels }}
 {{ toYaml .Values.podLabels | indent 8 }}
--- a/upstreamed/odoo/Chart.yaml
+++ b/upstreamed/odoo/Chart.yaml
@@ -1,5 +1,5 @@
 name: odoo
-version: 2.0.3
+version: 2.0.4
 appVersion: 11.0.20180715
 description: A suite of web based open source business apps.
 home: https://www.odoo.com/
--- a/upstreamed/odoo/templates/deployment.yaml
+++ b/upstreamed/odoo/templates/deployment.yaml
@@ -12,6 +12,8 @@ spec:
    metadata:
      labels:
        app: {{ template "odoo.name" . }}
+        chart: {{ template "odoo.chart" . }}
+        release: {{ .Release.Name | quote }}
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/opencart/Chart.yaml
+++ b/upstreamed/opencart/Chart.yaml
@@ -1,5 +1,5 @@
 name: opencart
-version: 2.0.2
+version: 2.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.
--- a/upstreamed/opencart/templates/deployment.yaml
+++ b/upstreamed/opencart/templates/deployment.yaml
@@ -13,6 +13,8 @@ spec:
    metadata:
      labels:
        app: {{ template "opencart.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/orangehrm/Chart.yaml
+++ b/upstreamed/orangehrm/Chart.yaml
@@ -1,5 +1,5 @@
 name: orangehrm
-version: 2.0.2
+version: 2.0.3
 appVersion: 4.1.1
 description: OrangeHRM is a free HR management system that offers a wealth of modules
  to suit the needs of your business.
--- a/upstreamed/orangehrm/templates/deployment.yaml
+++ b/upstreamed/orangehrm/templates/deployment.yaml
@@ -12,6 +12,8 @@ spec:
    metadata:
      labels:
        app: {{ template "orangehrm.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/osclass/Chart.yaml
+++ b/upstreamed/osclass/Chart.yaml
@@ -1,5 +1,5 @@
 name: osclass
-version: 2.0.2
+version: 2.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.
--- a/upstreamed/osclass/templates/deployment.yaml
+++ b/upstreamed/osclass/templates/deployment.yaml
@@ -13,6 +13,8 @@ spec:
    metadata:
      labels:
        app: {{ template "osclass.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/owncloud/Chart.yaml
+++ b/upstreamed/owncloud/Chart.yaml
@@ -1,5 +1,5 @@
 name: owncloud
-version: 2.0.3
+version: 2.0.4
 appVersion: 10.0.9
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
--- a/upstreamed/owncloud/templates/deployment.yaml
+++ b/upstreamed/owncloud/templates/deployment.yaml
@@ -14,6 +14,8 @@ spec:
    metadata:
      labels:
        app: {{ template "owncloud.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/parse/Chart.yaml
+++ b/upstreamed/parse/Chart.yaml
@@ -1,5 +1,5 @@
 name: parse
-version: 2.0.2
+version: 2.0.3
 appVersion: 2.8.2
 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:
--- a/upstreamed/parse/templates/dashboard-deployment.yaml
+++ b/upstreamed/parse/templates/dashboard-deployment.yaml
@@ -15,6 +15,7 @@ spec:
    metadata:
      labels:
        app: {{ template "parse.name" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
        release: "{{ .Release.Name }}"
        component: "dashboard"
    spec:
--- a/upstreamed/parse/templates/server-deployment.yaml
+++ b/upstreamed/parse/templates/server-deployment.yaml
@@ -14,6 +14,7 @@ spec:
    metadata:
      labels:
        app: {{ template "parse.name" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
        release: "{{ .Release.Name }}"
        component: "server"
    spec:
--- a/upstreamed/phabricator/Chart.yaml
+++ b/upstreamed/phabricator/Chart.yaml
@@ -1,6 +1,6 @@
 name: phabricator
-version: 2.1.2
-appVersion: 2018.29.0
+version: 2.1.4
+appVersion: 2018.30.0
 description: Collection of open source web applications that help software companies build better software.
 keywords:
 - phabricator
--- 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.2.7
+  version: 4.3.0
 digest: sha256:24134c936ea3fe53c0b99529efc97db98284daa3a8fbd22ab79e8d1c8ba441c9
-generated: 2018-07-26T15:38:21.528132672Z
+generated: 2018-07-30T15:01:28.501495809Z
--- a/upstreamed/phabricator/templates/deployment.yaml
+++ b/upstreamed/phabricator/templates/deployment.yaml
@@ -13,6 +13,8 @@ spec:
    metadata:
      labels:
        app: {{ template "phabricator.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/phabricator/values.yaml
+++ b/upstreamed/phabricator/values.yaml
@@ -4,7 +4,7 @@
 image:
  registry: docker.io
  repository: bitnami/phabricator
-  tag: 2018.29.0-debian-9
+  tag: 2018.30.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
--- a/upstreamed/phpbb/Chart.yaml
+++ b/upstreamed/phpbb/Chart.yaml
@@ -1,5 +1,5 @@
 name: phpbb
-version: 2.0.1
+version: 2.0.2
 appVersion: 3.2.2
 description: Community forum that supports the notion of users and groups, file attachments,
  full-text search, notifications and more.
--- a/upstreamed/phpbb/templates/deployment.yaml
+++ b/upstreamed/phpbb/templates/deployment.yaml
@@ -14,6 +14,8 @@ spec:
    metadata:
      labels:
        app: {{ template "phpbb.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/phpmyadmin/Chart.yaml
+++ b/upstreamed/phpmyadmin/Chart.yaml
@@ -1,5 +1,5 @@
 name: phpmyadmin
-version: 0.1.8
+version: 0.1.9
 appVersion: 4.8.2
 description: phpMyAdmin is an mysql administration frontend
 keywords:
--- a/upstreamed/phpmyadmin/templates/deployment.yaml
+++ b/upstreamed/phpmyadmin/templates/deployment.yaml
@@ -12,11 +12,13 @@ spec:
  selector:
    matchLabels:
      app: {{ template "phpmyadmin.name" . }}
+      chart: {{ template "phpmyadmin.chart" . }}
      release: {{ .Release.Name }}
  template:
    metadata:
      labels:
        app: {{ template "phpmyadmin.name" . }}
+        chart: {{ template "phpmyadmin.chart" . }}
        release: {{ .Release.Name }}
    spec:
      {{- if .Values.image.pullSecrets }}
--- a/upstreamed/prestashop/Chart.yaml
+++ b/upstreamed/prestashop/Chart.yaml
@@ -1,5 +1,5 @@
 name: prestashop
-version: 2.0.5
+version: 2.0.6
 appVersion: 1.7.4-2
 description: A popular open source ecommerce solution. Professional tools are easily
  accessible to increase online sales including instant guest checkout, abandoned
--- a/upstreamed/prestashop/templates/deployment.yaml
+++ b/upstreamed/prestashop/templates/deployment.yaml
@@ -13,6 +13,8 @@ spec:
    metadata:
      labels:
        app: {{ template "prestashop.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/rabbitmq/Chart.yaml
+++ b/upstreamed/rabbitmq/Chart.yaml
@@ -1,5 +1,5 @@
 name: rabbitmq
-version: 2.0.2
+version: 2.0.3
 appVersion: 3.7.7
 description: Open source message broker software that implements the Advanced Message Queuing Protocol (AMQP)
 keywords:
--- a/upstreamed/rabbitmq/templates/statefulset.yaml
+++ b/upstreamed/rabbitmq/templates/statefulset.yaml
@@ -14,11 +14,13 @@ spec:
    matchLabels:
      app: {{ template "rabbitmq.name" . }}
      release: "{{ .Release.Name }}"
+      chart: {{ template "rabbitmq.chart" .  }}
  template:
    metadata:
      labels:
        app: {{ template "rabbitmq.name" . }}
        release: "{{ .Release.Name }}"
+        chart: {{ template "rabbitmq.chart" .  }}
      {{- if .Values.podAnnotations }}
      annotations:
 {{ toYaml .Values.podAnnotations | indent 8 }}
--- a/upstreamed/redis/Chart.yaml
+++ b/upstreamed/redis/Chart.yaml
@@ -1,5 +1,5 @@
 name: redis
-version: 3.7.2
+version: 3.7.3
 appVersion: 4.0.10
 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:
--- a/upstreamed/redis/templates/metrics-deployment.yaml
+++ b/upstreamed/redis/templates/metrics-deployment.yaml
@@ -13,6 +13,7 @@ spec:
    metadata:
      labels:
        release: "{{ .Release.Name }}"
+        chart: {{ template "redis.chart" . }}
        role: metrics
        app: {{ template "redis.name" . }}
      {{- if .Values.metrics.podLabels }}
--- a/upstreamed/redis/templates/redis-master-statefulset.yaml
+++ b/upstreamed/redis/templates/redis-master-statefulset.yaml
@@ -11,6 +11,7 @@ spec:
  selector:
    matchLabels:
      release: "{{ .Release.Name }}"
+      chart: {{ template "redis.chart" . }}
      role: master
      app: {{ template "redis.name" . }}
  serviceName: "redis-master"
@@ -18,6 +19,7 @@ spec:
    metadata:
      labels:
        release: "{{ .Release.Name }}"
+        chart: {{ template "redis.chart" . }}
        role: master
        app: {{ template "redis.name" . }}
 {{- if .Values.master.podLabels }}
--- a/upstreamed/redis/templates/redis-slave-deployment.yaml
+++ b/upstreamed/redis/templates/redis-slave-deployment.yaml
@@ -16,6 +16,7 @@ spec:
    metadata:
      labels:
        release: "{{ .Release.Name }}"
+        chart: {{ template "redis.chart" . }}
        role: slave
        app: {{ template "redis.name" . }}
      {{- if (.Values.slave.podLabels | default .Values.master.podLabels) }}
--- a/upstreamed/redmine/Chart.yaml
+++ b/upstreamed/redmine/Chart.yaml
@@ -1,5 +1,5 @@
 name: redmine
-version: 4.0.1
+version: 4.0.2
 appVersion: 3.4.6
 description: A flexible project management web application.
 keywords:
--- a/upstreamed/redmine/templates/deployment.yaml
+++ b/upstreamed/redmine/templates/deployment.yaml
@@ -13,6 +13,8 @@ spec:
    metadata:
      labels:
        app: {{ template "redmine.fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/suitecrm/Chart.yaml
+++ b/upstreamed/suitecrm/Chart.yaml
@@ -1,5 +1,5 @@
 name: suitecrm
-version: 2.0.2
+version: 2.0.3
 appVersion: 7.10.7
 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:
--- a/upstreamed/suitecrm/templates/deployment.yaml
+++ b/upstreamed/suitecrm/templates/deployment.yaml
@@ -14,6 +14,7 @@ spec:
      labels:
        app: {{ template "name" . }}
        release: "{{ .Release.Name }}"
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/suitecrm/templates/svc.yaml
+++ b/upstreamed/suitecrm/templates/svc.yaml
@@ -23,3 +23,4 @@ spec:
  selector:
    app: {{ template "name" . }}
    release: "{{ .Release.Name }}"
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
--- a/upstreamed/testlink/Chart.yaml
+++ b/upstreamed/testlink/Chart.yaml
@@ -1,5 +1,5 @@
 name: testlink
-version: 2.0.1
+version: 2.0.2
 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
--- a/upstreamed/testlink/templates/deployment.yaml
+++ b/upstreamed/testlink/templates/deployment.yaml
@@ -13,6 +13,8 @@ spec:
    metadata:
      labels:
        app: {{ template "fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets:
--- a/upstreamed/wordpress/Chart.yaml
+++ b/upstreamed/wordpress/Chart.yaml
@@ -1,5 +1,5 @@
 name: wordpress
-version: 2.1.3
+version: 2.1.4
 appVersion: 4.9.7
 description: Web publishing platform for building blogs and websites.
 icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png
--- a/upstreamed/wordpress/templates/deployment.yaml
+++ b/upstreamed/wordpress/templates/deployment.yaml
@@ -13,6 +13,8 @@ spec:
    metadata:
      labels:
        app: {{ template "fullname" . }}
+        chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+        release: "{{ .Release.Name }}"
    spec:
      {{- if .Values.image.pullSecrets }}
      imagePullSecrets: