From dfd13a2b76b83f558d9dbb1d942c66ecaa93c221 Mon Sep 17 00:00:00 2001 From: "Javier J. Salmeron Garcia" Date: Mon, 30 Jul 2018 17:18:58 +0200 Subject: [PATCH] Add missing release and charts labels in pods --- bitnami/elasticsearch/Chart.yaml | 2 +- bitnami/elasticsearch/templates/data-statefulset.yaml | 2 ++ bitnami/elasticsearch/templates/master-deploy.yaml | 1 + bitnami/elasticsearch/templates/metrics-deploy.yaml | 1 + bitnami/jenkins/Chart.yaml | 2 +- bitnami/jenkins/templates/deployment.yaml | 2 ++ bitnami/mean/Chart.yaml | 2 +- bitnami/mean/templates/deployment.yaml | 1 + bitnami/memcached/Chart.yaml | 2 +- bitnami/memcached/templates/deployment.yaml | 2 ++ bitnami/metrics-server/Chart.yaml | 2 +- .../metrics-server/templates/metrics-server-deployment.yaml | 2 ++ bitnami/postgresql/Chart.yaml | 2 +- bitnami/postgresql/templates/metrics-deployment.yaml | 3 ++- bitnami/tensorflow-inception/Chart.yaml | 2 +- bitnami/tensorflow-inception/templates/deployment.yaml | 2 ++ bitnami/tomcat/Chart.yaml | 2 +- bitnami/tomcat/templates/deployment.yaml | 2 ++ bitnami/wildfly/Chart.yaml | 2 +- bitnami/wildfly/templates/deployment.yaml | 2 ++ bitnami/zookeeper/Chart.yaml | 2 +- 21 files changed, 29 insertions(+), 11 deletions(-) diff --git a/bitnami/elasticsearch/Chart.yaml b/bitnami/elasticsearch/Chart.yaml index d10c5598b..3c399e333 100644 --- 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: diff --git a/bitnami/elasticsearch/templates/data-statefulset.yaml b/bitnami/elasticsearch/templates/data-statefulset.yaml index 699c2d655..4c45c869f 100644 --- 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: diff --git a/bitnami/elasticsearch/templates/master-deploy.yaml b/bitnami/elasticsearch/templates/master-deploy.yaml index 8976f3842..1b2b418f2 100644 --- 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: diff --git a/bitnami/elasticsearch/templates/metrics-deploy.yaml b/bitnami/elasticsearch/templates/metrics-deploy.yaml index 75008ea47..e732f08b7 100644 --- 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 }} diff --git a/bitnami/jenkins/Chart.yaml b/bitnami/jenkins/Chart.yaml index b704f491e..dbf1c4ac9 100644 --- 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: diff --git a/bitnami/jenkins/templates/deployment.yaml b/bitnami/jenkins/templates/deployment.yaml index 01867441d..c9fb105d7 100644 --- 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: diff --git a/bitnami/mean/Chart.yaml b/bitnami/mean/Chart.yaml index 71c28c8af..f9623a1ac 100644 --- 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: diff --git a/bitnami/mean/templates/deployment.yaml b/bitnami/mean/templates/deployment.yaml index 1323f74c3..9eed8be75 100644 --- 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: diff --git a/bitnami/memcached/Chart.yaml b/bitnami/memcached/Chart.yaml index 2a4542cf9..f196bad42 100644 --- a/bitnami/memcached/Chart.yaml +++ b/bitnami/memcached/Chart.yaml @@ -1,5 +1,5 @@ name: memcached -version: 0.4.32 +version: 0.4.33 appVersion: 1.5.9-debian-9 description: Chart for Memcached keywords: diff --git a/bitnami/memcached/templates/deployment.yaml b/bitnami/memcached/templates/deployment.yaml index f13161347..fae4078fa 100644 --- 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: diff --git a/bitnami/metrics-server/Chart.yaml b/bitnami/metrics-server/Chart.yaml index bb453e87b..f8dd5c3a5 100644 --- 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: diff --git a/bitnami/metrics-server/templates/metrics-server-deployment.yaml b/bitnami/metrics-server/templates/metrics-server-deployment.yaml index 6db5df52c..2dc2cf94b 100644 --- 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: diff --git a/bitnami/postgresql/Chart.yaml b/bitnami/postgresql/Chart.yaml index 8b391ecc4..88b35112c 100644 --- 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: diff --git a/bitnami/postgresql/templates/metrics-deployment.yaml b/bitnami/postgresql/templates/metrics-deployment.yaml index ac22cb55d..b86220fbf 100644 --- 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 }} \ No newline at end of file +{{- end }} diff --git a/bitnami/tensorflow-inception/Chart.yaml b/bitnami/tensorflow-inception/Chart.yaml index be1339199..1991cc33b 100755 --- 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: diff --git a/bitnami/tensorflow-inception/templates/deployment.yaml b/bitnami/tensorflow-inception/templates/deployment.yaml index a807134a3..60e39f99a 100644 --- 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: diff --git a/bitnami/tomcat/Chart.yaml b/bitnami/tomcat/Chart.yaml index 201969ae1..6fd25eb6d 100644 --- a/bitnami/tomcat/Chart.yaml +++ b/bitnami/tomcat/Chart.yaml @@ -1,5 +1,5 @@ name: tomcat -version: 0.4.28 +version: 0.4.29 appVersion: 8.5.32-debian-9 description: Chart for Apache Tomcat keywords: diff --git a/bitnami/tomcat/templates/deployment.yaml b/bitnami/tomcat/templates/deployment.yaml index b2a493236..3b7d10354 100644 --- 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: diff --git a/bitnami/wildfly/Chart.yaml b/bitnami/wildfly/Chart.yaml index ee94e5040..cd4fc0724 100644 --- a/bitnami/wildfly/Chart.yaml +++ b/bitnami/wildfly/Chart.yaml @@ -1,5 +1,5 @@ name: wildfly -version: 0.4.15 +version: 0.4.16 appVersion: 13.0.0-debian-9 description: Chart for Wildfly keywords: diff --git a/bitnami/wildfly/templates/deployment.yaml b/bitnami/wildfly/templates/deployment.yaml index 0ee024715..275f53539 100644 --- 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: diff --git a/bitnami/zookeeper/Chart.yaml b/bitnami/zookeeper/Chart.yaml index 7c993cc23..f2f98a83d 100644 --- a/bitnami/zookeeper/Chart.yaml +++ b/bitnami/zookeeper/Chart.yaml @@ -1,5 +1,5 @@ name: zookeeper -version: 0.0.3 +version: 0.0.4 appVersion: 3.4.12-debian-9 description: A centralized service for maintaining configuration information, naming, providing distributed synchronization, and providing group services for distributed applications. keywords: