Add support for kernel pause and restore (#55)

* Add PUB/SUB config for jupyter * Add config to jupyter api * Add pulsar-manager helper * Fix k8s RBAC for datalayer-jupyter * Fix companion role * Fix companion role * Fix jupyter service role * Add new folder on ceph --------- Co-authored-by: Frédéric Collonval <[email protected]>
datalayer · Oct 18, 2024 · ffda5cb · ffda5cb
1 parent a87e227
commit ffda5cb
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 3 deletions.
diff --git a/charts/datalayer-ceph-filesystem/templates/users-storage.yaml b/charts/datalayer-ceph-filesystem/templates/users-storage.yaml
@@ -36,7 +36,7 @@ spec:
     - -e
     - -c
     - |
-      for DIRECTORY in home public datasets tmp
+      for DIRECTORY in home public datalayer datasets tmp
       do
         mkdir -p /mnt/ceph/$DIRECTORY
         chown $KERNEL_UID:$KERNEL_GID /mnt/ceph/$DIRECTORY

diff --git a/charts/datalayer-jupyter/templates/deployment.yaml b/charts/datalayer-jupyter/templates/deployment.yaml
@@ -29,6 +29,7 @@ spec:
       {{- end }}
       imagePullSecrets:
             - name: reg-creds
+      serviceAccountName: datalayer-jupyter
       containers:
         - name: jupyter
           image: {{ .Values.jupyter.image }}

diff --git a/charts/datalayer-jupyter/templates/role.yaml b/charts/datalayer-jupyter/templates/role.yaml
@@ -0,0 +1,17 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  namespace: datalayer-jupyter
+  name: datalayer-jupyter
+  labels:
+    k8s-app: datalayer-jupyter
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+rules:
+- apiGroups: [""] # "" indicates the core API group
+  resources: ["pods", "secrets"]
+  verbs: ["get"]
+- apiGroups: ["batch"]
+  resources: ["jobs"]
+  verbs: ["create"]
diff --git a/charts/datalayer-jupyter/templates/rolebinding.yaml b/charts/datalayer-jupyter/templates/rolebinding.yaml
@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: datalayer-jupyter-svc
+  namespace: datalayer-jupyter
+subjects:
+- kind: ServiceAccount
+  name: datalayer-jupyter
+  namespace: datalayer-api
+roleRef:
+  kind: Role
+  name: datalayer-jupyter
+  apiGroup: rbac.authorization.k8s.io
diff --git a/charts/datalayer-jupyter/templates/serviceaccount.yaml b/charts/datalayer-jupyter/templates/serviceaccount.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: datalayer-jupyter
+  namespace: datalayer-api
diff --git a/charts/datalayer-jupyter/values.yaml b/charts/datalayer-jupyter/values.yaml
@@ -37,8 +37,11 @@ jupyter:
     DATALAYER_OPENFGA_STORE_ID: ""
     DATALAYER_OPERATOR_API_KEY: ""
     DATALAYER_OPERATOR_HOST: "datalayer-operator-svc.datalayer-jupyter.svc.cluster.local:2111"
+    DATALAYER_PUB_SUB_ENGINE: "pulsar"
+    DATALAYER_PULSAR_URL: "pulsar://datalayer-pulsar-broker.datalayer-pulsar.svc.cluster.local:6650"
     DATALAYER_RUNTIME_ENV: "prod"
     DATALAYER_RUN_HOST: ""
+    DATALAYER_USERS_VOLUME_CLAIM_NAME: ""
     DATALAYER_SOLR_ZK_HOST: "solr-datalayer-solrcloud-zookeeper-headless.datalayer-solr.svc.cluster.local"
     OTEL_EXPORTER_OTLP_METRICS_ENDPOINT: ""
     OTEL_EXPORTER_OTLP_TRACES_ENDPOINT: ""

diff --git a/charts/datalayer-operator/templates/companion-role.yaml b/charts/datalayer-operator/templates/companion-role.yaml
@@ -11,4 +11,4 @@ metadata:
 rules:
 - apiGroups: [""] # "" indicates the core API group
   resources: ["pods"]
-  verbs: ["get"]
+  verbs: ["get", "delete", "patch"]
diff --git a/charts/datalayer-operator/templates/companion-rolebinding.yaml b/charts/datalayer-operator/templates/companion-rolebinding.yaml
@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
-  name: read-pods
+  name: datalayer-jupyter-companion-svc
   namespace: datalayer-jupyter
 subjects:
 - kind: ServiceAccount

diff --git a/charts/datalayer-pulsar/pulsar-admin.yaml b/charts/datalayer-pulsar/pulsar-admin.yaml
@@ -0,0 +1,37 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: pulsar-manager
+  namespace: datalayer-pulsar
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: pulsar-manager
+  template:
+    metadata:
+      labels:
+        app: pulsar-manager
+    spec:
+      restartPolicy: Never
+      containers:
+        # The pulsar manager container
+        - name: pulsar-manager
+          image: apachepulsar/pulsar-manager:v0.3.0
+          env:
+            - name: SPRING_CONFIGURATION_FILE
+              value: /pulsar-manager/pulsar-manager/application.properties
+        # Container to initialize an admin account
+        - name: set-pwd
+          image: curlimages/curl:8.10.1
+          command: ["sh", "-c"]
+          args:
+            - |
+              sleep 10
+              export CSRF_TOKEN=$(curl http://localhost:7750/pulsar-manager/csrf-token)
+              curl \
+                -H 'X-XSRF-TOKEN: $CSRF_TOKEN' \
+                -H 'Cookie: XSRF-TOKEN=$CSRF_TOKEN;' \
+                -H "Content-Type: application/json" \
+                -X PUT http://localhost:7750/pulsar-manager/users/superuser \
+                -d '{"name": "admin", "password": "apachepulsar", "description": "test", "email": "[email protected]"}'