From c1e80bc2ea16bc6547f1db4dfc8699d1bd45ea94 Mon Sep 17 00:00:00 2001
From: Sameer Naik <sameer@damagehead.com>
Date: Mon, 14 Mar 2016 13:32:53 +0530
Subject: [PATCH] redmine: added mariadb chart as a dependency

---
 redmine/Chart.yaml                     |  3 ++
 redmine/manifests/mariadb-service.yaml | 14 ------
 redmine/manifests/redmine-service.yaml |  2 -
 redmine/tpl/mariadb-controller.yaml    | 59 --------------------------
 redmine/tpl/redmine-controller.yaml    |  3 --
 5 files changed, 3 insertions(+), 78 deletions(-)
 delete mode 100644 redmine/manifests/mariadb-service.yaml
 delete mode 100644 redmine/tpl/mariadb-controller.yaml

diff --git a/redmine/Chart.yaml b/redmine/Chart.yaml
index 6893c6e3f..da9288743 100644
--- a/redmine/Chart.yaml
+++ b/redmine/Chart.yaml
@@ -4,5 +4,8 @@ version: 0.1.0
 description: A flexible project management web application.
 maintainers:
 - Bitnami <containers@bitnami.com>
+dependencies:
+- name: mariadb
+  version: 0.1.0
 details: |-
   Redmine is a flexible project management web application written using Ruby on Rails framework.
diff --git a/redmine/manifests/mariadb-service.yaml b/redmine/manifests/mariadb-service.yaml
deleted file mode 100644
index 195297ac5..000000000
--- a/redmine/manifests/mariadb-service.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: mariadb
-  labels:
-    app: redmine
-    provider: mariadb
-    heritage: bitnami
-spec:
-  ports:
-  - port: 3306
-  selector:
-    app: redmine
-    provider: mariadb
diff --git a/redmine/manifests/redmine-service.yaml b/redmine/manifests/redmine-service.yaml
index 8b26fb544..efce363c0 100644
--- a/redmine/manifests/redmine-service.yaml
+++ b/redmine/manifests/redmine-service.yaml
@@ -4,7 +4,6 @@ metadata:
   name: redmine
   labels:
     app: redmine
-    provider: redmine-server
     heritage: bitnami
 spec:
   type: LoadBalancer
@@ -13,4 +12,3 @@ spec:
     targetPort: redmine-http
   selector:
     app: redmine
-    provider: redmine-server
diff --git a/redmine/tpl/mariadb-controller.yaml b/redmine/tpl/mariadb-controller.yaml
deleted file mode 100644
index 3e1a10f2b..000000000
--- a/redmine/tpl/mariadb-controller.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-#helm:generate helm tpl -d tpl/values.toml -o manifests/mariadb-controller.yaml $HELM_GENERATE_FILE
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: mariadb
-  labels:
-    app: redmine
-    provider: mariadb
-    heritage: bitnami
-spec:
-  replicas: 1
-  selector:
-    app: redmine
-    provider: mariadb
-    version: 5.5.48-0-r01
-  template:
-    metadata:
-      labels:
-        app: redmine
-        provider: mariadb
-        version: 5.5.48-0-r01
-        heritage: bitnami
-    spec:
-      containers:
-      - name: mariadb
-        image: bitnami/mariadb:5.5.48-0-r01
-        env:
-        - name: MARIADB_PASSWORD
-          value: {{default "bitnami" .databasePassword}}
-        ports:
-        - containerPort: 3306
-        livenessProbe:
-          exec:
-            command:
-            - mysqladmin
-            - ping
-          initialDelaySeconds: 15
-          timeoutSeconds: 1
-        readinessProbe:
-          exec:
-            command:
-            - mysqladmin
-            - ping
-          initialDelaySeconds: 5
-          timeoutSeconds: 1
-        volumeMounts:
-        - name: data
-          mountPath: /bitnami/mariadb/data
-        - name: conf
-          mountPath: /bitnami/mariadb/conf
-        - name: logs
-          mountPath: /bitnami/mariadb/logs
-      volumes:
-      - name: data
-        emptyDir: {}
-      - name: conf
-        emptyDir: {}
-      - name: logs
-        emptyDir: {}
diff --git a/redmine/tpl/redmine-controller.yaml b/redmine/tpl/redmine-controller.yaml
index 38c2c1e16..d1765b9c1 100644
--- a/redmine/tpl/redmine-controller.yaml
+++ b/redmine/tpl/redmine-controller.yaml
@@ -5,19 +5,16 @@ metadata:
   name: redmine
   labels:
     app: redmine
-    provider: redmine-server
     heritage: bitnami
 spec:
   replicas: 1
   selector:
     app: redmine
-    provider: redmine-server
     version: 3.2.0-0
   template:
     metadata:
       labels:
         app: redmine
-        provider: redmine-server
         version: 3.2.0-0
         heritage: bitnami
     spec: