Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Revert "basic auth for so-monitoring""
[oom.git]
/
kubernetes
/
common
/
mariadb-galera
/
templates
/
configmap.yaml
diff --git
a/kubernetes/common/mariadb-galera/templates/configmap.yaml
b/kubernetes/common/mariadb-galera/templates/configmap.yaml
index
54096cf
..
ff6e119
100644
(file)
--- a/
kubernetes/common/mariadb-galera/templates/configmap.yaml
+++ b/
kubernetes/common/mariadb-galera/templates/configmap.yaml
@@
-12,21
+12,18
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-apiVersion: v1
-kind: ConfigMap
-metadata:
- name: {{ include "common.fullname" . }}-confd
- namespace: {{ include "common.namespace" . }}
-data:
-{{ tpl (.Files.Glob "resources/config/mariadb/conf.d/*").AsConfig . | indent 2 }}
----
{{- if .Values.externalConfig }}
apiVersion: v1
kind: ConfigMap
metadata:
{{- if .Values.externalConfig }}
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-external
C
onfig
+ name: {{ include "common.fullname" . }}-external
-c
onfig
namespace: {{ include "common.namespace" . }}
namespace: {{ include "common.namespace" . }}
+ labels:
+ app: {{ include "common.name" . }}
+ chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+ release: {{ .Release.Name }}
+ heritage: {{ .Release.Service }}
data:
data:
- my_extra.cnf: |-
-{{ toYaml .Values.externalConfig | indent 4 }}
-{{- end -}}
\ No newline at end of file
+ my_extra.cnf: |
+{{ .Values.externalConfig | indent 4 }}
+{{- end -}}