home

commit e3005180a1de4cd55e06c492f09ec37e6d892a78
parent 7d724f1cc7b7a68c7134049c03b096e85c981287
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Thu,  1 Nov 2018 20:55:33 +0100

openshift: add package customization possibility

… also use openshift-edge in overlay.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
machines/wakasu.nix
 | 
2
+-
M
modules/profiles/openshift.nix
 | 
7
++++++-
M
overlays/sbr.nix
 | 
2
+-

3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/machines/wakasu.nix b/machines/wakasu.nix
@@ -18,7 +18,7 @@
     enable = true;
     docker = true;
     kubernetes = { enable = true; minikube.enable = true; };
-    openshift = { enable = true; minishift.enable = true; };
+    openshift = { enable = true; package = pkgs.openshift-edge; minishift.enable = true; };
   };
   profiles.media.enable = true;
   programs = {
diff --git a/modules/profiles/openshift.nix b/modules/profiles/openshift.nix
@@ -12,6 +12,11 @@ in
         description = "Enable openshift profile";
         type = types.bool;
       };
+      package = mkOption {
+        default = pkgs.openshift;
+        description = "Openshift package";
+        type = types.package;
+      };
       minishift = {
         enable = mkOption {
           default = false;
@@ -31,7 +36,7 @@ in
       profiles.containers.kubernetes.enable = true;
       home.packages = with pkgs; [
         s2i
-        openshift
+        cfg.package
       ];
     }
     (mkIf cfg.minishift.enable {
diff --git a/overlays/sbr.nix b/overlays/sbr.nix
@@ -30,7 +30,7 @@ self: super:
   kube-prompt = import ../pkgs/kube-prompt {
     inherit (self) stdenv lib buildGoPackage fetchFromGitHub;
   };
-  openshift = import ../pkgs/openshift {
+  openshift-edge = import ../pkgs/openshift {
     inherit (self) stdenv lib fetchFromGitHub removeReferencesTo which go_1_10 go-bindata makeWrapper rsync utillinux coreutils kerberos clang;
   };
   scripts = import ../pkgs/scripts {