Merge branch 'development' of https://github.com/v3io/helm-charts int…

…o development
v3io · Nov 14, 2023 · 0ca6aee · 0ca6aee
2 parents 31760c1 + a2d5fc8
commit 0ca6aee
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 32 deletions.
diff --git a/stable/jupyter/Chart.yaml b/stable/jupyter/Chart.yaml
@@ -1,4 +1,4 @@
-version: 0.14.33
+version: 0.14.34
 apiVersion: v1
 appVersion: 3.4.8
 name: jupyter

diff --git a/stable/jupyter/templates/jupyter-configmap.yaml b/stable/jupyter/templates/jupyter-configmap.yaml
@@ -530,27 +530,12 @@ data:
       log 'Configure tutorials'
       curl -L ${IGZ_JUPYTER_TUTORIALS_URL} -o /tmp/jupyter-tutorials
       curl -L ${IGZ_MLRUN_DEMOS_URL} -o /tmp/mlrun-demos
-      TUTORIALS_SCRIPT_FILE=`tar --list --file=/tmp/jupyter-tutorials|grep igz-tutorials-get.sh`
-      DEMOS_SCRIPT_FILE=`tar --list --file=/tmp/jupyter-tutorials|grep update-demos.sh`
-      UPDATE_NOTEBOOK_FILE=`tar --list --file=/tmp/jupyter-tutorials|grep update-tutorials.ipynb`
-      tar -C /tmp -xvf /tmp/jupyter-tutorials ${TUTORIALS_SCRIPT_FILE} --strip-components=1
-      tar -C /tmp -xvf /tmp/jupyter-tutorials ${UPDATE_NOTEBOOK_FILE} --strip-components=1
-      tar -C /tmp -xvf /tmp/jupyter-tutorials ${DEMOS_SCRIPT_FILE} --strip-components=1
-      if ! /tmp/igz-tutorials-get.sh; then
-        tar -C ${HOME} -xvf /tmp/jupyter-tutorials  --strip-components=1
-        rm -f /tmp/jupyter-tutorials
-      else
-        cp /tmp/igz-tutorials-get.sh ${HOME}
-        cp /tmp/update-tutorials.ipynb ${HOME}
-        cp /tmp/update-demos.sh ${HOME}
-      fi
-      if ! bash /tmp/update-demos.sh --mlrun-ver `curl -s ${IGZ_MLRUN_API_ENDPOINT}/api/v1/client-spec | python3 -c "import sys, json; print(json.load(sys.stdin)['version'])"`; then
-        mkdir -p ${HOME}/demos
-        tar -C ${HOME}/demos -xvf /tmp/mlrun-demos  --strip-components=1
-        rm -f /tmp/mlrun-demos
-      fi
-      chmod a+x ${HOME}/igz-tutorials-get.sh ${HOME}/update-demos.sh
-      rm -f  /tmp/igz-tutorials-get.sh /tmp/update-demos.sh /tmp/update-tutorials.ipynb
+      tar -C ${HOME} -xvf /tmp/jupyter-tutorials  --strip-components=1
+      rm -f /tmp/jupyter-tutorials
+      mkdir -p ${HOME}/demos
+      tar -C ${HOME}/demos -xvf /tmp/mlrun-demos  --strip-components=1
+      rm -f /tmp/mlrun-demos
+      chmod a+x ${HOME}/demos/update-demos.sh || chmod a+x ${HOME}/update-demos.sh || echo 'no update-demos.sh found'
       touch ${HOME}/.igz/.getting-started
     fi
 

diff --git a/stable/mlrun/Chart.yaml b/stable/mlrun/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mlrun
-version: 0.9.17
+version: 0.9.18
 appVersion: 1.4.0
 description: Machine Learning automation and tracking
 sources:

diff --git a/stable/mlrun/templates/api-log-collector-config.yaml b/stable/mlrun/templates/api-log-collector-config.yaml
@@ -15,4 +15,5 @@ data:
   MLRUN_LOG_COLLECTOR__GET_LOGS_BUFFER_POOL_SIZE: "{{ .Values.api.sidecars.logCollector.getLogsBufferPoolSize }}"
   MLRUN_LOG_COLLECTOR__LOG_COLLECTION_BUFFER_SIZE_BYTES: "{{ .Values.api.sidecars.logCollector.logCollectionBufferSizeBytes }}"
   MLRUN_LOG_COLLECTOR__GET_LOGS_BUFFER_SIZE_BYTES: "{{ .Values.api.sidecars.logCollector.getLogsBufferSizeBytes }}"
+  MLRUN_LOG_COLLECTOR__LOG_TIME_UPDATE_BYTES_INTERVAL: "{{ .Values.api.sidecars.logCollector.logTimeUpdateBytesInterval }}"
 {{- end }}
diff --git a/stable/mlrun/values.yaml b/stable/mlrun/values.yaml
@@ -276,6 +276,8 @@ api:
       getLogsBufferSizeBytes: "3932160"
       logCollectionBufferPoolSize: 512
       getLogsBufferPoolSize: 512
+      # 4KB ( 4 * 1024 = 4096 )
+      logTimeUpdateBytesInterval: "4096"
 
       readLogWaitTime: "3s"
       stateFileUpdateInterval: "10s"

diff --git a/stable/v3io-keycloak/Chart.yaml b/stable/v3io-keycloak/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: v3io-keycloak
-version: 0.2.1
+version: 0.2.3
 appVersion: 20.0.5
 description: Keycloak With V3IO MySQL Database
 maintainers:

diff --git a/stable/v3io-keycloak/templates/realms-configmap.yaml b/stable/v3io-keycloak/templates/realms-configmap.yaml
@@ -1,8 +1,8 @@
-{{- if .Values.keycloak.createRealmsConfigMap -}}
+{{- if .Values.keycloak.createRealmsSecret -}}
 apiVersion: v1
-kind: ConfigMap
+kind: Secret
 metadata:
-  name: {{ .Values.keycloak.realmsConfigMap }}
+  name: {{ .Values.keycloak.realmsSecret }}
   labels:
     {{ include "v3io-keycloak.labels" . | nindent 4 }}
 data:

diff --git a/stable/v3io-keycloak/values.yaml b/stable/v3io-keycloak/values.yaml
@@ -31,14 +31,14 @@ keycloak:
     - name: KEYCLOAK_DATABASE_VENDOR
       value: mysql
     - name: KEYCLOAK_EXTRA_ARGS
-      value: "-Dkeycloak.migration.action=import -Dkeycloak.migration.provider=singleFile -Dkeycloak.migration.file=/realm_config/realms.json"
+      value: "-Dkeycloak.migration.action=import -Dkeycloak.migration.provider=singleFile -Dkeycloak.migration.strategy=IGNORE_EXISTING -Dkeycloak.migration.file=/realm_config/realms.json"
 
-  createRealmsConfigMap: true
-  realmsConfigMap: v3io-keycloak-realms
+  createRealmsSecret: true
+  realmsSecret: v3io-keycloak-realms
   extraVolumes: |
     - name: realms
-      configMap:
-        name: {{ .Values.realmsConfigMap }}
+      secret:
+        secretName: {{ .Values.realmsSecret }}
 
   extraVolumeMounts:
     - name: realms