updates on gpu buildconfigs and imagestreams

Signed-off-by: Harshad Reddy Nalla <[email protected]>
red-hat-data-services · Apr 26, 2021 · 3c29f5e · 3c29f5e
1 parent 5758d4b
commit 3c29f5e
Show file tree

Hide file tree

Showing 2 changed files with 161 additions and 85 deletions.
diff --git a/jupyterhub/notebook-images/overlays/cuda-11.0.3/cuda-ubi8-build-chain.yaml b/jupyterhub/notebook-images/overlays/cuda-11.0.3/cuda-ubi8-build-chain.yaml
@@ -9,143 +9,201 @@ items:
       local: true
     tags:
     - name: latest
+      annotations: null
       from:
         kind: DockerImage
-        name: "nvcr.io/nvidia/cuda:$(cuda_version)-cudnn8-devel-ubi8"
+        name: 'nvcr.io/nvidia/cuda:$(cuda_version)-cudnn8-devel-ubi8'
+      generation: 2
       importPolicy: {}
       referencePolicy:
-        type: Local
+        type: Source
 - kind: ImageStream
   apiVersion: image.openshift.io/v1
   metadata:
     name: "$(cuda_version)-cuda-s2i-core-ubi8"
   spec:
     lookupPolicy:
       local: true
+    tags:
+      - name: latest
+        annotations: null
+        generation: 1
+        importPolicy: {}
+        referencePolicy:
+          type: Local
 - kind: ImageStream
   apiVersion: image.openshift.io/v1
   metadata:
     name: "$(cuda_version)-cuda-s2i-base-ubi8"
   spec:
     lookupPolicy:
       local: true
+    tags:
+      - name: latest
+        annotations: null
+        generation: 1
+        importPolicy: {}
+        referencePolicy:
+          type: Local
 - kind: ImageStream
   apiVersion: image.openshift.io/v1
   metadata:
     name: "$(cuda_version)-cuda-s2i-py38-ubi8"
   spec:
     lookupPolicy:
       local: true
+    tags:
+      - name: latest
+        annotations: null
+        generation: 1
+        importPolicy: {}
+        referencePolicy:
+          type: Local
 - kind: ImageStream
   apiVersion: image.openshift.io/v1
   metadata:
     name: "$(cuda_version)-cuda-s2i-thoth-ubi8-py38"
   spec:
     lookupPolicy:
       local: true
+    tags:
+      - name: latest
+        annotations: null
+        generation: 1
+        importPolicy: {}
+        referencePolicy:
+          type: Local
 - kind: BuildConfig
   apiVersion: build.openshift.io/v1
   metadata:
     name: "$(cuda_version)-cuda-s2i-core-ubi8"
   spec:
-    triggers:
-      - imageChange: {}
-        type: ImageChange
-    source:
-      type: Git
-      git:
-        uri: "https://github.com/sclorg/s2i-base-container"
-        ref: "master"
-      contextDir: "core/"
+    nodeSelector: null
+    output:
+      to:
+        kind: ImageStreamTag
+        name: '$(cuda_version)-cuda-s2i-core-ubi8:latest'
+    resources: {}
+    completionDeadlineSeconds: 1800
+    successfulBuildsHistoryLimit: 1
+    failedBuildsHistoryLimit: 1
     strategy:
       type: Docker
       dockerStrategy:
-        noCache: true
-        dockerfilePath: "Dockerfile.rhel8"
         from:
           kind: ImageStreamTag
-          name: nvidia-cuda-$(cuda_version):latest
-    output:
-      to:
-        kind: ImageStreamTag
-        name: $(cuda_version)-cuda-s2i-core-ubi8:latest
+          name: 'nvidia-cuda-$(cuda_version):latest'
+        noCache: true
+        dockerfilePath: Dockerfile.rhel8
+    postCommit: {}
+    source:
+      type: Git
+      git:
+        uri: 'https://github.com/sclorg/s2i-base-container'
+        ref: master
+      contextDir: core
+    triggers:
+      - type: ImageChange
+        imageChange: {}
+    runPolicy: SerialLatestOnly
 - kind: BuildConfig
   apiVersion: build.openshift.io/v1
   metadata:
     name: "$(cuda_version)-cuda-s2i-base-ubi8"
   spec:
-    triggers:
-      - imageChange: {}
-        type: ImageChange
-    source:
-      type: Git
-      git:
-        uri: "https://github.com/sclorg/s2i-base-container"
-        ref: "master"
-      contextDir: "base/"
+    nodeSelector: null
+    output:
+      to:
+        kind: ImageStreamTag
+        name: '$(cuda_version)-cuda-s2i-base-ubi8:latest'
+    resources: {}
+    completionDeadlineSeconds: 1800
+    successfulBuildsHistoryLimit: 1
+    failedBuildsHistoryLimit: 1
     strategy:
       type: Docker
       dockerStrategy:
-        noCache: true
-        dockerfilePath: "Dockerfile.rhel8"
         from:
           kind: ImageStreamTag
-          name: $(cuda_version)-cuda-s2i-core-ubi8:latest
-    output:
-      to:
-        kind: ImageStreamTag
-        name: $(cuda_version)-cuda-s2i-base-ubi8:latest
+          name: '$(cuda_version)-cuda-s2i-core-ubi8:latest'
+        noCache: true
+        dockerfilePath: Dockerfile.rhel8
+    postCommit: {}
+    source:
+      type: Git
+      git:
+        uri: 'https://github.com/sclorg/s2i-base-container'
+        ref: master
+      contextDir: base
+    triggers:
+      - type: ImageChange
+        imageChange: {}
+    runPolicy: SerialLatestOnly
 - kind: BuildConfig
   apiVersion: build.openshift.io/v1
   metadata:
     name: "$(cuda_version)-cuda-s2i-py38-ubi8"
   spec:
-    triggers:
-      - imageChange: {}
-        type: ImageChange
-    source:
-      type: Git
-      git:
-        uri: "https://github.com/sclorg/s2i-python-container"
-        ref: "master"
-      contextDir: "3.8/"
+    nodeSelector: null
+    output:
+      to:
+        kind: ImageStreamTag
+        name: '$(cuda_version)-cuda-s2i-py38-ubi8:latest'
+    resources: {}
+    completionDeadlineSeconds: 1800
+    successfulBuildsHistoryLimit: 1
+    failedBuildsHistoryLimit: 1
     strategy:
       type: Docker
       dockerStrategy:
-        noCache: true
-        dockerfilePath: "Dockerfile.rhel8"
         from:
           kind: ImageStreamTag
-          name: $(cuda_version)-cuda-s2i-base-ubi8:latest
-    output:
-      to:
-        kind: ImageStreamTag
-        name: $(cuda_version)-cuda-s2i-py38-ubi8:latest
+          name: '$(cuda_version)-cuda-s2i-base-ubi8:latest'
+        noCache: true
+        dockerfilePath: Dockerfile.rhel8
+    postCommit: {}
+    source:
+      type: Git
+      git:
+        uri: 'https://github.com/sclorg/s2i-python-container'
+        ref: master
+      contextDir: '3.8'
+    triggers:
+      - type: ImageChange
+        imageChange: {}
+    runPolicy: SerialLatestOnly
 - kind: BuildConfig
   apiVersion: build.openshift.io/v1
   metadata:
     name: "$(cuda_version)-cuda-s2i-thoth-ubi8-py38"
   spec:
-    triggers:
-      - imageChange: {}
-        type: ImageChange
-    source:
-      type: Git
-      git:
-        uri: "https://github.com/thoth-station/s2i-thoth"
-        ref: "v0.26.0"
-      contextDir: "ubi8-py38/"
+    nodeSelector: null
+    output:
+      to:
+        kind: ImageStreamTag
+        name: '$(cuda_version)-cuda-s2i-thoth-ubi8-py38:latest'
+    resources: {}
+    completionDeadlineSeconds: 1800
+    successfulBuildsHistoryLimit: 1
+    failedBuildsHistoryLimit: 1
     strategy:
       type: Docker
       dockerStrategy:
-        noCache: true
-        dockerfilePath: "Dockerfile"
         from:
           kind: ImageStreamTag
-          name: "$(cuda_version)-cuda-s2i-py38-ubi8:latest"
-    output:
-      to:
-        kind: ImageStreamTag
-        name: "$(cuda_version)-cuda-s2i-thoth-ubi8-py38:latest"
+          name: '$(cuda_version)-cuda-s2i-py38-ubi8:latest'
+        noCache: true
+        dockerfilePath: Dockerfile
+    postCommit: {}
+    source:
+      type: Git
+      git:
+        uri: 'https://github.com/thoth-station/s2i-thoth'
+        ref: v0.26.0
+      contextDir: ubi8-py38
+    triggers:
+      - type: ImageChange
+        imageChange: {}
+    runPolicy: SerialLatestOnly
 kind: List
 metadata: {}
diff --git a/jupyterhub/notebook-images/overlays/cuda-11.0.3/gpu-notebook.yaml b/jupyterhub/notebook-images/overlays/cuda-11.0.3/gpu-notebook.yaml
@@ -72,10 +72,17 @@ items:
   metadata:
     name: s2i-minimal-gpu-cuda-$(cuda_version)-notebook
   spec:
+    nodeSelector: null
     output:
       to:
         kind: ImageStreamTag
         name: 'minimal-gpu:py3.8-cuda-$(cuda_version)'
+    resources:
+      requests:
+        memory: 4Gi
+    completionDeadlineSeconds: 1800
+    successfulBuildsHistoryLimit: 1
+    failedBuildsHistoryLimit: 1
     strategy:
       type: Docker
       dockerStrategy:
@@ -84,70 +91,81 @@ items:
           name: '$(cuda_version)-cuda-s2i-thoth-ubi8-py38:latest'
         noCache: true
         dockerfilePath: Dockerfile
+    postCommit: {}
     source:
       type: Git
       git:
-        ref: python38
         uri: 'https://github.com/thoth-station/s2i-minimal-notebook'
+        ref: python38
     triggers:
-      - type: ConfigChange
       - type: ImageChange
-    resources:
-      requests:
-        memory: 4Gi
+        imageChange: {}
+    runPolicy: SerialLatestOnly
 - kind: BuildConfig
   apiVersion: build.openshift.io/v1
   metadata:
     name: s2i-tensorflow-gpu-cuda-$(cuda_version)-notebook
   spec:
+    nodeSelector: null
     output:
       to:
         kind: ImageStreamTag
         name: 'tensorflow-gpu:py3.8-cuda-$(cuda_version)'
+    resources:
+      limits:
+        memory: 8Gi
+      requests:
+        memory: 6Gi
+    completionDeadlineSeconds: 1800
+    successfulBuildsHistoryLimit: 1
+    failedBuildsHistoryLimit: 1
     strategy:
       type: Source
       sourceStrategy:
         from:
           kind: ImageStreamTag
           name: 'minimal-gpu:py3.8-cuda-$(cuda_version)'
+    postCommit: {}
     source:
       type: Git
       git:
-        ref: python38
         uri: 'https://github.com/thoth-station/s2i-tensorflow-gpu-notebook'
+        ref: python38
     triggers:
-      - type: ConfigChange
       - type: ImageChange
-    resources:
-      limits:
-        memory: 8Gi
-      requests:
-        memory: 6Gi
+        imageChange: {}
+    runPolicy: SerialLatestOnly
 - kind: BuildConfig
   apiVersion: build.openshift.io/v1
   metadata:
     name: s2i-pytorch-gpu-cuda-$(cuda_version)-notebook
   spec:
+    nodeSelector: null
     output:
       to:
         kind: ImageStreamTag
         name: 'pytorch-gpu:py3.8-cuda-$(cuda_version)'
+    resources:
+      limits:
+        memory: 8Gi
+      requests:
+        memory: 6Gi
+    completionDeadlineSeconds: 1800
+    successfulBuildsHistoryLimit: 1
+    failedBuildsHistoryLimit: 1
     strategy:
       type: Source
       sourceStrategy:
         from:
           kind: ImageStreamTag
           name: 'minimal-gpu:py3.8-cuda-$(cuda_version)'
+    postCommit: {}
     source:
       type: Git
       git:
-        ref: python38
         uri: 'https://github.com/thoth-station/s2i-pytorch-notebook'
+        ref: python38
     triggers:
-      - type: ConfigChange
       - type: ImageChange
-    resources:
-      limits:
-        memory: 8Gi
-      requests:
-        memory: 6Gi
+        imageChange: {}
+    runPolicy: SerialLatestOnly