mirror of
https://github.com/bitnami/charts.git
synced 2026-08-10 14:15:55 +08:00
Minor fixes and move externaldb-helper to other PR
This commit is contained in:
tompizmor
@@ -1,13 +0,0 @@
|
||||
name: externaldb-helper
|
||||
version: 0.0.1
|
||||
appVersion: 0.0.1
|
||||
description: Helper to define templates for external databases
|
||||
keywords:
|
||||
- helper
|
||||
- broker
|
||||
- service
|
||||
- catalog
|
||||
maintainers:
|
||||
- name: Bitnami
|
||||
email: containers@bitnami.com
|
||||
engine: gotpl
|
||||
@@ -1,4 +0,0 @@
|
||||
# External DB Helper
|
||||
|
||||
This chart is just a helper that defines a set of templates to help mapping secrets keys from different broker implementation for the Kubernetes Service Catalog.
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
{{/* vim: set filetype=mustache: */}}
|
||||
{{/*
|
||||
CUSTOM TEMPLATES FOR SECRET MAPPING
|
||||
- host
|
||||
- port
|
||||
- username
|
||||
- password
|
||||
*/}}
|
||||
|
||||
{{- define "externaldb.host" -}}
|
||||
{{- if eq .type "osba"}}
|
||||
{{- printf "%s" "host" -}}
|
||||
{{- else if eq .type "gce"}}
|
||||
{{- printf "%s" "host" -}}
|
||||
{{- else if eq .type "aws"}}
|
||||
{{- printf "%s" "host" -}}
|
||||
{{- else }}
|
||||
{{- printf "%s" "host" -}}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "externaldb.port" -}}
|
||||
{{- if eq .type "osba"}}
|
||||
{{- printf "%s" "port" -}}
|
||||
{{- else if eq .type "gce"}}
|
||||
{{- printf "%s" "port" -}}
|
||||
{{- else if eq .type "aws"}}
|
||||
{{- printf "%s" "port" -}}
|
||||
{{- else }}
|
||||
{{- printf "%s" "port" -}}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "externaldb.username" -}}
|
||||
{{- if eq .type "osba"}}
|
||||
{{- printf "%s" "username" -}}
|
||||
{{- else if eq .type "gce"}}
|
||||
{{- printf "%s" "username" -}}
|
||||
{{- else if eq .type "aws"}}
|
||||
{{- printf "%s" "username" -}}
|
||||
{{- else }}
|
||||
{{- printf "%s" "username" -}}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
|
||||
{{- define "externaldb.password" -}}
|
||||
{{- if eq .type "osba"}}
|
||||
{{- printf "%s" "password" -}}
|
||||
{{- else if eq .type "gce"}}
|
||||
{{- printf "%s" "password" -}}
|
||||
{{- else if eq .type "aws"}}
|
||||
{{- printf "%s" "password" -}}
|
||||
{{- else }}
|
||||
{{- printf "%s" "password" -}}
|
||||
{{- end }}
|
||||
{{- end -}}
|
||||
@@ -52,7 +52,7 @@ The following tables lists the configurable parameters of the Node chart and the
|
||||
| `image` | Node image | `bitnami/node:{VERSION}` |
|
||||
| `gitImage` | Image used for initContainers | `alpine/git` |
|
||||
| `imagePullPolicy` | Image pull policy | `IfNotPresent` |
|
||||
| `repository` | Repo of the application | `https://github.com/jbianquetti-nami/sample-mean.git` |
|
||||
| `repository` | Repo of the application | `https://github.com/bitnami/sample-mean.git` |
|
||||
| `revision` | Revision to checkout | `master` |
|
||||
| `replicas` | Number of replicas for the application | `3` |
|
||||
| `applicationPort` | Port where the application will be running | `3000` |
|
||||
@@ -169,8 +169,10 @@ ingress:
|
||||
location: YOUR_AZURE_LOCATION
|
||||
resourceGroup: mongodb-k8s-service-catalog
|
||||
sslEnforcement: disabled
|
||||
firewallStartIPAddress: 0.0.0.0
|
||||
firewallEndIPAddress: 255.255.255.255
|
||||
firewallRules:
|
||||
- startIPAddress: "0.0.0.0"
|
||||
endIPAddress: "255.255.255.255"
|
||||
name: "AllowAll"
|
||||
```
|
||||
Please update the `YOUR_AZURE_LOCATION` placeholder in the above example.
|
||||
|
||||
|
||||
@@ -3,6 +3,6 @@ dependencies:
|
||||
repository: https://kubernetes-charts.storage.googleapis.com/
|
||||
version: 0.4.x
|
||||
condition: mongodb.install
|
||||
- name: externaldb-helper
|
||||
- name: bitnami-common
|
||||
repository: https://charts.bitnami.com/stable
|
||||
version: 0.0.x
|
||||
|
||||
@@ -17,15 +17,15 @@ spec:
|
||||
spec:
|
||||
initContainers:
|
||||
- name: git-clone-app
|
||||
image: {{ .Values.gitImage }}
|
||||
imagePullPolicy: {{ .Values.imagePullPolicy }}
|
||||
image: "{{ .Values.gitImage.registry }}/{{ .Values.gitImage.repository }}:{{ .Values.gitImage.tag }}"
|
||||
imagePullPolicy: {{ .Values.gitImage.pullPolicy | quote }}
|
||||
command: ['git', 'clone', '{{ .Values.repository }}', '-b', '{{ .Values.revision }}', '/app']
|
||||
volumeMounts:
|
||||
- name: app
|
||||
mountPath: /app
|
||||
- name: npm-install
|
||||
image: {{ .Values.image }}
|
||||
imagePullPolicy: {{ .Values.imagePullPolicy }}
|
||||
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
|
||||
workingDir: /app
|
||||
command: ['/bin/bash', '-c', 'useradd bitnami && chown -R bitnami:bitnami /app && npm install']
|
||||
volumeMounts:
|
||||
@@ -33,8 +33,8 @@ spec:
|
||||
mountPath: /app
|
||||
containers:
|
||||
- name: {{ template "node.fullname" . }}
|
||||
image: "{{ .Values.image }}"
|
||||
imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
|
||||
image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
||||
imagePullPolicy: {{ .Values.image.pullPolicy | quote }}
|
||||
env:
|
||||
{{- if .Values.mongodb.install }}
|
||||
- name: DATABASE_HOST
|
||||
|
||||
@@ -1,13 +1,17 @@
|
||||
## Bitnami node image version
|
||||
## ref: https://hub.docker.com/r/bitnami/node/tags/
|
||||
##
|
||||
image: bitnami/node:9.5.0-r0-prod
|
||||
gitImage: alpine/git
|
||||
image:
|
||||
registry: docker.io
|
||||
repository: bitnami/node
|
||||
tag: 9.5.0-prod
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
## Specify a imagePullPolicy
|
||||
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
|
||||
##
|
||||
imagePullPolicy: IfNotPresent
|
||||
gitImage:
|
||||
registry:
|
||||
repository: alpine/git
|
||||
tag: latest
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
## Git repository http/https
|
||||
##
|
||||
|
||||
Reference in New Issue
Block a user