From c78209dd511d47954cf9e754a8a62165c8bdd454 Mon Sep 17 00:00:00 2001
From: Zach Wasserman <zach@fleetdm.com>
Date: Mon, 1 Feb 2021 19:21:17 -0800
Subject: [PATCH] Clean up development files (#259)

Remove unused files and update with new developer defaults
---
 Makefile                  | 11 -----------
 tools/app/development.yml | 27 ---------------------------
 tools/app/kolide.yaml     | 10 ----------
 tools/minikube.yaml       | 14 +++++++-------
 4 files changed, 7 insertions(+), 55 deletions(-)
 delete mode 100644 tools/app/development.yml
 delete mode 100644 tools/app/kolide.yaml

diff --git a/Makefile b/Makefile
index 01698af014..288d412cf5 100644
--- a/Makefile
+++ b/Makefile
@@ -195,17 +195,6 @@ docker-build-circle:
 	docker build -t "${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}" .
 	docker push "${DOCKER_IMAGE_NAME}:${DOCKER_IMAGE_TAG}"
 
-demo-dump:
-	mysqldump --extended-insert=FALSE --skip-dump-date \
-		-u kolide -p \
-		-h ${MYSQL_PORT_3306_TCP_ADDR} kolide \
-		> ./tools/app/demo.sql
-
-demo-restore:
-	mysql --binary-mode -u kolide -p \
-		-h ${MYSQL_PORT_3306_TCP_ADDR} kolide \
-		< ./tools/app/demo.sql
-
 .pre-binary-bundle:
 	rm -rf build/binary-bundle
 	mkdir -p build/binary-bundle/linux
diff --git a/tools/app/development.yml b/tools/app/development.yml
deleted file mode 100644
index 46f1259c83..0000000000
--- a/tools/app/development.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-mysql:
-  image: mysql:5.7.13
-  environment:
-    MYSQL_ROOT_PASSWORD: toor
-    MYSQL_DATABASE: kolide
-    MYSQL_USER: kolide
-    MYSQL_PASSWORD: kolide
-  ports:
-    - "3306:3306"
-
-mailhog:
-  image: mailhog/mailhog:latest
-  ports:
-    - "8025:8025"
-    - "1025:1025"
-
-test:
-   image: kolide/kolide-builder:1.6
-   environment:
-       MYSQL_ADDR: 127.0.0.1
-   links:
-       - mysql
-       - mailhog
-   command:
-       - -C
-   volumes:
-       - ./:/go/src/github.com/fleetdm/fleet
diff --git a/tools/app/kolide.yaml b/tools/app/kolide.yaml
deleted file mode 100644
index 212ad0f157..0000000000
--- a/tools/app/kolide.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-server:
-  cert: "./tools/osquery/kolide.crt"
-  key: "./tools/osquery/kolide.key"
-auth:
-  jwt_key: very secure dev setup jwt key
-osquery:
-  result_log_file: /tmp/osquery_result
-  status_log_file: /tmp/osquery_status
-logging:
-  debug: true
\ No newline at end of file
diff --git a/tools/minikube.yaml b/tools/minikube.yaml
index 6f619e8e8b..9b76545928 100644
--- a/tools/minikube.yaml
+++ b/tools/minikube.yaml
@@ -23,11 +23,11 @@ spec:
         - name: MYSQL_ROOT_PASSWORD
           value: "toor"
         - name: MYSQL_DATABASE
-          value: "kolide"
+          value: "fleet"
         - name: MYSQL_USER
-          value: "kolide"
+          value: "fleet"
         - name: MYSQL_PASSWORD
-          value: "kolide"
+          value: "insecure"
         args: ["mysqld", "--slow_query_log=1", "--log_output=TABLE", "--log-queries-not-using-indexes"]
         volumeMounts:
         - name: mysql-persistent-storage
@@ -92,11 +92,11 @@ spec:
         - name: MYSQL_ROOT_PASSWORD
           value: "toor"
         - name: MYSQL_DATABASE
-          value: "kolide"
+          value: "fleet"
         - name: MYSQL_USER
-          value: "kolide"
+          value: "fleet"
         - name: MYSQL_PASSWORD
-          value: "kolide"
+          value: "insecure"
         args: ["mysqld", "--slow_query_log=1", "--log_output=TABLE", "--log-queries-not-using-indexes"]
         ports:
         - containerPort: 3306
@@ -198,4 +198,4 @@ spec:
   ports:
     - port: 6379
   selector:
-    component: redis
\ No newline at end of file
+    component: redis