remove "master" from mariadb k8s configs

Labelling things foo-master crept into this repository from the
kubernetes guestbook example (which has redis-master and redis-slaves).
We're not running clustered software at the moment so these labels are
unnecessary.

Change-Id: Ibf4cb2b005cc57bcb11e298dd5109cfe309c9ec3

docker/mariadb/mariadb-service.json

@@ -1,10 +1,10 @@
 {
-  "id": "mariadbmaster",
+  "id": "mariadb",
   "kind": "Service",
   "apiVersion": "v1beta1",
   "port": 3306,
   "containerPort": 3306,
   "selector": {
-    "name": "mariadb-master"
+    "name": "mariadb"
   }
 }

docker/mariadb/mariadb.json

@@ -1,29 +1,29 @@
 {
-    "id": "mariadb",
     "desiredState": {
         "manifest": {
-            "version": "v1beta1",
-            "id": "mariadb-1",
             "containers": [
                 {
-                    "name": "mariadb",
-                    "image": "kollaglue/fedora-rdo-mariadb",
                     "env": [
                         {
                             "name": "DB_ROOT_PASSWORD",
                             "value": "password"
                         }
                     ],
+                    "image": "kollaglue/fedora-rdo-mariadb",
+                    "name": "mariadb",
                     "ports": [
                         {
                             "containerPort": 3306
                         }
                     ]
                 }
-            ]
+            ],
+            "id": "mariadb-1",
+            "version": "v1beta1"
         }
     },
+    "id": "mariadb",
     "labels": {
-        "name": "mariadb-master"
+        "name": "mariadb"
     }
 }