From fc27b4d64b7ac7e8cb1a68465de32725adb90a2e Mon Sep 17 00:00:00 2001
From: groundhog2k <10630407+groundhog2k@users.noreply.github.com>
Date: Thu, 4 Feb 2021 12:36:27 +0100
Subject: [PATCH] #244 Reverted renaming serviceName which causes failing
upgrades (#225)
---
charts/mariadb/Chart.yaml | 2 +-
charts/mariadb/README.md | 2 +-
charts/mariadb/templates/service-internal.yaml | 16 ----------------
charts/mariadb/templates/statefulset.yaml | 2 +-
charts/postgres/Chart.yaml | 2 +-
charts/postgres/README.md | 2 +-
charts/postgres/templates/service-internal.yaml | 16 ----------------
charts/postgres/templates/statefulset.yaml | 8 ++++----
charts/redis/Chart.yaml | 2 +-
charts/redis/README.md | 2 +-
charts/redis/templates/service-internal.yaml | 16 ----------------
charts/redis/templates/statefulset.yaml | 2 +-
12 files changed, 12 insertions(+), 60 deletions(-)
delete mode 100644 charts/mariadb/templates/service-internal.yaml
delete mode 100644 charts/postgres/templates/service-internal.yaml
delete mode 100644 charts/redis/templates/service-internal.yaml
diff --git a/charts/mariadb/Chart.yaml b/charts/mariadb/Chart.yaml
index 18326a28..dfe030e1 100644
--- a/charts/mariadb/Chart.yaml
+++ b/charts/mariadb/Chart.yaml
@@ -7,6 +7,6 @@ type: application
maintainers:
- name: groundhog2k
-version: 0.2.8
+version: 0.2.9
appVersion: "10.5.8"
diff --git a/charts/mariadb/README.md b/charts/mariadb/README.md
index 6f58970e..beceab63 100644
--- a/charts/mariadb/README.md
+++ b/charts/mariadb/README.md
@@ -1,6 +1,6 @@
# MariaDB
-  
+  
A Helm chart for MariaDB on Kubernetes
diff --git a/charts/mariadb/templates/service-internal.yaml b/charts/mariadb/templates/service-internal.yaml
deleted file mode 100644
index bdd58c04..00000000
--- a/charts/mariadb/templates/service-internal.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "mariadb.fullname" . }}-internal
- labels:
- {{- include "mariadb.labels" . | nindent 4 }}
-spec:
- type: ClusterIP
- clusterIP: None
- ports:
- - port: {{ .Values.service.port }}
- targetPort: sql
- protocol: TCP
- name: sql
- selector:
- {{- include "mariadb.selectorLabels" . | nindent 4 }}
diff --git a/charts/mariadb/templates/statefulset.yaml b/charts/mariadb/templates/statefulset.yaml
index 70ffc8e2..f0a6d069 100644
--- a/charts/mariadb/templates/statefulset.yaml
+++ b/charts/mariadb/templates/statefulset.yaml
@@ -6,7 +6,7 @@ metadata:
{{- include "mariadb.labels" . | nindent 4 }}
spec:
replicas: 1
- serviceName: {{ include "mariadb.fullname" . }}-internal
+ serviceName: {{ include "mariadb.fullname" . }}
selector:
matchLabels:
{{- include "mariadb.selectorLabels" . | nindent 6 }}
diff --git a/charts/postgres/Chart.yaml b/charts/postgres/Chart.yaml
index cb9156e9..8a73ea3c 100644
--- a/charts/postgres/Chart.yaml
+++ b/charts/postgres/Chart.yaml
@@ -7,6 +7,6 @@ type: application
maintainers:
- name: groundhog2k
-version: 0.2.7
+version: 0.2.8
appVersion: "13.1"
diff --git a/charts/postgres/README.md b/charts/postgres/README.md
index dc35fb94..5b72a3bf 100644
--- a/charts/postgres/README.md
+++ b/charts/postgres/README.md
@@ -1,6 +1,6 @@
# PostgreSQL
-  
+  
A Helm chart for PostgreSQL on Kubernetes
diff --git a/charts/postgres/templates/service-internal.yaml b/charts/postgres/templates/service-internal.yaml
deleted file mode 100644
index e9545b98..00000000
--- a/charts/postgres/templates/service-internal.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "postgres.fullname" . }}-internal
- labels:
- {{- include "postgres.labels" . | nindent 4 }}
-spec:
- type: ClusterIP
- clusterIP: None
- ports:
- - port: {{ .Values.service.port }}
- targetPort: postgres
- protocol: TCP
- name: postgres
- selector:
- {{- include "postgres.selectorLabels" . | nindent 4 }}
diff --git a/charts/postgres/templates/statefulset.yaml b/charts/postgres/templates/statefulset.yaml
index 24bd3739..9f6a2028 100644
--- a/charts/postgres/templates/statefulset.yaml
+++ b/charts/postgres/templates/statefulset.yaml
@@ -6,7 +6,7 @@ metadata:
{{- include "postgres.labels" . | nindent 4 }}
spec:
replicas: 1
- serviceName: {{ include "postgres.fullname" . }}-internal
+ serviceName: {{ include "postgres.fullname" . }}
selector:
matchLabels:
{{- include "postgres.selectorLabels" . | nindent 6 }}
@@ -43,14 +43,14 @@ spec:
protocol: TCP
env:
- name: PGDATA
- value: /var/lib/postgresql/data/pg
+ value: "/var/lib/postgresql/data/pg"
{{- if .Values.settings.authMethod }}
- name: POSTGRES_HOST_AUTH_METHOD
- value: {{ .Values.settings.authMethod }}
+ value: {{ .Values.settings.authMethod | quote }}
{{- end }}
{{- if .Values.settings.initDbArgs }}
- name: POSTGRES_INITDB_ARGS
- value: {{ .Values.settings.initDbArgs }}
+ value: {{ .Values.settings.initDbArgs | quote }}
{{- end }}
{{- with .Values.env }}
{{- toYaml . | nindent 12 }}
diff --git a/charts/redis/Chart.yaml b/charts/redis/Chart.yaml
index 984847ae..5f84a48d 100644
--- a/charts/redis/Chart.yaml
+++ b/charts/redis/Chart.yaml
@@ -8,7 +8,7 @@ maintainers:
- name: groundhog2k
# This is the chart version
-version: 0.2.8
+version: 0.2.9
# This is the version number of the application being deployed.
appVersion: "6.0.10"
diff --git a/charts/redis/README.md b/charts/redis/README.md
index 46e44bf7..ee8d71db 100644
--- a/charts/redis/README.md
+++ b/charts/redis/README.md
@@ -1,6 +1,6 @@
# Redis
-  
+  
A Helm chart for Redis on Kubernetes
diff --git a/charts/redis/templates/service-internal.yaml b/charts/redis/templates/service-internal.yaml
deleted file mode 100644
index ed13c524..00000000
--- a/charts/redis/templates/service-internal.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
- name: {{ include "redis.fullname" . }}-internal
- labels:
- {{- include "redis.labels" . | nindent 4 }}
-spec:
- type: ClusterIP
- clusterIP: None
- ports:
- - port: {{ .Values.service.port }}
- targetPort: redis
- protocol: TCP
- name: redis
- selector:
- {{- include "redis.selectorLabels" . | nindent 4 }}
diff --git a/charts/redis/templates/statefulset.yaml b/charts/redis/templates/statefulset.yaml
index c8bca76e..3c964f9c 100644
--- a/charts/redis/templates/statefulset.yaml
+++ b/charts/redis/templates/statefulset.yaml
@@ -6,7 +6,7 @@ metadata:
{{- include "redis.labels" . | nindent 4 }}
spec:
replicas: 1
- serviceName: {{ include "redis.fullname" . }}-internal
+ serviceName: {{ include "redis.fullname" . }}
selector:
matchLabels:
{{- include "redis.selectorLabels" . | nindent 6 }}
--
GitLab