From 6233b596466c839e09b74b495bace7863b468387 Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Fri, 1 Nov 2024 11:26:00 -0500 Subject: [PATCH 1/9] update: for overlays --- .../{ => base}/build-config.yaml | 0 .../{ => base}/deployment.yaml | 0 .../{ => base}/image-stream.yaml | 0 .../{ => base}/kustomization.yaml | 0 .../{ => base}/route.yaml | 0 .../{ => base}/service.yaml | 0 .../{ => base}/deployment.yaml | 20 ++++++++++++------- .../{ => base}/kustomization.yaml | 2 +- .../notebook-standalone/{ => base}/pvc.yaml | 2 -- .../notebook-standalone/{ => base}/route.yaml | 0 .../{ => base}/service.yaml | 0 .../{ => base}/template.yaml | 0 .../overlays/default/kustomization.yaml | 5 +++++ .../overlays/gpu/kustomization.yaml | 5 +++++ 14 files changed, 24 insertions(+), 10 deletions(-) rename components/app-configs/notebook-nvidia-nemo/{ => base}/build-config.yaml (100%) rename components/app-configs/notebook-nvidia-nemo/{ => base}/deployment.yaml (100%) rename components/app-configs/notebook-nvidia-nemo/{ => base}/image-stream.yaml (100%) rename components/app-configs/notebook-nvidia-nemo/{ => base}/kustomization.yaml (100%) rename components/app-configs/notebook-nvidia-nemo/{ => base}/route.yaml (100%) rename components/app-configs/notebook-nvidia-nemo/{ => base}/service.yaml (100%) rename components/app-configs/notebook-standalone/{ => base}/deployment.yaml (72%) rename components/app-configs/notebook-standalone/{ => base}/kustomization.yaml (87%) rename components/app-configs/notebook-standalone/{ => base}/pvc.yaml (88%) rename components/app-configs/notebook-standalone/{ => base}/route.yaml (100%) rename components/app-configs/notebook-standalone/{ => base}/service.yaml (100%) rename components/app-configs/notebook-standalone/{ => base}/template.yaml (100%) create mode 100644 components/app-configs/notebook-standalone/overlays/default/kustomization.yaml create mode 100644 components/app-configs/notebook-standalone/overlays/gpu/kustomization.yaml diff --git a/components/app-configs/notebook-nvidia-nemo/build-config.yaml b/components/app-configs/notebook-nvidia-nemo/base/build-config.yaml similarity index 100% rename from components/app-configs/notebook-nvidia-nemo/build-config.yaml rename to components/app-configs/notebook-nvidia-nemo/base/build-config.yaml diff --git a/components/app-configs/notebook-nvidia-nemo/deployment.yaml b/components/app-configs/notebook-nvidia-nemo/base/deployment.yaml similarity index 100% rename from components/app-configs/notebook-nvidia-nemo/deployment.yaml rename to components/app-configs/notebook-nvidia-nemo/base/deployment.yaml diff --git a/components/app-configs/notebook-nvidia-nemo/image-stream.yaml b/components/app-configs/notebook-nvidia-nemo/base/image-stream.yaml similarity index 100% rename from components/app-configs/notebook-nvidia-nemo/image-stream.yaml rename to components/app-configs/notebook-nvidia-nemo/base/image-stream.yaml diff --git a/components/app-configs/notebook-nvidia-nemo/kustomization.yaml b/components/app-configs/notebook-nvidia-nemo/base/kustomization.yaml similarity index 100% rename from components/app-configs/notebook-nvidia-nemo/kustomization.yaml rename to components/app-configs/notebook-nvidia-nemo/base/kustomization.yaml diff --git a/components/app-configs/notebook-nvidia-nemo/route.yaml b/components/app-configs/notebook-nvidia-nemo/base/route.yaml similarity index 100% rename from components/app-configs/notebook-nvidia-nemo/route.yaml rename to components/app-configs/notebook-nvidia-nemo/base/route.yaml diff --git a/components/app-configs/notebook-nvidia-nemo/service.yaml b/components/app-configs/notebook-nvidia-nemo/base/service.yaml similarity index 100% rename from components/app-configs/notebook-nvidia-nemo/service.yaml rename to components/app-configs/notebook-nvidia-nemo/base/service.yaml diff --git a/components/app-configs/notebook-standalone/deployment.yaml b/components/app-configs/notebook-standalone/base/deployment.yaml similarity index 72% rename from components/app-configs/notebook-standalone/deployment.yaml rename to components/app-configs/notebook-standalone/base/deployment.yaml index dd41dd02..5003b6d4 100644 --- a/components/app-configs/notebook-standalone/deployment.yaml +++ b/components/app-configs/notebook-standalone/base/deployment.yaml @@ -42,11 +42,17 @@ spec: cpu: '2' memory: 2Gi volumeMounts: - - mountPath: /opt/app-root/src - name: jupyter + volumeMounts: + - name: shm + mountPath: /dev/shm + - name: home + mountPath: /opt/app-root/src + subPath: data volumes: - - persistentVolumeClaim: - claimName: jupyter - name: jupyter - - name: empty - emptyDir: {} + - name: shm + emptyDir: + medium: Memory + sizeLimit: 512Mi + - name: home + persistentVolumeClaim: + claimName: jupyter diff --git a/components/app-configs/notebook-standalone/kustomization.yaml b/components/app-configs/notebook-standalone/base/kustomization.yaml similarity index 87% rename from components/app-configs/notebook-standalone/kustomization.yaml rename to components/app-configs/notebook-standalone/base/kustomization.yaml index ff5f545b..670f4d69 100644 --- a/components/app-configs/notebook-standalone/kustomization.yaml +++ b/components/app-configs/notebook-standalone/base/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization labels: -- includeSelectors: false +- includeSelectors: true pairs: component: jupyter diff --git a/components/app-configs/notebook-standalone/pvc.yaml b/components/app-configs/notebook-standalone/base/pvc.yaml similarity index 88% rename from components/app-configs/notebook-standalone/pvc.yaml rename to components/app-configs/notebook-standalone/base/pvc.yaml index 5ac479c5..b1e521cb 100644 --- a/components/app-configs/notebook-standalone/pvc.yaml +++ b/components/app-configs/notebook-standalone/base/pvc.yaml @@ -3,8 +3,6 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: jupyter - labels: - app: jupyter annotations: argocd.argoproj.io/sync-wave: "1" spec: diff --git a/components/app-configs/notebook-standalone/route.yaml b/components/app-configs/notebook-standalone/base/route.yaml similarity index 100% rename from components/app-configs/notebook-standalone/route.yaml rename to components/app-configs/notebook-standalone/base/route.yaml diff --git a/components/app-configs/notebook-standalone/service.yaml b/components/app-configs/notebook-standalone/base/service.yaml similarity index 100% rename from components/app-configs/notebook-standalone/service.yaml rename to components/app-configs/notebook-standalone/base/service.yaml diff --git a/components/app-configs/notebook-standalone/template.yaml b/components/app-configs/notebook-standalone/base/template.yaml similarity index 100% rename from components/app-configs/notebook-standalone/template.yaml rename to components/app-configs/notebook-standalone/base/template.yaml diff --git a/components/app-configs/notebook-standalone/overlays/default/kustomization.yaml b/components/app-configs/notebook-standalone/overlays/default/kustomization.yaml new file mode 100644 index 00000000..2b87e6b1 --- /dev/null +++ b/components/app-configs/notebook-standalone/overlays/default/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- ../../base diff --git a/components/app-configs/notebook-standalone/overlays/gpu/kustomization.yaml b/components/app-configs/notebook-standalone/overlays/gpu/kustomization.yaml new file mode 100644 index 00000000..2b87e6b1 --- /dev/null +++ b/components/app-configs/notebook-standalone/overlays/gpu/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- ../../base From 97a7a3556e600e62ac550f9d86e8eaffe7a97e82 Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Fri, 1 Nov 2024 12:03:20 -0500 Subject: [PATCH 2/9] refactor --- .../notebook-nvidia-nemo/base/deployment.yaml | 93 ------------------- .../base/kustomization.yaml | 13 --- .../notebook-nvidia-nemo/base/route.yaml | 20 ---- .../notebook-nvidia-nemo/base/service.yaml | 18 ---- .../notebook-standalone/base/deployment.yaml | 67 +++++++------ .../notebook-standalone/base/pvc.yaml | 2 +- .../notebook-standalone/base/route.yaml | 12 +-- .../notebook-standalone/base/service.yaml | 8 +- .../components/nemo-build}/build-config.yaml | 2 +- .../components/nemo-build}/image-stream.yaml | 0 .../overlays/gpu/kustomization.yaml | 5 + .../overlays/gpu/patch-deployment.yaml | 31 +++++++ 12 files changed, 85 insertions(+), 186 deletions(-) delete mode 100644 components/app-configs/notebook-nvidia-nemo/base/deployment.yaml delete mode 100644 components/app-configs/notebook-nvidia-nemo/base/kustomization.yaml delete mode 100644 components/app-configs/notebook-nvidia-nemo/base/route.yaml delete mode 100644 components/app-configs/notebook-nvidia-nemo/base/service.yaml rename components/app-configs/{notebook-nvidia-nemo/base => notebook-standalone/components/nemo-build}/build-config.yaml (88%) rename components/app-configs/{notebook-nvidia-nemo/base => notebook-standalone/components/nemo-build}/image-stream.yaml (100%) create mode 100644 components/app-configs/notebook-standalone/overlays/gpu/patch-deployment.yaml diff --git a/components/app-configs/notebook-nvidia-nemo/base/deployment.yaml b/components/app-configs/notebook-nvidia-nemo/base/deployment.yaml deleted file mode 100644 index ded0d208..00000000 --- a/components/app-configs/notebook-nvidia-nemo/base/deployment.yaml +++ /dev/null @@ -1,93 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: nemo-notebook - labels: - deployment: nemo-notebook - annotations: - argocd.argoproj.io/sync-wave: "1" - image.openshift.io/triggers: >- - [{"from":{"kind":"ImageStreamTag","name":"nemo:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"nemo\")].image","paused":"false"}] -spec: - replicas: 1 - selector: - matchLabels: - deployment: nemo-notebook - strategy: - # type: RollingUpdate - type: Recreate - template: - metadata: - labels: - deployment: nemo-notebook - spec: - restartPolicy: Always - containers: - - name: nemo - image: nvcr.io/nvidia/nemo:dev - imagePullPolicy: IfNotPresent - env: - - name: HOME - value: /workspace - command: - - /bin/sh - - -c - - | - #!/bin/sh - jupyter lab \ - --ServerApp.ip=0.0.0.0 \ - --ServerApp.allow_origin="*" \ - --ServerApp.open_browser=False \ - --ServerApp.token='' - ports: - - name: http - containerPort: 8888 - protocol: TCP - resources: - limits: - cpu: '2' - memory: 8Gi - requests: - cpu: '1' - memory: 4Gi - # startupProbe: - # httpGet: - # path: /health - # port: http - # scheme: HTTP - # timeoutSeconds: 1 - # periodSeconds: 30 - # successThreshold: 1 - # failureThreshold: 10 - # readinessProbe: - # httpGet: - # path: /health - # port: http - # scheme: HTTP - # timeoutSeconds: 5 - # periodSeconds: 30 - # successThreshold: 1 - # failureThreshold: 3 - # livenessProbe: - # httpGet: - # path: /health - # port: http - # scheme: HTTP - # timeoutSeconds: 8 - # periodSeconds: 100 - # successThreshold: 1 - # failureThreshold: 3 - volumeMounts: - - name: shm - mountPath: /dev/shm - - name: home - mountPath: /workspace - subPath: cache - volumes: - - name: shm - emptyDir: - medium: Memory - sizeLimit: 512Mi - - name: home - emptyDir: {} diff --git a/components/app-configs/notebook-nvidia-nemo/base/kustomization.yaml b/components/app-configs/notebook-nvidia-nemo/base/kustomization.yaml deleted file mode 100644 index 9a60dd7a..00000000 --- a/components/app-configs/notebook-nvidia-nemo/base/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -labels: -- includeSelectors: false - pairs: - component: jupyter - -resources: -- deployment.yaml -- image-stream.yaml -- route.yaml -- service.yaml diff --git a/components/app-configs/notebook-nvidia-nemo/base/route.yaml b/components/app-configs/notebook-nvidia-nemo/base/route.yaml deleted file mode 100644 index 958f7491..00000000 --- a/components/app-configs/notebook-nvidia-nemo/base/route.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -apiVersion: route.openshift.io/v1 -kind: Route -metadata: - name: nemo-notebook - labels: - deployment: nemo-notebook - annotations: - argocd.argoproj.io/sync-wave: "1" -spec: - port: - targetPort: 8888 - tls: - insecureEdgeTerminationPolicy: Redirect - termination: edge - to: - kind: Service - name: nemo-notebook - weight: 100 - wildcardPolicy: None diff --git a/components/app-configs/notebook-nvidia-nemo/base/service.yaml b/components/app-configs/notebook-nvidia-nemo/base/service.yaml deleted file mode 100644 index dee9c4ff..00000000 --- a/components/app-configs/notebook-nvidia-nemo/base/service.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - annotations: - argocd.argoproj.io/sync-wave: "1" - labels: - deployment: nemo-notebook - name: nemo-notebook -spec: - ports: - - name: http - port: 8888 - targetPort: 8888 - selector: - deployment: nemo-notebook - sessionAffinity: None - type: ClusterIP diff --git a/components/app-configs/notebook-standalone/base/deployment.yaml b/components/app-configs/notebook-standalone/base/deployment.yaml index 5003b6d4..3289a33d 100644 --- a/components/app-configs/notebook-standalone/base/deployment.yaml +++ b/components/app-configs/notebook-standalone/base/deployment.yaml @@ -2,30 +2,19 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: jupyter - labels: - app: jupyter + name: notebook annotations: argocd.argoproj.io/sync-wave: "1" + # image.openshift.io/triggers: >- + # [{"from":{"kind":"ImageStreamTag","name":"nemo:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"nemo\")].image","paused":"false"}] spec: replicas: 1 - selector: - matchLabels: - app: jupyter strategy: type: Recreate template: - metadata: - labels: - app: jupyter spec: containers: - - name: jupyter - # args: - # - jupyter server /data --console-address :9090 - # command: - # - /bin/bash - # - -c + - name: notebook image: quay.io/opendatahub-contrib/workbench-images:rstudio-c9s-py39_2023b_latest ports: - containerPort: 8787 @@ -35,19 +24,45 @@ spec: protocol: TCP name: demo resources: - requests: - cpu: 200m - memory: 1Gi limits: cpu: '2' - memory: 2Gi + memory: 8Gi + requests: + cpu: 500m + memory: 8Gi + # startupProbe: + # httpGet: + # path: /health + # port: http + # scheme: HTTP + # timeoutSeconds: 1 + # periodSeconds: 30 + # successThreshold: 1 + # failureThreshold: 10 + # readinessProbe: + # httpGet: + # path: /health + # port: http + # scheme: HTTP + # timeoutSeconds: 5 + # periodSeconds: 30 + # successThreshold: 1 + # failureThreshold: 3 + # livenessProbe: + # httpGet: + # path: /health + # port: http + # scheme: HTTP + # timeoutSeconds: 8 + # periodSeconds: 100 + # successThreshold: 1 + # failureThreshold: 3 volumeMounts: - volumeMounts: - - name: shm - mountPath: /dev/shm - - name: home - mountPath: /opt/app-root/src - subPath: data + - name: shm + mountPath: /dev/shm + # - name: home + # mountPath: /opt/app-root/src + # subPath: data volumes: - name: shm emptyDir: @@ -55,4 +70,4 @@ spec: sizeLimit: 512Mi - name: home persistentVolumeClaim: - claimName: jupyter + claimName: notebook diff --git a/components/app-configs/notebook-standalone/base/pvc.yaml b/components/app-configs/notebook-standalone/base/pvc.yaml index b1e521cb..621536a0 100644 --- a/components/app-configs/notebook-standalone/base/pvc.yaml +++ b/components/app-configs/notebook-standalone/base/pvc.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: jupyter + name: notebook annotations: argocd.argoproj.io/sync-wave: "1" spec: diff --git a/components/app-configs/notebook-standalone/base/route.yaml b/components/app-configs/notebook-standalone/base/route.yaml index 0e6971ec..2ed290ed 100644 --- a/components/app-configs/notebook-standalone/base/route.yaml +++ b/components/app-configs/notebook-standalone/base/route.yaml @@ -2,9 +2,7 @@ apiVersion: route.openshift.io/v1 kind: Route metadata: - name: jupyter - labels: - app: jupyter + name: notebook annotations: argocd.argoproj.io/sync-wave: "1" spec: @@ -15,16 +13,14 @@ spec: termination: edge to: kind: Service - name: jupyter + name: notebook weight: 100 wildcardPolicy: None --- apiVersion: route.openshift.io/v1 kind: Route metadata: - name: jupyter-demo - labels: - app: jupyter + name: notebook-demo annotations: argocd.argoproj.io/sync-wave: "1" spec: @@ -35,6 +31,6 @@ spec: termination: edge to: kind: Service - name: jupyter + name: notebook weight: 100 wildcardPolicy: None diff --git a/components/app-configs/notebook-standalone/base/service.yaml b/components/app-configs/notebook-standalone/base/service.yaml index 6fe89ab4..12c598f1 100644 --- a/components/app-configs/notebook-standalone/base/service.yaml +++ b/components/app-configs/notebook-standalone/base/service.yaml @@ -4,10 +4,8 @@ kind: Service metadata: annotations: argocd.argoproj.io/sync-wave: "1" - service.alpha.openshift.io/serving-cert-secret-name: jupyter - labels: - app: jupyter - name: jupyter + service.alpha.openshift.io/serving-cert-secret-name: notebook + name: notebook spec: ports: - name: demo @@ -19,7 +17,5 @@ spec: - name: oauth-proxy port: 8080 targetPort: 8080 - selector: - app: jupyter sessionAffinity: None type: ClusterIP diff --git a/components/app-configs/notebook-nvidia-nemo/base/build-config.yaml b/components/app-configs/notebook-standalone/components/nemo-build/build-config.yaml similarity index 88% rename from components/app-configs/notebook-nvidia-nemo/base/build-config.yaml rename to components/app-configs/notebook-standalone/components/nemo-build/build-config.yaml index 99a541ce..b7673797 100644 --- a/components/app-configs/notebook-nvidia-nemo/base/build-config.yaml +++ b/components/app-configs/notebook-standalone/components/nemo-build/build-config.yaml @@ -14,7 +14,7 @@ spec: dockerfile: | FROM nvcr.io/nvidia/nemo:dev ENV HOME=/workspace - ENTRYPOINT jupyter lab --ServerApp.ip=0.0.0.0 --ServerApp.allow_origin="*" --ServerApp.open_browser=False --ServerApp.token='' + ENTRYPOINT jupyter lab --ServerApp.ip=0.0.0.0 --ServerApp.port=8787 --ServerApp.allow_origin="*" --ServerApp.open_browser=False --ServerApp.token='' strategy: type: Docker dockerStrategy: diff --git a/components/app-configs/notebook-nvidia-nemo/base/image-stream.yaml b/components/app-configs/notebook-standalone/components/nemo-build/image-stream.yaml similarity index 100% rename from components/app-configs/notebook-nvidia-nemo/base/image-stream.yaml rename to components/app-configs/notebook-standalone/components/nemo-build/image-stream.yaml diff --git a/components/app-configs/notebook-standalone/overlays/gpu/kustomization.yaml b/components/app-configs/notebook-standalone/overlays/gpu/kustomization.yaml index 2b87e6b1..8c7bdf8d 100644 --- a/components/app-configs/notebook-standalone/overlays/gpu/kustomization.yaml +++ b/components/app-configs/notebook-standalone/overlays/gpu/kustomization.yaml @@ -3,3 +3,8 @@ kind: Kustomization resources: - ../../base + +patches: + - path: patch-deployment.yaml + target: + kind: Deployment diff --git a/components/app-configs/notebook-standalone/overlays/gpu/patch-deployment.yaml b/components/app-configs/notebook-standalone/overlays/gpu/patch-deployment.yaml new file mode 100644 index 00000000..141935dd --- /dev/null +++ b/components/app-configs/notebook-standalone/overlays/gpu/patch-deployment.yaml @@ -0,0 +1,31 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: notebook +spec: + template: + spec: + containers: + - name: notebook + image: nvcr.io/nvidia/nemo:dev + env: + - name: HOME + value: /workspace + command: + - /bin/sh + - -c + - | + #!/bin/sh + jupyter lab \ + --ServerApp.ip=0.0.0.0 \ + --ServerApp.port=8787 \ + --ServerApp.allow_origin="*" \ + --ServerApp.open_browser=False \ + --ServerApp.token='' + resources: + limits: + nvidia.com/gpu: 1 + volumeMounts: + - name: home + mountPath: /workspace + subPath: data From a4875c378585a09701000f4806f2cccb4b2ae544 Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Fri, 1 Nov 2024 12:08:44 -0500 Subject: [PATCH 3/9] refactor --- .../notebook-standalone/components/gpu/kustomization.yaml | 7 +++++++ .../{overlays => components}/gpu/patch-deployment.yaml | 0 .../components/namespace/kustomization.yaml | 5 +++++ .../components/namespace/namespace.yaml | 8 ++++++++ .../notebook-standalone/overlays/gpu/kustomization.yaml | 8 +++----- 5 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 components/app-configs/notebook-standalone/components/gpu/kustomization.yaml rename components/app-configs/notebook-standalone/{overlays => components}/gpu/patch-deployment.yaml (100%) create mode 100644 components/app-configs/notebook-standalone/components/namespace/kustomization.yaml create mode 100644 components/app-configs/notebook-standalone/components/namespace/namespace.yaml diff --git a/components/app-configs/notebook-standalone/components/gpu/kustomization.yaml b/components/app-configs/notebook-standalone/components/gpu/kustomization.yaml new file mode 100644 index 00000000..02f6c6d8 --- /dev/null +++ b/components/app-configs/notebook-standalone/components/gpu/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-deployment.yaml + target: + kind: Deployment diff --git a/components/app-configs/notebook-standalone/overlays/gpu/patch-deployment.yaml b/components/app-configs/notebook-standalone/components/gpu/patch-deployment.yaml similarity index 100% rename from components/app-configs/notebook-standalone/overlays/gpu/patch-deployment.yaml rename to components/app-configs/notebook-standalone/components/gpu/patch-deployment.yaml diff --git a/components/app-configs/notebook-standalone/components/namespace/kustomization.yaml b/components/app-configs/notebook-standalone/components/namespace/kustomization.yaml new file mode 100644 index 00000000..d41e3cf2 --- /dev/null +++ b/components/app-configs/notebook-standalone/components/namespace/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +resources: +- namespace.yaml diff --git a/components/app-configs/notebook-standalone/components/namespace/namespace.yaml b/components/app-configs/notebook-standalone/components/namespace/namespace.yaml new file mode 100644 index 00000000..7712aa17 --- /dev/null +++ b/components/app-configs/notebook-standalone/components/namespace/namespace.yaml @@ -0,0 +1,8 @@ +--- +apiVersion: v1 +kind: Namespace +metadata: + name: demo-standalone-notebook + annotations: + openshift.io/display-name: "Demo - standalone notebooks" + argocd.argoproj.io/sync-wave: "0" diff --git a/components/app-configs/notebook-standalone/overlays/gpu/kustomization.yaml b/components/app-configs/notebook-standalone/overlays/gpu/kustomization.yaml index 8c7bdf8d..ab768395 100644 --- a/components/app-configs/notebook-standalone/overlays/gpu/kustomization.yaml +++ b/components/app-configs/notebook-standalone/overlays/gpu/kustomization.yaml @@ -1,10 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +components: +- ../../components/gpu + resources: - ../../base - -patches: - - path: patch-deployment.yaml - target: - kind: Deployment From adb5316a1d662bb4fde2658cb23ad10721048094 Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Fri, 1 Nov 2024 12:13:45 -0500 Subject: [PATCH 4/9] refactor --- .../components/gpu/patch-deployment.yaml | 19 ------------- .../components/nemo/kustomization.yaml | 7 +++++ .../components/nemo/patch-deployment.yaml | 28 +++++++++++++++++++ .../overlays/nemo/kustomization.yaml | 9 ++++++ 4 files changed, 44 insertions(+), 19 deletions(-) create mode 100644 components/app-configs/notebook-standalone/components/nemo/kustomization.yaml create mode 100644 components/app-configs/notebook-standalone/components/nemo/patch-deployment.yaml create mode 100644 components/app-configs/notebook-standalone/overlays/nemo/kustomization.yaml diff --git a/components/app-configs/notebook-standalone/components/gpu/patch-deployment.yaml b/components/app-configs/notebook-standalone/components/gpu/patch-deployment.yaml index 141935dd..13e8c5d4 100644 --- a/components/app-configs/notebook-standalone/components/gpu/patch-deployment.yaml +++ b/components/app-configs/notebook-standalone/components/gpu/patch-deployment.yaml @@ -7,25 +7,6 @@ spec: spec: containers: - name: notebook - image: nvcr.io/nvidia/nemo:dev - env: - - name: HOME - value: /workspace - command: - - /bin/sh - - -c - - | - #!/bin/sh - jupyter lab \ - --ServerApp.ip=0.0.0.0 \ - --ServerApp.port=8787 \ - --ServerApp.allow_origin="*" \ - --ServerApp.open_browser=False \ - --ServerApp.token='' resources: limits: nvidia.com/gpu: 1 - volumeMounts: - - name: home - mountPath: /workspace - subPath: data diff --git a/components/app-configs/notebook-standalone/components/nemo/kustomization.yaml b/components/app-configs/notebook-standalone/components/nemo/kustomization.yaml new file mode 100644 index 00000000..02f6c6d8 --- /dev/null +++ b/components/app-configs/notebook-standalone/components/nemo/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-deployment.yaml + target: + kind: Deployment diff --git a/components/app-configs/notebook-standalone/components/nemo/patch-deployment.yaml b/components/app-configs/notebook-standalone/components/nemo/patch-deployment.yaml new file mode 100644 index 00000000..5da5d362 --- /dev/null +++ b/components/app-configs/notebook-standalone/components/nemo/patch-deployment.yaml @@ -0,0 +1,28 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: notebook +spec: + template: + spec: + containers: + - name: notebook + image: nvcr.io/nvidia/nemo:dev + env: + - name: HOME + value: /workspace + command: + - /bin/sh + - -c + - | + #!/bin/sh + jupyter lab \ + --ServerApp.ip=0.0.0.0 \ + --ServerApp.port=8787 \ + --ServerApp.allow_origin="*" \ + --ServerApp.open_browser=False \ + --ServerApp.token='' + volumeMounts: + - name: home + mountPath: /workspace + subPath: data diff --git a/components/app-configs/notebook-standalone/overlays/nemo/kustomization.yaml b/components/app-configs/notebook-standalone/overlays/nemo/kustomization.yaml new file mode 100644 index 00000000..36ed893a --- /dev/null +++ b/components/app-configs/notebook-standalone/overlays/nemo/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +components: +- ../../components/gpu +- ../../components/nemo + +resources: +- ../../base From 47f84c303e01e568297cf49bddaa9a2f235eddb2 Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Fri, 1 Nov 2024 12:51:36 -0500 Subject: [PATCH 5/9] update --- .../notebook-standalone/base/deployment.yaml | 14 +++++++++----- .../notebook-standalone/base/route.yaml | 2 +- .../notebook-standalone/base/service.yaml | 4 ++-- .../components/odh-rstudio/kustomization.yaml | 7 +++++++ .../components/odh-rstudio/patch-deployment.yaml | 10 ++++++++++ .../components/rstudio/kustomization.yaml | 7 +++++++ .../components/rstudio/patch-deployment.yaml | 10 ++++++++++ .../overlays/rstudio/kustomization.yaml | 8 ++++++++ 8 files changed, 54 insertions(+), 8 deletions(-) create mode 100644 components/app-configs/notebook-standalone/components/odh-rstudio/kustomization.yaml create mode 100644 components/app-configs/notebook-standalone/components/odh-rstudio/patch-deployment.yaml create mode 100644 components/app-configs/notebook-standalone/components/rstudio/kustomization.yaml create mode 100644 components/app-configs/notebook-standalone/components/rstudio/patch-deployment.yaml create mode 100644 components/app-configs/notebook-standalone/overlays/rstudio/kustomization.yaml diff --git a/components/app-configs/notebook-standalone/base/deployment.yaml b/components/app-configs/notebook-standalone/base/deployment.yaml index 3289a33d..0270f011 100644 --- a/components/app-configs/notebook-standalone/base/deployment.yaml +++ b/components/app-configs/notebook-standalone/base/deployment.yaml @@ -15,9 +15,13 @@ spec: spec: containers: - name: notebook - image: quay.io/opendatahub-contrib/workbench-images:rstudio-c9s-py39_2023b_latest + # image: quay.io/opendatahub-contrib/workbench-images:rstudio-c9s-py39_2023b_latest + image: docker.io/kubeflownotebookswg/jupyter:latest + env: + - name: HOME + value: /workspace ports: - - containerPort: 8787 + - containerPort: 8888 protocol: TCP name: notebook - containerPort: 8000 @@ -60,9 +64,9 @@ spec: volumeMounts: - name: shm mountPath: /dev/shm - # - name: home - # mountPath: /opt/app-root/src - # subPath: data + - name: home + mountPath: /workspace + subPath: data volumes: - name: shm emptyDir: diff --git a/components/app-configs/notebook-standalone/base/route.yaml b/components/app-configs/notebook-standalone/base/route.yaml index 2ed290ed..a159708d 100644 --- a/components/app-configs/notebook-standalone/base/route.yaml +++ b/components/app-configs/notebook-standalone/base/route.yaml @@ -7,7 +7,7 @@ metadata: argocd.argoproj.io/sync-wave: "1" spec: port: - targetPort: 8787 + targetPort: 8888 tls: insecureEdgeTerminationPolicy: Redirect termination: edge diff --git a/components/app-configs/notebook-standalone/base/service.yaml b/components/app-configs/notebook-standalone/base/service.yaml index 12c598f1..56f8b84c 100644 --- a/components/app-configs/notebook-standalone/base/service.yaml +++ b/components/app-configs/notebook-standalone/base/service.yaml @@ -12,8 +12,8 @@ spec: port: 8000 targetPort: 8000 - name: notebook - port: 8787 - targetPort: 8787 + port: 8888 + targetPort: 8888 - name: oauth-proxy port: 8080 targetPort: 8080 diff --git a/components/app-configs/notebook-standalone/components/odh-rstudio/kustomization.yaml b/components/app-configs/notebook-standalone/components/odh-rstudio/kustomization.yaml new file mode 100644 index 00000000..02f6c6d8 --- /dev/null +++ b/components/app-configs/notebook-standalone/components/odh-rstudio/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-deployment.yaml + target: + kind: Deployment diff --git a/components/app-configs/notebook-standalone/components/odh-rstudio/patch-deployment.yaml b/components/app-configs/notebook-standalone/components/odh-rstudio/patch-deployment.yaml new file mode 100644 index 00000000..56c357ea --- /dev/null +++ b/components/app-configs/notebook-standalone/components/odh-rstudio/patch-deployment.yaml @@ -0,0 +1,10 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: notebook +spec: + template: + spec: + containers: + - name: notebook + image: quay.io/opendatahub-contrib/workbench-images:rstudio-c9s-py39_2023b_latest diff --git a/components/app-configs/notebook-standalone/components/rstudio/kustomization.yaml b/components/app-configs/notebook-standalone/components/rstudio/kustomization.yaml new file mode 100644 index 00000000..02f6c6d8 --- /dev/null +++ b/components/app-configs/notebook-standalone/components/rstudio/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-deployment.yaml + target: + kind: Deployment diff --git a/components/app-configs/notebook-standalone/components/rstudio/patch-deployment.yaml b/components/app-configs/notebook-standalone/components/rstudio/patch-deployment.yaml new file mode 100644 index 00000000..1ea61e10 --- /dev/null +++ b/components/app-configs/notebook-standalone/components/rstudio/patch-deployment.yaml @@ -0,0 +1,10 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: notebook +spec: + template: + spec: + containers: + - name: notebook + image: docker.io/kubeflownotebookswg/rstudio diff --git a/components/app-configs/notebook-standalone/overlays/rstudio/kustomization.yaml b/components/app-configs/notebook-standalone/overlays/rstudio/kustomization.yaml new file mode 100644 index 00000000..f4c77318 --- /dev/null +++ b/components/app-configs/notebook-standalone/overlays/rstudio/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +components: +- ../../components/rstudio + +resources: +- ../../base From a4742ec5d0e689c1798a9cf7760b030a97194705 Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Fri, 1 Nov 2024 13:50:15 -0500 Subject: [PATCH 6/9] fixes --- .../notebook-standalone/base/deployment.yaml | 3 +- .../notebook-standalone/base/service.yaml | 6 +- .../notebook-standalone/base/template.yaml | 298 +----------------- .../components/odh-rstudio/kustomization.yaml | 25 ++ .../odh-rstudio/patch-deployment.yaml | 1 + .../components/rstudio/patch-deployment.yaml | 4 + .../overlays/odh-rstudio/kustomization.yaml | 8 + 7 files changed, 43 insertions(+), 302 deletions(-) create mode 100644 components/app-configs/notebook-standalone/overlays/odh-rstudio/kustomization.yaml diff --git a/components/app-configs/notebook-standalone/base/deployment.yaml b/components/app-configs/notebook-standalone/base/deployment.yaml index 0270f011..d5b62619 100644 --- a/components/app-configs/notebook-standalone/base/deployment.yaml +++ b/components/app-configs/notebook-standalone/base/deployment.yaml @@ -6,7 +6,7 @@ metadata: annotations: argocd.argoproj.io/sync-wave: "1" # image.openshift.io/triggers: >- - # [{"from":{"kind":"ImageStreamTag","name":"nemo:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"nemo\")].image","paused":"false"}] + # [{"from":{"kind":"ImageStreamTag","name":"notebook:latest"},"fieldPath":"spec.template.spec.containers[?(@.name==\"notebook\")].image","paused":"false"}] spec: replicas: 1 strategy: @@ -15,7 +15,6 @@ spec: spec: containers: - name: notebook - # image: quay.io/opendatahub-contrib/workbench-images:rstudio-c9s-py39_2023b_latest image: docker.io/kubeflownotebookswg/jupyter:latest env: - name: HOME diff --git a/components/app-configs/notebook-standalone/base/service.yaml b/components/app-configs/notebook-standalone/base/service.yaml index 56f8b84c..0a45778c 100644 --- a/components/app-configs/notebook-standalone/base/service.yaml +++ b/components/app-configs/notebook-standalone/base/service.yaml @@ -8,12 +8,12 @@ metadata: name: notebook spec: ports: - - name: demo - port: 8000 - targetPort: 8000 - name: notebook port: 8888 targetPort: 8888 + - name: demo + port: 8000 + targetPort: 8000 - name: oauth-proxy port: 8080 targetPort: 8080 diff --git a/components/app-configs/notebook-standalone/base/template.yaml b/components/app-configs/notebook-standalone/base/template.yaml index 99cf3643..8f82da0a 100644 --- a/components/app-configs/notebook-standalone/base/template.yaml +++ b/components/app-configs/notebook-standalone/base/template.yaml @@ -66,300 +66,4 @@ message: |- For more information about using this template, including OpenShift considerations, see "https://github.com/redhat-na-ssa/demo-ai-gitops-catalog" -objects: -- kind: ImageStream - apiVersion: image.openshift.io/v1 - metadata: - labels: - app: ${APPLICATION_NAME} - app.kubernetes.io/name: ${APPLICATION_NAME} - name: ${APPLICATION_NAME} - spec: - lookupPolicy: - local: true - tags: - - name: base - from: - kind: DockerImage - name: ${NOTEBOOK_IMAGE} - importPolicy: - scheduled: true - referencePolicy: - type: Source -- kind: ImageStream - apiVersion: image.openshift.io/v1 - metadata: - labels: - app: webdav-node - app.kubernetes.io/name: webdav-node - name: webdav-node - spec: - lookupPolicy: - local: true - tags: - - name: latest - from: - kind: DockerImage - name: ${WEBDAV_NODE_IMAGE} - importPolicy: - scheduled: true - referencePolicy: - type: Source -- apiVersion: build.openshift.io/v1 - kind: BuildConfig - metadata: - labels: - build: standalone-notebook - app: ${APPLICATION_NAME} - name: ${APPLICATION_NAME} - spec: - output: - to: - kind: ImageStreamTag - name: '${APPLICATION_NAME}:latest' - runPolicy: SerialLatestOnly - source: - dockerfile: | - FROM ${APPLICATION_NAME}:base - - USER root - - # add: ubuntu dependencies - # RUN apt update && \ - # apt -y install --no-install-recommends tree && \ - # rm -rf /var/lib/apt/lists/* - - # add: rhel dependencies - # RUN yum makecache && \ - # yum -y install tree && \ - # yum -y clean all && \ - # rm -rf /var/cache - - USER 1001 - - type: Dockerfile - strategy: - dockerStrategy: - from: - kind: ImageStreamTag - name: '${APPLICATION_NAME}:base' - type: Docker - successfulBuildsHistoryLimit: 5 - triggers: - - type: ImageChange - imageChange: - from: - kind: ImageStreamTag - name: '${APPLICATION_NAME}:base' - - type: ConfigChange -- kind: Secret - apiVersion: v1 - type: kubernetes.io/basic-auth - metadata: - name: "${APPLICATION_NAME}-secret" - labels: - app: ${APPLICATION_NAME} - app.kubernetes.io/name: ${APPLICATION_NAME} - stringData: - password: ${NOTEBOOK_PASSWORD} - username: coder -- kind: PersistentVolumeClaim - apiVersion: v1 - metadata: - name: "${APPLICATION_NAME}-data" - labels: - app: ${APPLICATION_NAME} - app.kubernetes.io/name: ${APPLICATION_NAME} - spec: - accessModes: - - ReadWriteOnce - resources: - requests: - storage: "${VOLUME_SIZE}" -- kind: Deployment - apiVersion: apps/v1 - metadata: - name: ${APPLICATION_NAME} - labels: - app: ${APPLICATION_NAME} - app.kubernetes.io/name: ${APPLICATION_NAME} - spec: - replicas: 1 - selector: - matchLabels: - app: ${APPLICATION_NAME} - deployment: ${APPLICATION_NAME} - strategy: - type: Recreate - template: - metadata: - labels: - app: ${APPLICATION_NAME} - deployment: ${APPLICATION_NAME} - spec: - containers: - - name: standalone-notebook - image: ${APPLICATION_NAME}:latest - imagePullPolicy: Always - env: - - name: PASSWORD - valueFrom: - secretKeyRef: - key: password - name: "${APPLICATION_NAME}-secret" - ports: - - containerPort: 8787 - protocol: TCP - - containerPort: 8000 - protocol: TCP - readinessProbe: - failureThreshold: 2 - httpGet: - path: / - port: 8787 - scheme: HTTP - initialDelaySeconds: 10 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 3 - livenessProbe: - failureThreshold: 2 - httpGet: - path: / - port: 8787 - scheme: HTTP - initialDelaySeconds: 10 - periodSeconds: 10 - successThreshold: 1 - timeoutSeconds: 3 - resources: - limits: - cpu: ${NOTEBOOK_CPU_LIMIT} - memory: ${NOTEBOOK_MEM_LIMIT} - volumeMounts: - - mountPath: /home/coder - name: coder-home - - name: webdav-server - image: webdav-node:latest - ports: - - containerPort: 1338 - protocol: TCP - env: - - name: WEBDAV_USER - value: coder - - name: WEBDAV_PASS - valueFrom: - secretKeyRef: - key: password - name: "${APPLICATION_NAME}-secret" - - name: WEBDAV_PATH - value: /home/coder - - name: WEBDAV_PORT - value: "1338" - resources: - limits: - cpu: ${WEBDAV_CPU_LIMIT} - memory: ${WEBDAV_MEM_LIMIT} - volumeMounts: - - mountPath: /home/coder - name: coder-home - volumes: - - name: coder-home - persistentVolumeClaim: - claimName: "${APPLICATION_NAME}-data" - triggers: - - type: ConfigChange - - type: ImageChange - imageChangeParams: - automatic: true - containerNames: - - standalone-notebook - from: - kind: ImageStreamTag - name: "${APPLICATION_NAME}:latest" - - type: ImageChange - imageChangeParams: - automatic: true - containerNames: - - webdav-server - from: - kind: ImageStreamTag - name: "webdav-node:latest" -- kind: Service - apiVersion: v1 - metadata: - name: ${APPLICATION_NAME} - labels: - app: ${APPLICATION_NAME} - app.kubernetes.io/name: ${APPLICATION_NAME} - spec: - ports: - - name: 8787-tcp - protocol: TCP - port: 8787 - targetPort: 8787 - - name: 1338-tcp - port: 1338 - targetPort: 1338 - - name: 8080-tcp - protocol: TCP - port: 8080 - targetPort: 8080 - selector: - app: ${APPLICATION_NAME} - deployment: ${APPLICATION_NAME} -- kind: Route - apiVersion: route.openshift.io/v1 - metadata: - name: ${APPLICATION_NAME} - labels: - app: ${APPLICATION_NAME} - app.kubernetes.io/name: ${APPLICATION_NAME} - spec: - host: "" - to: - kind: Service - name: ${APPLICATION_NAME} - weight: 100 - port: - targetPort: 8787-tcp - tls: - termination: edge - insecureEdgeTerminationPolicy: Redirect -- kind: Route - apiVersion: route.openshift.io/v1 - metadata: - name: "${APPLICATION_NAME}-webdav" - labels: - app: ${APPLICATION_NAME} - app.kubernetes.io/name: ${APPLICATION_NAME} - app.kubernetes.io/component: webdav-server - spec: - host: "" - to: - kind: Service - name: ${APPLICATION_NAME} - weight: 100 - port: - targetPort: 1338-tcp - tls: - termination: edge - insecureEdgeTerminationPolicy: Redirect -- kind: Route - apiVersion: route.openshift.io/v1 - metadata: - name: "${APPLICATION_NAME}-demo" - labels: - app: ${APPLICATION_NAME} - app.kubernetes.io/name: ${APPLICATION_NAME} - spec: - host: "" - to: - kind: Service - name: ${APPLICATION_NAME} - weight: 100 - port: - targetPort: 8080-tcp - tls: - termination: edge - insecureEdgeTerminationPolicy: Redirect +objects: [] diff --git a/components/app-configs/notebook-standalone/components/odh-rstudio/kustomization.yaml b/components/app-configs/notebook-standalone/components/odh-rstudio/kustomization.yaml index 02f6c6d8..195d1fd9 100644 --- a/components/app-configs/notebook-standalone/components/odh-rstudio/kustomization.yaml +++ b/components/app-configs/notebook-standalone/components/odh-rstudio/kustomization.yaml @@ -5,3 +5,28 @@ patches: - path: patch-deployment.yaml target: kind: Deployment + - patch: |- + - op: replace + path: /spec/template/spec/containers/0/ports/0 + value: + containerPort: 8787 + protocol: TCP + name: notebook + target: + kind: Deployment + - patch: |- + - op: replace + path: /spec/ports/0 + value: + name: notebook + protocol: TCP + port: 8787 + targetPort: 8787 + target: + kind: Service + - patch: |- + - op: replace + path: /spec/port/targetPort + value: 8787 + target: + kind: Route diff --git a/components/app-configs/notebook-standalone/components/odh-rstudio/patch-deployment.yaml b/components/app-configs/notebook-standalone/components/odh-rstudio/patch-deployment.yaml index 56c357ea..6d1a6219 100644 --- a/components/app-configs/notebook-standalone/components/odh-rstudio/patch-deployment.yaml +++ b/components/app-configs/notebook-standalone/components/odh-rstudio/patch-deployment.yaml @@ -8,3 +8,4 @@ spec: containers: - name: notebook image: quay.io/opendatahub-contrib/workbench-images:rstudio-c9s-py39_2023b_latest + diff --git a/components/app-configs/notebook-standalone/components/rstudio/patch-deployment.yaml b/components/app-configs/notebook-standalone/components/rstudio/patch-deployment.yaml index 1ea61e10..0c6af167 100644 --- a/components/app-configs/notebook-standalone/components/rstudio/patch-deployment.yaml +++ b/components/app-configs/notebook-standalone/components/rstudio/patch-deployment.yaml @@ -8,3 +8,7 @@ spec: containers: - name: notebook image: docker.io/kubeflownotebookswg/rstudio + volumeMounts: + - name: home + mountPath: /home/jovyan + subPath: data diff --git a/components/app-configs/notebook-standalone/overlays/odh-rstudio/kustomization.yaml b/components/app-configs/notebook-standalone/overlays/odh-rstudio/kustomization.yaml new file mode 100644 index 00000000..310951ea --- /dev/null +++ b/components/app-configs/notebook-standalone/overlays/odh-rstudio/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +components: +- ../../components/odh-rstudio + +resources: +- ../../base From 338e08348deba09f47f432975f7d02e18e92af78 Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Fri, 1 Nov 2024 13:51:11 -0500 Subject: [PATCH 7/9] fix: lint --- .../components/odh-rstudio/patch-deployment.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/components/app-configs/notebook-standalone/components/odh-rstudio/patch-deployment.yaml b/components/app-configs/notebook-standalone/components/odh-rstudio/patch-deployment.yaml index 6d1a6219..56c357ea 100644 --- a/components/app-configs/notebook-standalone/components/odh-rstudio/patch-deployment.yaml +++ b/components/app-configs/notebook-standalone/components/odh-rstudio/patch-deployment.yaml @@ -8,4 +8,3 @@ spec: containers: - name: notebook image: quay.io/opendatahub-contrib/workbench-images:rstudio-c9s-py39_2023b_latest - From 4be3635f7a467ec6ac59dfa64e38fb8b52e8683b Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Fri, 1 Nov 2024 14:06:46 -0500 Subject: [PATCH 8/9] update --- .../notebook-standalone/base/deployment.yaml | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/components/app-configs/notebook-standalone/base/deployment.yaml b/components/app-configs/notebook-standalone/base/deployment.yaml index d5b62619..110c89bf 100644 --- a/components/app-configs/notebook-standalone/base/deployment.yaml +++ b/components/app-configs/notebook-standalone/base/deployment.yaml @@ -33,33 +33,33 @@ spec: requests: cpu: 500m memory: 8Gi - # startupProbe: - # httpGet: - # path: /health - # port: http - # scheme: HTTP - # timeoutSeconds: 1 - # periodSeconds: 30 - # successThreshold: 1 - # failureThreshold: 10 - # readinessProbe: - # httpGet: - # path: /health - # port: http - # scheme: HTTP - # timeoutSeconds: 5 - # periodSeconds: 30 - # successThreshold: 1 - # failureThreshold: 3 - # livenessProbe: - # httpGet: - # path: /health - # port: http - # scheme: HTTP - # timeoutSeconds: 8 - # periodSeconds: 100 - # successThreshold: 1 - # failureThreshold: 3 + # livenessProbe: + # httpGet: + # path: / + # port: http + # scheme: HTTP + # timeoutSeconds: 5 + # periodSeconds: 5 + # successThreshold: 1 + # failureThreshold: 3 + readinessProbe: + httpGet: + path: / + port: notebook + scheme: HTTP + timeoutSeconds: 1 + periodSeconds: 10 + successThreshold: 1 + failureThreshold: 3 + startupProbe: + httpGet: + path: / + port: notebook + scheme: HTTP + timeoutSeconds: 1 + periodSeconds: 5 + successThreshold: 1 + failureThreshold: 10 volumeMounts: - name: shm mountPath: /dev/shm From ea8cfc04c0f023772c6a2b49087b6d4d02588654 Mon Sep 17 00:00:00 2001 From: Cory Latschkowski Date: Fri, 1 Nov 2024 14:16:44 -0500 Subject: [PATCH 9/9] add: code-server --- .../components/code-server/kustomization.yaml | 7 +++++++ .../components/code-server/patch-deployment.yaml | 14 ++++++++++++++ .../overlays/code-server/kustomization.yaml | 8 ++++++++ 3 files changed, 29 insertions(+) create mode 100644 components/app-configs/notebook-standalone/components/code-server/kustomization.yaml create mode 100644 components/app-configs/notebook-standalone/components/code-server/patch-deployment.yaml create mode 100644 components/app-configs/notebook-standalone/overlays/code-server/kustomization.yaml diff --git a/components/app-configs/notebook-standalone/components/code-server/kustomization.yaml b/components/app-configs/notebook-standalone/components/code-server/kustomization.yaml new file mode 100644 index 00000000..02f6c6d8 --- /dev/null +++ b/components/app-configs/notebook-standalone/components/code-server/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1alpha1 +kind: Component + +patches: + - path: patch-deployment.yaml + target: + kind: Deployment diff --git a/components/app-configs/notebook-standalone/components/code-server/patch-deployment.yaml b/components/app-configs/notebook-standalone/components/code-server/patch-deployment.yaml new file mode 100644 index 00000000..cea20599 --- /dev/null +++ b/components/app-configs/notebook-standalone/components/code-server/patch-deployment.yaml @@ -0,0 +1,14 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: notebook +spec: + template: + spec: + containers: + - name: notebook + image: docker.io/kubeflownotebookswg/codeserver + volumeMounts: + - name: home + mountPath: /home/jovyan + subPath: data diff --git a/components/app-configs/notebook-standalone/overlays/code-server/kustomization.yaml b/components/app-configs/notebook-standalone/overlays/code-server/kustomization.yaml new file mode 100644 index 00000000..394a64a1 --- /dev/null +++ b/components/app-configs/notebook-standalone/overlays/code-server/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +components: +- ../../components/code-server + +resources: +- ../../base