Parameterize cuda build chain (#178)

* Parameterize cuda build chain

* Lower the builds CPU reqs

Author: vpavlin

…ays/cuda/cuda-10-1-ubi7-build-chain.yaml …overlays/cuda/cuda-ubi7-build-chain.yamljupyterhub/notebook-images/overlays/cuda/cuda-10-1-ubi7-build-chain.yaml renamed to jupyterhub/notebook-images/overlays/cuda/cuda-ubi7-build-chain.yaml jupyterhub/notebook-images/overlays/cuda/cuda-10-1-ubi7-build-chain.yaml renamed to jupyterhub/notebook-images/overlays/cuda/cuda-ubi7-build-chain.yaml

@@ -4,7 +4,7 @@ items:
   kind: ImageStream
   metadata:
     labels:
-      appName: 10.1-cuda-chain-ubi7
+      appName: $(cuda_version)-cuda-chain-ubi7
       appTypes: cuda-build-chain
     name: cuda
   spec:
@@ -14,7 +14,7 @@ items:
   kind: ImageStream
   metadata:
     labels:
-      appName: 10.1-cuda-chain-ubi7
+      appName: $(cuda_version)-cuda-chain-ubi7
       appTypes: cuda-build-chain
     name: python-36-ubi7
   spec:
@@ -24,24 +24,24 @@ items:
   kind: BuildConfig
   metadata:
     labels:
-      appName: 10.1-cuda-chain-ubi7
-      appName1: 10.1-base-ubi7
+      appName: $(cuda_version)-cuda-chain-ubi7
+      appName1: $(cuda_version)-base-ubi7
       appTypes: cuda-build-chain
-    name: 10.1-base-ubi7
+    name: $(cuda_version)-base-ubi7
   spec:
     output:
       to:
         kind: ImageStreamTag
-        name: cuda:10.1-base-ubi7
+        name: cuda:$(cuda_version)-base-ubi7
     resources:
       limits:
-        cpu: "4"
+        cpu: "2"
         memory: 4Gi
       requests:
-        cpu: "4"
-        memory: 4Gi
+        cpu: "1"
+        memory: 2Gi
     source:
-      contextDir: 10.1/base
+      contextDir: $(cuda_version)/base
       git:
         ref: ubi7
         uri: https://github.com/harshad16/cuda.git
@@ -67,24 +67,24 @@ items:
   kind: BuildConfig
   metadata:
     labels:
-      appName: 10.1-cuda-chain-ubi7
-      appName1: 10.1-runtime-ubi7
+      appName: $(cuda_version)-cuda-chain-ubi7
+      appName1: $(cuda_version)-runtime-ubi7
       appTypes: cuda-build-chain
-    name: 10.1-runtime-ubi7
+    name: $(cuda_version)-runtime-ubi7
   spec:
     output:
       to:
         kind: ImageStreamTag
-        name: cuda:10.1-runtime-ubi7
+        name: cuda:$(cuda_version)-runtime-ubi7
     resources:
       limits:
-        cpu: "4"
+        cpu: "2"
         memory: 4Gi
       requests:
-        cpu: "4"
-        memory: 4Gi
+        cpu: "1"
+        memory: 2Gi
     source:
-      contextDir: 10.1/runtime/
+      contextDir: $(cuda_version)/runtime/
       git:
         ref: ubi7
         uri: https://github.com/harshad16/cuda.git
@@ -93,7 +93,7 @@ items:
       dockerStrategy:
         from:
           kind: ImageStreamTag
-          name: cuda:10.1-base-ubi7
+          name: cuda:$(cuda_version)-base-ubi7
         noCache: true
     triggers:
     - type: ConfigChange
@@ -105,24 +105,24 @@ items:
   kind: BuildConfig
   metadata:
     labels:
-      appName: 10.1-cuda-chain-ubi7
-      appName1: 10.1-cudnn7-runtime-ubi7
+      appName: $(cuda_version)-cuda-chain-ubi7
+      appName1: $(cuda_version)-cudnn7-runtime-ubi7
       appTypes: cuda-build-chain
-    name: 10.1-cudnn7-runtime-ubi7
+    name: $(cuda_version)-cudnn7-runtime-ubi7
   spec:
     output:
       to:
         kind: ImageStreamTag
-        name: cuda:10.1-cudnn7-runtime-ubi7
+        name: cuda:$(cuda_version)-cudnn7-runtime-ubi7
     resources:
       limits:
-        cpu: "4"
+        cpu: "2"
         memory: 4Gi
       requests:
-        cpu: "4"
-        memory: 4Gi
+        cpu: "1"
+        memory: 2Gi
     source:
-      contextDir: 10.1/runtime/cudnn7
+      contextDir: $(cuda_version)/runtime/cudnn7
       git:
         ref: ubi7
         uri: https://github.com/harshad16/cuda.git
@@ -131,7 +131,7 @@ items:
       dockerStrategy:
         from:
           kind: ImageStreamTag
-          name: cuda:10.1-runtime-ubi7
+          name: cuda:$(cuda_version)-runtime-ubi7
         noCache: true
     triggers:
     - type: ConfigChange
@@ -143,24 +143,24 @@ items:
   kind: BuildConfig
   metadata:
     labels:
-      appName: 10.1-cuda-chain-ubi7
-      appName1: 10.1-devel-ubi7
+      appName: $(cuda_version)-cuda-chain-ubi7
+      appName1: $(cuda_version)-devel-ubi7
       appTypes: cuda-build-chain
-    name: 10.1-devel-ubi7
+    name: $(cuda_version)-devel-ubi7
   spec:
     output:
       to:
         kind: ImageStreamTag
-        name: cuda:10.1-devel-ubi7
+        name: cuda:$(cuda_version)-devel-ubi7
     resources:
       limits:
-        cpu: "4"
+        cpu: "2"
         memory: 4Gi
       requests:
-        cpu: "4"
-        memory: 4Gi
+        cpu: "1"
+        memory: 2Gi
     source:
-      contextDir: 10.1/devel/
+      contextDir: $(cuda_version)/devel/
       git:
         ref: ubi7
         uri: https://github.com/harshad16/cuda.git
@@ -169,7 +169,7 @@ items:
       dockerStrategy:
         from:
           kind: ImageStreamTag
-          name: cuda:10.1-runtime-ubi7
+          name: cuda:$(cuda_version)-runtime-ubi7
         noCache: true
     triggers:
     - type: ConfigChange
@@ -181,24 +181,24 @@ items:
   kind: BuildConfig
   metadata:
     labels:
-      appName: 10.1-cuda-chain-ubi7
-      appName1: 10.1-cudnn7-devel-ubi7
+      appName: $(cuda_version)-cuda-chain-ubi7
+      appName1: $(cuda_version)-cudnn7-devel-ubi7
       appTypes: cuda-build-chain
-    name: 10.1-cudnn7-devel-ubi7
+    name: $(cuda_version)-cudnn7-devel-ubi7
   spec:
     output:
       to:
         kind: ImageStreamTag
-        name: cuda:10.1-cudnn7-devel-ubi7
+        name: cuda:$(cuda_version)-cudnn7-devel-ubi7
     resources:
       limits:
-        cpu: "4"
+        cpu: "2"
         memory: 4Gi
       requests:
-        cpu: "4"
-        memory: 4Gi
+        cpu: "1"
+        memory: 2Gi
     source:
-      contextDir: 10.1/devel/cudnn7
+      contextDir: $(cuda_version)/devel/cudnn7
       git:
         ref: ubi7
         uri: https://github.com/harshad16/cuda.git
@@ -207,7 +207,7 @@ items:
       dockerStrategy:
         from:
           kind: ImageStreamTag
-          name: cuda:10.1-devel-ubi7
+          name: cuda:$(cuda_version)-devel-ubi7
         noCache: true
     triggers:
     - type: ConfigChange
@@ -219,7 +219,7 @@ items:
   kind: BuildConfig
   metadata:
     labels:
-      appName: 10.1-cuda-chain-ubi7
+      appName: $(cuda_version)-cuda-chain-ubi7
       appName1: python-36-ubi7
       appTypes: cuda-build-chain
     name: python-36-ubi7
@@ -230,11 +230,11 @@ items:
         name: python-36-ubi7:latest
     resources:
       limits:
-        cpu: "4"
+        cpu: "2"
         memory: 4Gi
       requests:
-        cpu: "4"
-        memory: 4Gi
+        cpu: "1"
+        memory: 2Gi
     source:
       contextDir: "3.6"
       git:
@@ -246,7 +246,7 @@ items:
         dockerfilePath: Dockerfile.rhel7
         from:
           kind: ImageStreamTag
-          name: cuda:10.1-cudnn7-devel-ubi7
+          name: cuda:$(cuda_version)-cudnn7-devel-ubi7
         noCache: true
     triggers:
     - type: ConfigChange

jupyterhub/notebook-images/overlays/cuda/kustomization.yaml

@@ -3,5 +3,22 @@ kind: Kustomization
 bases:
 - ../../base
 resources:
-- cuda-10-1-ubi7-build-chain.yaml
+- cuda-ubi7-build-chain.yaml
 - tensorflow-gpu-notebook.yaml
+
+configMapGenerator:
+- name: parameters
+  env: params.env
+generatorOptions:
+  disableNameSuffixHash: true
+
+vars:
+- name: cuda_version
+  objref:
+    kind: ConfigMap
+    name: parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.cuda_version
+configurations:
+- params.yaml

jupyterhub/notebook-images/overlays/cuda/params.env

@@ -0,0 +1 @@
+cuda_version=10.1

jupyterhub/notebook-images/overlays/cuda/params.yaml

@@ -0,0 +1,18 @@
+varReference:
+- path: metadata/labels/*
+  kind: ImageStream
+- path: metadata/name
+  kind: ImageStream
+- path: spec/*
+  kind: ImageStream
+
+- path: metadata/labels/*
+  kind: BuildConfig
+- path: metadata/name
+  kind: BuildConfig
+- path: spec/output/to/name
+  kind: BuildConfig
+- path: spec/source/contextDir
+  kind: BuildConfig
+- path: spec/strategy/dockerStrategy/from/name
+  kind: BuildConfig