From 81e4224aaa003b68943c311db4c75219d9eecaf6 Mon Sep 17 00:00:00 2001 From: Naseem Date: Thu, 28 Nov 2019 12:47:03 -0500 Subject: [PATCH 1/2] fix replica count conflict (#19204) Signed-off-by: Naseem --- stable/ambassador/Chart.yaml | 2 +- stable/ambassador/templates/deployment.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stable/ambassador/Chart.yaml b/stable/ambassador/Chart.yaml index 74d03f39bd..6561a06d18 100644 --- a/stable/ambassador/Chart.yaml +++ b/stable/ambassador/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 0.85.0 description: A Helm chart for Datawire Ambassador name: ambassador -version: 4.4.8 +version: 4.4.9 icon: https://www.getambassador.io/images/logo.png home: https://www.getambassador.io/ sources: diff --git a/stable/ambassador/templates/deployment.yaml b/stable/ambassador/templates/deployment.yaml index 60f32046e9..7ebcf450f1 100644 --- a/stable/ambassador/templates/deployment.yaml +++ b/stable/ambassador/templates/deployment.yaml @@ -17,7 +17,7 @@ metadata: {{- toYaml .Values.deploymentAnnotations | nindent 4 }} {{- end }} spec: -{{- if not .Values.daemonSet }} +{{- if and (not .Values.autoscaling.enabled) (not .Values.daemonSet) }} replicas: {{ .Values.replicaCount }} {{- end }} selector: From c5838636973a5546196db6e48ae46f99a55900c4 Mon Sep 17 00:00:00 2001 From: machine424 Date: Thu, 28 Nov 2019 19:13:04 +0100 Subject: [PATCH 2/2] [stable/postgresql] Change templates/networkpolicy.yaml in order to implement what is really described in values files (#19226) Signed-off-by: Ayoub Mrini --- stable/postgresql/Chart.yaml | 2 +- stable/postgresql/templates/networkpolicy.yaml | 8 ++++---- stable/postgresql/values-production.yaml | 8 ++++---- stable/postgresql/values.yaml | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/stable/postgresql/Chart.yaml b/stable/postgresql/Chart.yaml index 793ef9105a..8a60039723 100644 --- a/stable/postgresql/Chart.yaml +++ b/stable/postgresql/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: postgresql -version: 7.7.0 +version: 7.7.1 appVersion: 11.6.0 description: Chart for PostgreSQL, an object-relational database management system (ORDBMS) with an emphasis on extensibility and on standards-compliance. keywords: diff --git a/stable/postgresql/templates/networkpolicy.yaml b/stable/postgresql/templates/networkpolicy.yaml index 1f91746f6a..ea1fc9b3a2 100644 --- a/stable/postgresql/templates/networkpolicy.yaml +++ b/stable/postgresql/templates/networkpolicy.yaml @@ -22,15 +22,15 @@ spec: - podSelector: matchLabels: {{ template "postgresql.fullname" . }}-client: "true" + {{- if .Values.networkPolicy.explicitNamespacesSelector }} + namespaceSelector: +{{ toYaml .Values.networkPolicy.explicitNamespacesSelector | indent 12 }} + {{- end }} - podSelector: matchLabels: app: {{ template "postgresql.name" . }} release: {{ .Release.Name | quote }} role: slave - {{- if .Values.networkPolicy.explicitNamespacesSelector }} - - namespaceSelector: -{{ toYaml .Values.networkPolicy.explicitNamespacesSelector | indent 12 }} - {{- end }} {{- end }} # Allow prometheus scrapes - ports: diff --git a/stable/postgresql/values-production.yaml b/stable/postgresql/values-production.yaml index 5a8b2c5109..e32ec5fec9 100644 --- a/stable/postgresql/values-production.yaml +++ b/stable/postgresql/values-production.yaml @@ -351,10 +351,10 @@ networkPolicy: ## allowExternal: true - ## if explicitNamespacesSelector is missing or set to {}, only Pods that are in the networkPolicy's namespace - ## and that match other criteria, the ones that can be selected by one of the podSelectors, can reach the DB. - ## But sometimes, we want the DB to be accessible from other namespaces, in this case, we can use this - ## LabelSelector to select these namespaces, note that the networkPolicy's should also be explicitly added. + ## if explicitNamespacesSelector is missing or set to {}, only client Pods that are in the networkPolicy's namespace + ## and that match other criteria, the ones that have the good label, can reach the DB. + ## But sometimes, we want the DB to be accessible to clients from other namespaces, in this case, we can use this + ## LabelSelector to select these namespaces, note that the networkPolicy's namespace should also be explicitly added. ## # explicitNamespacesSelector: # matchLabels: diff --git a/stable/postgresql/values.yaml b/stable/postgresql/values.yaml index 3d170ffd53..d15c571edf 100644 --- a/stable/postgresql/values.yaml +++ b/stable/postgresql/values.yaml @@ -359,10 +359,10 @@ networkPolicy: ## allowExternal: true - ## if explicitNamespacesSelector is missing or set to {}, only Pods that are in the networkPolicy's namespace - ## and that match other criteria, the ones that can be selected by one of the podSelectors, can reach the DB. - ## But sometimes, we want the DB to be accessible from other namespaces, in this case, we can use this - ## LabelSelector to select these namespaces, note that the networkPolicy's should also be explicitly added. + ## if explicitNamespacesSelector is missing or set to {}, only client Pods that are in the networkPolicy's namespace + ## and that match other criteria, the ones that have the good label, can reach the DB. + ## But sometimes, we want the DB to be accessible to clients from other namespaces, in this case, we can use this + ## LabelSelector to select these namespaces, note that the networkPolicy's namespace should also be explicitly added. ## # explicitNamespacesSelector: # matchLabels: