Upgrade chart

Signed-off-by: Benoit Pourre <benoit.pourre@gmail.com>

codehub/Chart.lock

 dependencies:
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 12.1.0
+  version: 12.2.1
 - name: common
   repository: https://charts.bitnami.com/bitnami
-  version: 2.1.2
-digest: sha256:88ecb9efd3bd0b89a26cc7a6da07d64701faac8ee454ee49ffcfb81e6c2271bf
-generated: "2022-11-04T22:15:48.302399309+01:00"
+  version: 2.2.3
+digest: sha256:0582005efc12c1e59627cca740f44e1c6b9508dec87645925c00a913f7006f40
+generated: "2023-02-27T01:16:35.261538718Z"

codehub/Chart.yaml

@@ -4,13 +4,13 @@ annotations:
     - name: code-server
       image: lab.frogg.it:5050/captnbp/codehub/code-server:1.8.8
     - name: jupyterhub
-      image: docker.io/bitnami/jupyterhub:3.1.1-debian-11-r0
+      image: docker.io/bitnami/jupyterhub:3.1.1-debian-11-r11
     - name: oauth
       image: lab.frogg.it:5050/captnbp/codehub/oauth:1.8.8
     - name: nginx
       image: lab.frogg.it:5050/captnbp/codehub/nginx:1.8.8
     - name: configurable-http-proxy
-      image: docker.io/bitnami/configurable-http-proxy:4.5.4-debian-11-r17
+      image: docker.io/bitnami/configurable-http-proxy:4.5.4-debian-11-r29
   artifacthub.io/license: MIT
 apiVersion: v2
 appVersion: 4.11.0
@@ -40,4 +40,4 @@ sources:
   - https://github.com/bitnami/containers/tree/main/bitnami/jupyterhub
   - https://github.com/jupyterhub/jupyterhub
   - https://github.com/coder/code-server
-version: 3.0.9
+version: 3.0.10

codehub/templates/extra-list.yaml

+{{- range .Values.extraDeploy }}
+---
+{{ include "common.tplvalues.render" (dict "value" . "context" $) }}
+{{- end }}

codehub/templates/hub/networkpolicy.yaml

 {{- if .Values.hub.networkPolicy.enabled -}}
-apiVersion: networking.k8s.io/v1
+apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
 kind: NetworkPolicy
 metadata:
   labels: {{- include "common.labels.standard" . | nindent 4 }}

codehub/templates/image-puller/daemonset.yaml

@@ -68,6 +68,9 @@ spec:
         - name: pull-{{ $index }}
           image: {{ include "common.images.image" (dict "imageRoot" . "global" $.Values.global) }}
           imagePullPolicy: {{ .pullPolicy }}
+          {{- if $.Values.imagePuller.resources }}
+          resources: {{- toYaml $.Values.imagePuller.resources | nindent 12 }}
+          {{- end }}
           command:
             - /bin/sh
             - -c

codehub/templates/proxy/networkpolicy.yaml

 {{- if .Values.proxy.networkPolicy.enabled -}}
-apiVersion: networking.k8s.io/v1
+apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }}
 kind: NetworkPolicy
 metadata:
   labels: {{- include "common.labels.standard" . | nindent 4 }}

codehub/templates/proxy/tls-secret.yaml

@@ -22,12 +22,13 @@ data:
 {{- end }}
 {{- end }}
 {{- if and .Values.proxy.ingress.tls .Values.proxy.ingress.selfSigned }}
+{{- $secretName := printf "%s-tls" .Values.proxy.ingress.hostname | trunc 63 | trimSuffix "-" }}
 {{- $ca := genCA "jupyter-ca" 365 }}
 {{- $cert := genSignedCert .Values.proxy.ingress.hostname nil (list .Values.proxy.ingress.hostname) 365 $ca }}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ printf "%s-tls" .Values.proxy.ingress.hostname | trunc 63 | trimSuffix "-" }}
+  name: {{ $secretName }}
   namespace: {{ .Release.Namespace | quote }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
     {{- if .Values.commonLabels }}
@@ -38,8 +39,8 @@ metadata:
   {{- end }}
 type: kubernetes.io/tls
 data:
-  tls.crt: {{ $cert.Cert | b64enc | quote }}
-  tls.key: {{ $cert.Key | b64enc | quote }}
-  ca.crt: {{ $ca.Cert | b64enc | quote }}
+  tls.crt: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "tls.crt" "defaultValue" $cert.Cert "context" $) }}
+  tls.key: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "tls.key" "defaultValue" $cert.Key "context" $) }}
+  ca.crt: {{ include "common.secrets.lookup" (dict "secret" $secretName "key" "ca.crt" "defaultValue" $ca.Cert "context" $) }}
 {{- end }}
 {{- end }}

codehub/values.yaml

@@ -58,17 +58,17 @@ diagnosticMode:
 ## @section Hub deployment parameters
 
 hub:
-    ## @param hub.image.registry Hub image registry
-    ## @param hub.image.repository Hub image repository
+  ## @param hub.image.registry Hub image registry
+  ## @param hub.image.repository Hub image repository
   ## @param hub.image.tag Hub image tag (immutable tags are recommended)
   ## @param hub.image.digest Hub image digest in the way sha256:aa.... Please note this parameter, if set, will override the tag
   ## @param hub.image.pullPolicy Hub image pull policy
   ## @param hub.image.pullSecrets Hub image pull secrets
-    ##
+  ##
   image:
     registry: docker.io
     repository: bitnami/jupyterhub
-    tag: 3.1.1-debian-11-r0
+    tag: 3.1.1-debian-11-r11
     digest: ""
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -379,13 +379,13 @@ hub:
   ## extraEnvVars:
   ##   - name: FOO
   ##     value: "bar"
-    ##
+  ##
   extraEnvVars: []
   ## @param hub.extraEnvVarsCM Name of existing ConfigMap containing extra env vars
-    ##
+  ##
   extraEnvVarsCM: ""
   ## @param hub.extraEnvVarsSecret Name of existing Secret containing extra env vars
-    ##
+  ##
   extraEnvVarsSecret: ""
   ## @param hub.containerPorts.http Hub container port
   ##
@@ -625,18 +625,19 @@ hub:
   networkPolicy:
     ## @param hub.networkPolicy.enabled Deploy Hub network policies
     ##
-    enabled: false
+    enabled: true
     ## @param hub.networkPolicy.allowInterspaceAccess Allow communication between pods in different namespaces
     ##
     allowInterspaceAccess: true
     ## @param hub.networkPolicy.extraIngress Add extra ingress rules to the NetworkPolicy
     ##
-    extraIngress: []
-      # - from:
-      #   - namespaceSelector: {}
-      #     podSelector:
-      #       matchLabels:
-      #         app.kubernetes.io/name: prometheus
+    ## @skip hub.networkPolicy.extraIngress[0]
+    extraIngress:
+      - from:
+        - namespaceSelector: {}
+          podSelector:
+            matchLabels:
+              app.kubernetes.io/name: prometheus
     ## @param hub.networkPolicy.extraEgress [string] Add extra ingress rules to the NetworkPolicy
     ##
     extraEgress: |
@@ -756,7 +757,7 @@ proxy:
   image:
     registry: docker.io
     repository: bitnami/configurable-http-proxy
-    tag: 4.5.4-debian-11-r17
+    tag: 4.5.4-debian-11-r29
     digest: ""
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
@@ -1172,7 +1173,7 @@ proxy:
       ## @param proxy.service.public.extraPorts Extra port to expose on Hub service
       ##
       extraPorts: []
-    ## Configure the ingress resource that allows you to access to your JupyterHub instance
+  ## Configure the ingress resource that allows you to access to your JupyterHub instance
   ##
   ingress:
     ## @param proxy.ingress.enabled Set to true to enable ingress record generation
@@ -1509,7 +1510,7 @@ singleuser:
     digest: ""
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
-    ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+    ## ref: https://kubernetes.io/docs/user-guide/images/#pre-pulling-images
     ##
     ##
     pullPolicy: IfNotPresent
@@ -1754,7 +1755,7 @@ singleuser:
 auxiliaryImage:
   registry: docker.io
   repository: bitnami/bitnami-shell
-  tag: 11-debian-11-r46
+  tag: 11-debian-11-r90
   digest: ""
   pullPolicy: IfNotPresent
   ## Optionally specify an array of imagePullSecrets.
@@ -1774,6 +1775,7 @@ auxiliaryImage:
 ## @param postgresql.auth.username Name for a custom user to create
 ## @param postgresql.auth.password Password for the custom user to create
 ## @param postgresql.auth.database Name for a custom database to create
+## @param postgresql.auth.existingSecret Name of existing secret to use for PostgreSQL credentials
 ## @param postgresql.architecture PostgreSQL architecture (`standalone` or `replication`)
 ## @param postgresql.service.ports.postgresql PostgreSQL service port
 ##
@@ -1783,6 +1785,7 @@ postgresql:
     username: bn_jupyterhub
     password: ""
     database: bitnami_jupyterhub
+    existingSecret: ""
   architecture: standalone
   service:
     ports:
@@ -1797,7 +1800,7 @@ postgresql:
 ## @param externalDatabase.database JupyterHub database name
 ## @param externalDatabase.existingSecret Name of an existing secret resource containing the database credentials
 ## @param externalDatabase.existingSecretPasswordKey Name of an existing secret key containing the database credentials
-    ##
+##
 externalDatabase:
   host: ""
   port: 5432