diff --git a/charts/condor-manager/Chart.yaml b/charts/condor-manager/Chart.yaml index 5433d74..65b40c6 100644 --- a/charts/condor-manager/Chart.yaml +++ b/charts/condor-manager/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "10.0.2" description: HTCondor Central Manager Node name: condor-manager -version: 0.2.2 +version: 0.2.3 diff --git a/charts/condor-manager/templates/deployment.yaml b/charts/condor-manager/templates/deployment.yaml index 1482120..d18be87 100644 --- a/charts/condor-manager/templates/deployment.yaml +++ b/charts/condor-manager/templates/deployment.yaml @@ -25,7 +25,7 @@ spec: spec: containers: - name: condor-manager - image: hub.opensciencegrid.org/slate/condor-manager:latest + image: hub.opensciencegrid.org/slate/condor-manager:{{ .Values.ContainerTags.CondorManagerImageVer }} imagePullPolicy: "Always" ports: - name: condor-shared diff --git a/charts/condor-manager/values.yaml b/charts/condor-manager/values.yaml index b457c96..be13c21 100644 --- a/charts/condor-manager/values.yaml +++ b/charts/condor-manager/values.yaml @@ -1,6 +1,10 @@ # Generates app name as "connect-submit-[Instance]" Instance: "" +#This is global config to specify which container image to pull. The image tag doesn't necessarily indicate or match the app version in the image. +ContainerTags: + CondorManagerImageVer: '10.0.2' + CondorConfig: # Extra configuration can be added via the ConfigFile parameter # ConfigFile: |+ diff --git a/charts/condor-worker/Chart.yaml b/charts/condor-worker/Chart.yaml index 7ee427b..621ae93 100644 --- a/charts/condor-worker/Chart.yaml +++ b/charts/condor-worker/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v1 appVersion: "10.0.2" description: HTCondor distributed high-throughput computing system name: condor-worker -version: 0.10.2 +version: 0.10.3 diff --git a/charts/condor-worker/templates/deployment.yaml b/charts/condor-worker/templates/deployment.yaml index bad032f..7d51544 100644 --- a/charts/condor-worker/templates/deployment.yaml +++ b/charts/condor-worker/templates/deployment.yaml @@ -97,7 +97,7 @@ spec: containers: {{ if .Values.HTTPLogger.Enabled }} - name: logging-sidecar - image: "nginx:1.15.9" + image: nginx:{{ .Values.ContainerTags.NginxImageVer }} command: ["/bin/bash"] args: ["/usr/local/bin/start-nginx.sh"] imagePullPolicy: IfNotPresent @@ -121,7 +121,7 @@ spec: subPath: start-nginx.sh {{ end }} - name: condor-worker-worker - image: hub.opensciencegrid.org/slate/condor-worker:latest + image: hub.opensciencegrid.org/slate/condor-worker:{{ .Values.ContainerTags.CondorWorkerImageVer }} imagePullPolicy: "Always" volumeMounts: {{ if .Values.HTTPLogger.Enabled }} diff --git a/charts/condor-worker/values.yaml b/charts/condor-worker/values.yaml index a7a1973..572743e 100644 --- a/charts/condor-worker/values.yaml +++ b/charts/condor-worker/values.yaml @@ -1,6 +1,11 @@ # Generates app name as "condor-worker-[Instance]" Instance: "" +#This is global config to specify which container image to pull. The image tag doesn't necessarily indicate or match the app version in the image. +ContainerTags: + NginxImageVer: '1.15.9' + CondorWorkerImageVer: '10.0.2' + HTTPLogger: Enabled: false # You can refer to a password that has been hashed by `openssl passwd -apr1` diff --git a/charts/jupyterlab/Chart.yaml b/charts/jupyterlab/Chart.yaml index 3d45684..a9d294b 100644 --- a/charts/jupyterlab/Chart.yaml +++ b/charts/jupyterlab/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: "v2" name: "jupyterlab" -version: 0.5.2 +version: 0.5.3 appVersion: 3.6.1 description: "A JupyterLab with a condor-submit capability" type: application diff --git a/charts/jupyterlab/templates/deployment.yaml b/charts/jupyterlab/templates/deployment.yaml index 458d2a0..209f85a 100644 --- a/charts/jupyterlab/templates/deployment.yaml +++ b/charts/jupyterlab/templates/deployment.yaml @@ -93,7 +93,7 @@ spec: {{ end }} containers: - name: scipy-notebook - image: hub.opensciencegrid.org/slate/jupyterlab:latest + image: hub.opensciencegrid.org/slate/jupyterlab:{{ .Values.ContainerTags.JupyterLabImageVer }} imagePullPolicy: "Always" workingDir: /home/{{ .Values.Jupyter.NB_USER }} env: diff --git a/charts/jupyterlab/values.yaml b/charts/jupyterlab/values.yaml index ae9a4f5..521364e 100644 --- a/charts/jupyterlab/values.yaml +++ b/charts/jupyterlab/values.yaml @@ -2,6 +2,10 @@ # used to manage multiple instances of the same application Instance: '' +#This is global config to specify which container image to pull. The image tag doesn't necessarily indicate or match the app version in the image. +ContainerTags: + JupyterLabImageVer: '0.2.1' + # Persistent Volume mounted as 'data' in the user's home directory PersistentVolume: