initial migration

.gitignore

@@ -0,0 +1 @@
+*.tgz

apache/Chart.yaml

@@ -1,10 +1,16 @@
 name: apache
+version: 0.3.0
+description: Chart for Apache HTTP Server
+keywords:
+- apache
+- http
+- www
+- web
+- reverse proxy
 home: https://httpd.apache.org
-source:
+sources:
 - https://github.com/bitnami/bitnami-docker-apache
-version: 0.2.0
-description: Chart for Apache HTTP Server
 maintainers:
-- Bitnami <[email protected]>
-details: |-
-  The Apache HTTP Server Project is an effort to develop and maintain an open-source HTTP server for modern operating systems including UNIX and Windows NT. The goal of this project is to provide a secure, efficient and extensible server that provides HTTP services in sync with the current HTTP standards.
+- name: Bitnami
+  email: [email protected]
+engine: gotpl

apache/manifests/apache-rc.yaml → apache/templates/apache-rc.yaml

@@ -1,25 +1,28 @@
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: apache
+  name: {{ printf "%s-%s" .Release.Name .Chart.Name | trunc 24 }}
   labels:
     provider: apache
+    release: {{ .Release.Name }}
     heritage: bitnami
 spec:
   replicas: 1
   selector:
     provider: apache
-    version: 2.4.20-r0
+    release: {{ .Release.Name }}
+    version: {{ .Values.imageTag }}
   template:
     metadata:
       labels:
         provider: apache
-        version: 2.4.20-r0
+        release: {{ .Release.Name }}
+        version: {{ .Values.imageTag }}
         heritage: bitnami
     spec:
       containers:
       - name: apache
-        image: bitnami/apache:2.4.20-r0
+        image: bitnami/apache:{{ .Values.imageTag }}
         ports:
         - name: http
           containerPort: 80

apache/manifests/apache-svc.yaml → apache/templates/apache-svc.yaml

@@ -1,9 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: apache
+  name: {{ printf "%s-%s" .Release.Name .Chart.Name | trunc 24 }}
   labels:
     provider: apache
+    release: {{ .Release.Name }}
     heritage: bitnami
 spec:
   type: LoadBalancer
@@ -16,3 +17,4 @@ spec:
     port: 443
   selector:
     provider: apache
+    release: {{ .Release.Name }}

apache/values.yaml

@@ -0,0 +1 @@
+imageTag: 2.4.20-r0

drupal/Chart.yaml

@@ -1,13 +1,18 @@
 name: drupal
+version: 0.3.0
+description: One of the most versatile open source content management systems.
+keywords:
+- drupal
+- cms
+- blog
+- http
+- web
+- application
+- php
 home: http://www.drupal.org/
-source:
+sources:
 - https://github.com/bitnami/bitnami-docker-drupal
-version: 0.2.1
-description: One of the most versatile open source content management systems.
 maintainers:
-- Bitnami <[email protected]>
-dependencies:
-- name: mariadb
-  version: 0.2.1
-details: |-
-  Drupal is one of the most versatile open source content management systems on the market.
+- name: Bitnami
+  email: [email protected]
+engine: gotpl

drupal/charts/mariadb/Chart.yaml

@@ -0,0 +1,15 @@
+name: mariadb
+version: 0.3.0
+description: Chart for MariaDB
+keywords:
+- mariadb
+- mysql
+- database
+- sql
+home: https://mariadb.org
+sources:
+- https://github.com/bitnami/bitnami-docker-mariadb
+maintainers:
+- name: Bitnami
+  email: [email protected]
+engine: gotpl

drupal/charts/mariadb/README.md

@@ -0,0 +1,37 @@
+# MariaDB
+
+> MariaDB is a fast, reliable, scalable, and easy to use open-source relational database system. MariaDB Server is intended for mission-critical, heavy-load production systems as well as for embedding into mass-deployed software.
+
+Based on the [Bitnami MariaDB](https://github.com/bitnami/bitnami-docker-mariadb) image for docker, this Chart bootstraps a [MariaDB](https://mariadb.com/) deployment on a [Kubernetes](http://kubernetes.io) cluster using [Helm](https://helm.sh).
+
+## Persistence
+
+For persistence of the MariaDB data, mount a [storage volume](http://kubernetes.io/docs/user-guide/volumes/) at the `/bitnami/mariadb` path of the MariaDB pod.
+
+By default the MariaDB Chart mounts an [emptyDir](http://kubernetes.io/docs/user-guide/volumes/#emptydir) volume.
+
+## Configuration
+
+To edit the default MariaDB configuration, run
+
+```bash
+$ helmc edit mariadb
+```
+
+Configurable parameters can be specified in `tpl/values.toml`. If not specified default values as defined by the [Bitnami MariaDB](https://github.com/bitnami/bitnami-docker-mariadb) image are used.
+
+> Tip: If you have issues running the above command, add `se autochdir` to your `~/.vimrc` profile or simply edit `~/.helmc/workspace/charts/mariadb/tpl/values.toml` in your favourite editor.
+
+Finally, generate the chart to apply your changes to the configuration.
+
+```bash
+$ helmc generate --force mariadb
+```
+
+## Cleanup
+
+To delete the MariaDB deployment completely:
+
+```bash
+$ helmc uninstall -n default mariadb
+```

mariadb/manifests/mariadb-rc.yaml → drupal/charts/mariadb/templates/mariadb-rc.yaml

@@ -1,41 +1,43 @@
-#helm:generate helmc tpl -d tpl/values.toml -o manifests/mariadb-rc.yaml $HELM_GENERATE_FILE
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: mariadb
+  name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }}
   labels:
     provider: mariadb
+    release: {{ .Release.Name }}
     heritage: bitnami
 spec:
   replicas: 1
   selector:
     provider: mariadb
-    version: 10.1.14-r1
+    release: {{ .Release.Name }}
+    version: {{ .Values.imageTag }}
   template:
     metadata:
       labels:
         provider: mariadb
-        version: 10.1.14-r1
+        release: {{ .Release.Name }}
+        version: {{ .Values.imageTag }}
         heritage: bitnami
     spec:
       containers:
       - name: mariadb
-        image: bitnami/mariadb:10.1.14-r1
+        image: bitnami/mariadb:{{ .Values.imageTag }}
         env:
         - name: MARIADB_ROOT_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: mariadb
+              name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }}
               key: mariadb-root-password
         - name: MARIADB_USER
-          value: ""
+          value: {{ .Values.mariadbUser | quote }}
         - name: MARIADB_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: mariadb
+              name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }}
               key: mariadb-password
         - name: MARIADB_DATABASE
-          value: ""
+          value: {{ .Values.mariadbDatabase | quote }}
         ports:
         - name: mysql
           containerPort: 3306

drupal/charts/mariadb/templates/mariadb-secrets.yaml

@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }}
+  labels:
+    provider: mariadb
+    release: {{ .Release.Name }}
+    heritage: bitnami
+type: Opaque
+data:
+  mariadb-root-password: {{ .Values.mariadbRootPassword | quote | b64enc | quote }}
+  mariadb-password: {{ .Values.mariadbPassword | quote | b64enc | quote }}

mariadb/manifests/mariadb-svc.yaml → drupal/charts/mariadb/templates/mariadb-svc.yaml

@@ -1,9 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: mariadb
+  name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }}
   labels:
     provider: mariadb
+    release: {{ .Release.Name }}
     heritage: bitnami
 spec:
   ports:
@@ -12,3 +13,4 @@ spec:
     targetPort: mysql
   selector:
     provider: mariadb
+    release: {{ .Release.Name }}

drupal/charts/mariadb/values.yaml

@@ -0,0 +1,6 @@
+imageTag: 10.1.14-r1
+
+mariadbRootPassword:
+mariadbUser:
+mariadbPassword:
+mariadbDatabase:

drupal/tpl/drupal-rc.yaml → drupal/templates/drupal-rc.yaml

@@ -1,48 +1,50 @@
-#helm:generate helmc tpl -d tpl/values.toml -o manifests/drupal-rc.yaml $HELM_GENERATE_FILE
 apiVersion: v1
 kind: ReplicationController
 metadata:
-  name: drupal
+  name: {{ printf "%s-%s" .Release.Name "drupal" | trunc 24 }}
   labels:
     app: drupal
     provider: drupal-server
+    release: {{ .Release.Name }}
     heritage: bitnami
 spec:
   replicas: 1
   selector:
     app: drupal
     provider: drupal-server
-    version: 8.1.3-r0
+    release: {{ .Release.Name }}
+    version: {{ .Values.imageTag }}
   template:
     metadata:
       labels:
         app: drupal
         provider: drupal-server
-        version: 8.1.3-r0
+        release: {{ .Release.Name }}
+        version: {{ .Values.imageTag }}
         heritage: bitnami
     spec:
       containers:
       - name: drupal
-        image: bitnami/drupal:8.1.3-r0
+        image: bitnami/drupal:{{ .Values.imageTag }}
         env:
         - name: MARIADB_HOST
-          value: "mariadb"
+          value: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 | quote }}
         - name: MARIADB_PORT
           value: "3306"
         - name: MARIADB_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: mariadb
+              name: {{ printf "%s-%s" .Release.Name "mariadb" | trunc 24 }}
               key: mariadb-root-password
         - name: DRUPAL_USERNAME
-          value: {{ .drupalUser | quote }}
+          value: {{ .Values.drupalUser | quote }}
         - name: DRUPAL_PASSWORD
           valueFrom:
             secretKeyRef:
-              name: drupal
+              name: {{ printf "%s-%s" .Release.Name "drupal" | trunc 24 }}
               key: drupal-password
         - name: DRUPAL_EMAIL
-          value: {{ .drupalEmail | quote }}
+          value: {{ .Values.drupalEmail | quote }}
         ports:
         - name: http
           containerPort: 80