diff --git a/helm-charts/cogstack-ce-helm/Chart.lock b/helm-charts/cogstack-ce-helm/Chart.lock index 413f5334..b52856f0 100644 --- a/helm-charts/cogstack-ce-helm/Chart.lock +++ b/helm-charts/cogstack-ce-helm/Chart.lock @@ -16,9 +16,9 @@ dependencies: version: 3.5.0 - name: cogstack-jupyterhub-helm repository: file://../cogstack-jupyterhub-helm - version: 0.0.1 + version: 0.5.0 - name: ocr-service-helm repository: file://../ocr-service-helm version: 0.1.0 -digest: sha256:f03a094b399753bca80b2ebe922bdd1f365bcde4f3c0d5c4d678b61b3834c3c2 -generated: "2026-10-21T09:43:39.637902212Z" +digest: sha256:ef731aed7412de9d517125da8e52ce751008c1ff7c4923c40dcfd453e357b460 +generated: "2026-10-26T15:26:36.249703048Z" diff --git a/helm-charts/cogstack-ce-helm/README.md b/helm-charts/cogstack-ce-helm/README.md index bb99a657..fb9dfc3b 100644 --- a/helm-charts/cogstack-ce-helm/README.md +++ b/helm-charts/cogstack-ce-helm/README.md @@ -124,7 +124,7 @@ kubectl delete namespace cogstack | medcat-service.replicasCount | int | `1` | Number of MedCAT service replicas. | | medcat-trainer.enabled | bool | `true` | Enable MedCAT Trainer deployment. | | medcat-trainer.env.CSRF_TRUSTED_ORIGINS | string | `"http://localhost:8080"` | CSRF trusted origins for the MedCAT Trainer frontend (set for your deployment/port-forward). | -| medcat-trainer.image.tag | string | `"latest@sha256:103215a7540ad614c32866f4cb00ddd91e7aff37cea9abc25dc226c577f9506d"` | MedCAT Trainer image tag (can be a digest-pinned tag). | +| medcat-trainer.provisioning | object | `{"enabled":true,"existingConfigMap":{"name":"cogstack-ce-helm-example-trainer-provisioining"}}` | MedCAT Trainer image tag (can be a digest-pinned tag). tag: 3.9.0 | | medcat-trainer.provisioning.enabled | bool | `true` | Enable provisioning of projects and models on startup. | | medcat-trainer.provisioning.existingConfigMap.name | string | `"cogstack-ce-helm-example-trainer-provisioining"` | Existing ConfigMap name containing the provisioning configuration. | | nameOverride | string | `""` | This is to override the chart name. | diff --git a/helm-charts/cogstack-ce-helm/values.yaml b/helm-charts/cogstack-ce-helm/values.yaml index 0833406f..785d77e4 100644 --- a/helm-charts/cogstack-ce-helm/values.yaml +++ b/helm-charts/cogstack-ce-helm/values.yaml @@ -52,9 +52,9 @@ ocr-service: medcat-trainer: # -- Enable MedCAT Trainer deployment. enabled: true - image: + # image: # -- MedCAT Trainer image tag (can be a digest-pinned tag). - tag: latest@sha256:103215a7540ad614c32866f4cb00ddd91e7aff37cea9abc25dc226c577f9506d + # tag: 3.9.0 provisioning: # -- Enable provisioning of projects and models on startup. enabled: true diff --git a/helm-charts/cogstack-jupyterhub-helm/Chart.yaml b/helm-charts/cogstack-jupyterhub-helm/Chart.yaml index 3b46b1b7..cf4671a9 100644 --- a/helm-charts/cogstack-jupyterhub-helm/Chart.yaml +++ b/helm-charts/cogstack-jupyterhub-helm/Chart.yaml @@ -3,7 +3,7 @@ name: cogstack-jupyterhub-helm description: A Helm chart for CogStack Jupyter Hub using official JupyterHub chart type: application version: 0.5.0 -appVersion: "latest" +appVersion: "2.3.6" maintainers: - name: alhendrickson diff --git a/helm-charts/cogstack-jupyterhub-helm/README.md b/helm-charts/cogstack-jupyterhub-helm/README.md index aef2588b..ce54582d 100644 --- a/helm-charts/cogstack-jupyterhub-helm/README.md +++ b/helm-charts/cogstack-jupyterhub-helm/README.md @@ -104,7 +104,7 @@ See [Enabling OIDC Authentication](https://github.com/CogStack/cogstack-jupyter- | jupyterhub.hub.extraConfig.01-prometheus-authentication | string | `"c.JupyterHub.authenticate_prometheus = False\n"` | Allow /hub/metrics to be scraped without authentication | | jupyterhub.hub.image.name | string | `"cogstacksystems/jupyter-hub"` | Image repository for the JupyterHub hub. | | jupyterhub.hub.image.pullPolicy | string | `"IfNotPresent"` | Pull policy for the JupyterHub hub. | -| jupyterhub.hub.image.tag | string | `"2.2.2"` | Image tag for the JupyterHub hub. | +| jupyterhub.hub.image.tag | string | `"2.3.6"` | Image tag for the JupyterHub hub. | | jupyterhub.hub.networkPolicy.ingress[0].from[0].podSelector.matchLabels."app.kubernetes.io/name" | string | `"prometheus"` | | | jupyterhub.hub.networkPolicy.ingress[0].ports[0].port | string | `"http"` | | | jupyterhub.hub.networkPolicy.ingress[0].ports[0].protocol | string | `"TCP"` | | @@ -117,7 +117,7 @@ See [Enabling OIDC Authentication](https://github.com/CogStack/cogstack-jupyter- | jupyterhub.singleuser.fsGid | int | `0` | | | jupyterhub.singleuser.image.name | string | `"cogstacksystems/jupyter-singleuser"` | | | jupyterhub.singleuser.image.pullPolicy | string | `"IfNotPresent"` | | -| jupyterhub.singleuser.image.tag | string | `"2.2.2"` | | +| jupyterhub.singleuser.image.tag | string | `"2.3.6"` | | | jupyterhub.singleuser.lifecycleHooks.postStart | object | `{"exec":{"command":["sh","-c","if [ ! -f /home/jovyan/work/.notebooks_initialized ]; then\n echo \"First run - copying notebooks and medcat-scripts...\";\n cp -r /srv/jupyterhub/notebooks/* /home/jovyan/work/;\n cp -r /srv/jupyterhub/medcat-scripts /home/jovyan/work/;\n touch /home/jovyan/work/.notebooks_initialized;\n echo \"Notebooks initialized successfully\";\nelse\n echo \"Notebooks already initialized - skipping\";\nfi\n"]}}` | Lifecycle hook to copy notebooks from image to PVC on first run | | jupyterhub.singleuser.networkPolicy.enabled | bool | `false` | | | jupyterhub.singleuser.startTimeout | int | `600` | | diff --git a/helm-charts/cogstack-jupyterhub-helm/values.yaml b/helm-charts/cogstack-jupyterhub-helm/values.yaml index ba45d724..0011c9d4 100644 --- a/helm-charts/cogstack-jupyterhub-helm/values.yaml +++ b/helm-charts/cogstack-jupyterhub-helm/values.yaml @@ -5,7 +5,7 @@ jupyterhub: # -- Image repository for the JupyterHub hub. name: cogstacksystems/jupyter-hub # -- Image tag for the JupyterHub hub. - tag: "2.2.2" + tag: "2.3.6" # -- Pull policy for the JupyterHub hub. pullPolicy: IfNotPresent @@ -62,7 +62,7 @@ jupyterhub: singleuser: image: name: cogstacksystems/jupyter-singleuser - tag: "2.2.2" + tag: "2.3.6" pullPolicy: IfNotPresent lifecycleHooks: # -- Lifecycle hook to copy notebooks from image to PVC on first run diff --git a/helm-charts/local_dev_startup.sh b/helm-charts/local_dev_startup.sh index 7ed24a9c..efe8d66e 100644 --- a/helm-charts/local_dev_startup.sh +++ b/helm-charts/local_dev_startup.sh @@ -2,7 +2,7 @@ export MINIKUBE_HOME="$HOME/.minikube-${HOSTNAME}" export KUBECONFIG="$HOME/.kube/config-${HOSTNAME}" minikube start -p cogstack-platform --cni=calico --cpus=no-limit --memory=no-limit -minikube addons enable metrics-server +minikube addons enable metrics-server -p cogstack-platform minikube dashboard --url=true & diff --git a/helm-charts/medcat-trainer-helm/Chart.yaml b/helm-charts/medcat-trainer-helm/Chart.yaml index 9f79c552..e44905dc 100644 --- a/helm-charts/medcat-trainer-helm/Chart.yaml +++ b/helm-charts/medcat-trainer-helm/Chart.yaml @@ -21,7 +21,7 @@ version: 0.5.1 # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. # It is recommended to use it with quotes. -appVersion: "3.7.1" +appVersion: "3.9.0" keywords: - cogstack diff --git a/helm-charts/medcat-trainer-helm/README.md b/helm-charts/medcat-trainer-helm/README.md index 860538fa..c4c7beee 100644 --- a/helm-charts/medcat-trainer-helm/README.md +++ b/helm-charts/medcat-trainer-helm/README.md @@ -71,6 +71,7 @@ These features are not yet existing but to be added in future: | hostAliases | list | `[]` | Host aliases for the pod | | image.pullPolicy | string | `"IfNotPresent"` | This sets the pull policy for images. | | image.repository | string | `"cogstacksystems/medcat-trainer"` | Image repository for the MedCAT service container | +| image.tag | string | `""` | | | imagePullSecrets | list | `[]` | This is for the secrets for pulling an image from a private repository more information can be found here: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ | | ingress.annotations | object | `{}` | | | ingress.className | string | `""` | | diff --git a/helm-charts/medcat-trainer-helm/templates/medcat-trainer-env-configmap.yaml b/helm-charts/medcat-trainer-helm/templates/medcat-trainer-env-configmap.yaml index df95647d..940cb887 100644 --- a/helm-charts/medcat-trainer-helm/templates/medcat-trainer-env-configmap.yaml +++ b/helm-charts/medcat-trainer-helm/templates/medcat-trainer-env-configmap.yaml @@ -12,7 +12,7 @@ data: DB_BACKUP_DIR: "/home/api/db-backup" DB_DIR: "/home/api/db" DB_PATH: "/home/api/db/db.sqlite3" - MCT_VERSION: {{ .Values.image.tag | default .Chart.AppVersion }} + MCT_VERSION: {{ .Values.image.tag | default .Chart.AppVersion | quote }} API_URL: http://localhost:{{ .Values.service.apiPort }}/api/ REMOTE_MODEL_SERVICE_TYPE: "medcat" # TODO: Remove this for REMOTE_MODEL_SERVICE_TYPE after resolving pr-363 in cogstack-nlp diff --git a/helm-charts/medcat-trainer-helm/values.yaml b/helm-charts/medcat-trainer-helm/values.yaml index 5a0c8efc..c803a5ed 100644 --- a/helm-charts/medcat-trainer-helm/values.yaml +++ b/helm-charts/medcat-trainer-helm/values.yaml @@ -12,7 +12,7 @@ image: # -- This sets the pull policy for images. pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. - # tag: "latest" + tag: "" # -- Add any environment variables here that should be set in the medcat-trainer container env: