From a17c83e793f0234f6cff02726c9b7d53b92a3304 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Mon, 7 Jan 2019 15:45:59 +0100
Subject: javascript: Update to node 10

---
 modules/development/javascript.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'modules/development')

diff --git a/modules/development/javascript.nix b/modules/development/javascript.nix
index 37b78656..7e9dcfb4 100644
--- a/modules/development/javascript.nix
+++ b/modules/development/javascript.nix
@@ -1,17 +1,17 @@
 { config, pkgs, ... }:
 
 { environment.systemPackages = with pkgs.unstable; [
-    nodejs-8_x
+    nodejs-10_x
 
-    nodePackages.tern
-    nodePackages.node2nix
-    nodePackages.nodemon
-    nodePackages.javascript-typescript-langserver
-    nodePackages.eslint_d
+    nodePackages_10_x.tern
+    nodePackages_10_x.node2nix
+    nodePackages_10_x.nodemon
+    nodePackages_10_x.javascript-typescript-langserver
+    nodePackages_10_x.eslint_d
 
-    nodePackages.node-gyp
-    nodePackages.node-gyp-build
-    nodePackages.node-pre-gyp
+    nodePackages_10_x.node-gyp
+    nodePackages_10_x.node-gyp-build
+    nodePackages_10_x.node-pre-gyp
   ] ++ (
     if stdenv.isDarwin
     then
-- 
cgit 1.4.1


From 828aa5453eb7301367d252ff839b38e01e3047a1 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Tue, 15 Jan 2019 11:04:52 +0100
Subject: Add kubernetes module for local infrastructure work

---
 modules/development/kubernetes.nix | 21 +++++++++++++++++++++
 satoshipad.nix                     |  1 +
 2 files changed, 22 insertions(+)
 create mode 100644 modules/development/kubernetes.nix

(limited to 'modules/development')

diff --git a/modules/development/kubernetes.nix b/modules/development/kubernetes.nix
new file mode 100644
index 00000000..692e46d6
--- /dev/null
+++ b/modules/development/kubernetes.nix
@@ -0,0 +1,21 @@
+{ config, pkgs, ... }:
+
+{
+  networking.bridges = {
+    cbr0.interfaces = [];
+  };
+  networking.interfaces = {
+    cbr0 = {
+      ipv4.addresses = [
+      { address = "10.10.0.1";
+        prefixLength = 24;
+      }
+      ];
+    };
+  };
+  services.kubernetes.roles = ["master" "node"];
+  services.kubernetes.kubelet.extraOpts = "--fail-swap-on=false";
+  virtualisation.docker.extraOptions = ''
+    --iptables=false --ip-masq=false -b cbr0
+  '';
+}
diff --git a/satoshipad.nix b/satoshipad.nix
index 68a9d683..e4a82246 100644
--- a/satoshipad.nix
+++ b/satoshipad.nix
@@ -13,6 +13,7 @@
     ./modules/development/base.nix
     ./modules/development/javascript.nix
     ./modules/development/lisp.nix
+    ./modules/development/kubernetes.nix
     ./modules/hardware/adb.nix
     ./modules/hardware/audio.nix
     ./modules/hardware/systemd-boot.nix
-- 
cgit 1.4.1