#13 / #14 Support secured private registry and nodeselector

jfv · jfv · commit e050acfcd3fa · 2025-09-18T12:05:04.000+02:00
diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ helm repo add abcdesktop https://abcdesktopio.github.io/helm/
 Install chart
 
 ```
-helm install my-abcdesktop abcdesktop/abcdesktop --version 4.2.0 --create-namespace -n abcdesktop
+helm install my-abcdesktop abcdesktop/abcdesktop --version 4.2.1 --create-namespace -n abcdesktop
 ```
 
 ## To connect
@@ -40,6 +40,7 @@ The following table contains the helm parameters:
 
 | Key                                   | Description                               | Default Value                               |
 | ------------------------------------- | ----------------------------------------- | ------------------------------------------- |
+| `imagePullSecrets`                    | Secret name to pull images | []              |
 | `console.image`                       | Docker image used for the console service | `ghcr.io/abcdesktopio/console`              |
 | `console.tag`                         | Docker image tag                          | `4.2`                                       |
 | `console.replicaCount`                | Number of replicas for the console        | `1`                                         |
@@ -112,6 +113,7 @@ The following table contains the helm parameters:
 | `speedtest.resources.limits.memory`   | Memory limit                              | `128Mi`                                     |
 | `speedtest.resources.requests.cpu`    | CPU request                               | `0.1`                                       |
 | `speedtest.resources.requests.memory` | Memory request                            | `32Mi`                                      |
+| `nodeSelector` | Node selector | {} |
 | `od_config`                           | configuration file for abcdesktop         | *default configuration file*                |
 
 Note Secrets and ConfigMap should exists before helm deployment, if not it will be created.
@@ -138,16 +140,16 @@ and build package:
 
 ~~~ bash
 $ helm package ./abcdesktop/
-Successfully packaged chart and saved it to: abcdesktop-4.2.0.tgz
+Successfully packaged chart and saved it to: abcdesktop-4.2.1.tgz
 ~~~
 
-The helm file **abcdesktop-4.2.0.tgz** is created.
+The helm file **abcdesktop-4.2.1.tgz** is created.
 
 Let's lint it:
 
 ~~~ bash
-$ helm lint abcdesktop-4.2.0.tgz
-==> Linting abcdesktop-4.2.0.tgz
+$ helm lint abcdesktop-4.2.1.tgz
+==> Linting abcdesktop-4.2.1.tgz
 
 1 chart(s) linted, 0 chart(s) failed
 ========================================
@@ -215,7 +217,7 @@ To list the available versions, run the command:
 ~~~ bash
 helm search repo abcdesktop
 NAME                 	CHART VERSION	APP VERSION	DESCRIPTION
-abcdesktop/abcdesktop	4.2.0        	4.2.0      	ABCDesktop helm chart
+abcdesktop/abcdesktop	4.2.1        	4.2.1      	ABCDesktop helm chart
 ~~~
 
 Then to install:
@@ -227,15 +229,15 @@ helm upgrade --install abcdesktop --create-namespace abcdesktop/abcdesktop -n ab
 ### From local build
 
 ~~~ bash
-$ helm upgrade --install abcdesktop --create-namespace ./abcdesktop-4.2.0.tgz  -n abcdesktop
+$ helm upgrade --install abcdesktop --create-namespace ./abcdesktop-4.2.1.tgz  -n abcdesktop
 ~~~
 
 ## Change default values
 
 To disable local embedded openldap, if you are using your own ldap directory service
 
 `
-helm install --set openldap.enabled=false my-abcdesktop abcdesktop/abcdesktop --version 4.2.0 --create-namespace -n abcdesktop
+helm install --set openldap.enabled=false my-abcdesktop abcdesktop/abcdesktop --version 4.2.1 --create-namespace -n abcdesktop
 `
 
 
diff --git a/charts/abcdesktop/Chart.yaml b/charts/abcdesktop/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: abcdesktop
 description: ABCDesktop helm chart
 type: application
-version: 4.2.0
-appVersion: "4.2.0"
+version: 4.2.1
+appVersion: "4.2.1"
 icon: https://www.abcdesktop.io/img/abcdesktop.svg
 
 annotations:
diff --git a/charts/abcdesktop/README.md b/charts/abcdesktop/README.md
@@ -1,5 +1,7 @@
 # ABCDesktop helm package
 
+[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/abcdesktop)](https://artifacthub.io/packages/search?repo=abcdesktop)
+
 ABCDesktop is a cloud native desktopless service, and a complete work environment accessible from a simple HTML 5 web browser, without any installation. Have a look on https://www.abcdesktop.io/ to get more informations.
 
 ## To install
@@ -14,7 +16,7 @@ helm repo add abcdesktop https://abcdesktopio.github.io/helm/
 Install chart
 
 ```
-helm install my-abcdesktop abcdesktop/abcdesktop --version 4.2.0 --create-namespace -n abcdesktop
+helm install my-abcdesktop abcdesktop/abcdesktop --version 4.2.1 --create-namespace -n abcdesktop
 ```
 
 ## To connect
@@ -38,6 +40,7 @@ The following table contains the helm parameters:
 
 | Key                                   | Description                               | Default Value                               |
 | ------------------------------------- | ----------------------------------------- | ------------------------------------------- |
+| `imagePullSecrets`                    | Secret name to pull images | []              |
 | `console.image`                       | Docker image used for the console service | `ghcr.io/abcdesktopio/console`              |
 | `console.tag`                         | Docker image tag                          | `4.2`                                       |
 | `console.replicaCount`                | Number of replicas for the console        | `1`                                         |
@@ -71,6 +74,7 @@ The following table contains the helm parameters:
 | `website.autoscaling.maxReplicas`     | Maximum number of replicas allowed        | `100`                                       |
 | `website.autoscaling.targetCPUUtilizationPercentage`| CPU utilization percentage to trigger autoscaling | `80`                  |
 | `website.autoscaling.targetMemoryUtilizationPercentage`| Memory utilization percentage to trigger autoscaling (commented, not active by default)  | `80` |
+| `openldap.enabled`                    | boolean `true` or `false` to enable embedded openldap | `true`                          |
 | `openldap.image`                      | Docker image for OpenLDAP                 | `ghcr.io/abcdesktopio/docker-test-openldap` |
 | `openldap.tag`                        | Docker image tag                          | `4.2`                                       |
 | `openldap.replicaCount`               | Number of replicas                        | `1`                                         |
@@ -109,6 +113,7 @@ The following table contains the helm parameters:
 | `speedtest.resources.limits.memory`   | Memory limit                              | `128Mi`                                     |
 | `speedtest.resources.requests.cpu`    | CPU request                               | `0.1`                                       |
 | `speedtest.resources.requests.memory` | Memory request                            | `32Mi`                                      |
+| `nodeSelector` | Node selector | {} |
 | `od_config`                           | configuration file for abcdesktop         | *default configuration file*                |
 
 Note Secrets and ConfigMap should exists before helm deployment, if not it will be created.
@@ -135,16 +140,16 @@ and build package:
 
 ~~~ bash
 $ helm package ./abcdesktop/
-Successfully packaged chart and saved it to: abcdesktop-4.2.0.tgz
+Successfully packaged chart and saved it to: abcdesktop-4.2.1.tgz
 ~~~
 
-The helm file **abcdesktop-4.2.0.tgz** is created.
+The helm file **abcdesktop-4.2.1.tgz** is created.
 
 Let's lint it:
 
 ~~~ bash
-$ helm lint abcdesktop-4.2.0.tgz
-==> Linting abcdesktop-4.2.0.tgz
+$ helm lint abcdesktop-4.2.1.tgz
+==> Linting abcdesktop-4.2.1.tgz
 
 1 chart(s) linted, 0 chart(s) failed
 ========================================
@@ -212,7 +217,7 @@ To list the available versions, run the command:
 ~~~ bash
 helm search repo abcdesktop
 NAME                 	CHART VERSION	APP VERSION	DESCRIPTION
-abcdesktop/abcdesktop	4.2.0        	4.2.0      	ABCDesktop helm chart
+abcdesktop/abcdesktop	4.2.1        	4.2.1      	ABCDesktop helm chart
 ~~~
 
 Then to install:
@@ -224,9 +229,18 @@ helm upgrade --install abcdesktop --create-namespace abcdesktop/abcdesktop -n ab
 ### From local build
 
 ~~~ bash
-$ helm upgrade --install abcdesktop --create-namespace ./abcdesktop-4.2.0.tgz  -n abcdesktop
+$ helm upgrade --install abcdesktop --create-namespace ./abcdesktop-4.2.1.tgz  -n abcdesktop
 ~~~
 
+## Change default values
+
+To disable local embedded openldap, if you are using your own ldap directory service
+
+`
+helm install --set openldap.enabled=false my-abcdesktop abcdesktop/abcdesktop --version 4.2.1 --create-namespace -n abcdesktop
+`
+
+
 ## Uninstall
 
 ~~~ bash
diff --git a/charts/abcdesktop/templates/console-deployment.yaml b/charts/abcdesktop/templates/console-deployment.yaml
@@ -17,6 +17,10 @@ spec:
         run: console-od
         type: admin-console
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: console
         image: {{ .Values.console.image }}:{{ .Values.console.tag }}
@@ -33,4 +37,8 @@ spec:
             memory: {{ .Values.console.resources.limits.memory }}
           requests:
             cpu: {{ .Values.console.resources.requests.cpu }}
-            memory: {{ .Values.console.resources.requests.memory }}
+            memory: {{ .Values.console.resources.requests.memory }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/abcdesktop/templates/memcached-deployment.yaml b/charts/abcdesktop/templates/memcached-deployment.yaml
@@ -16,6 +16,10 @@ spec:
         run: memcached-od
         type: database
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: memcached
         image: {{ .Values.memcached.image }}:{{ .Values.memcached.tag }}
@@ -27,4 +31,8 @@ spec:
             cpu: {{ .Values.memcached.resources.requests.cpu }}
             memory: {{ .Values.memcached.resources.requests.memory }}
         ports:
-          - containerPort: 11211
+          - containerPort: 11211
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/abcdesktop/templates/mongo-deployment.yaml b/charts/abcdesktop/templates/mongo-deployment.yaml
@@ -19,6 +19,10 @@ spec:
         run: mongodb-od
         type: database
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: mongodb
         image: {{ .Values.mongo.image }}:{{ .Values.mongo.tag }}
@@ -66,7 +70,11 @@ spec:
                mode: 0444
          - name: mongodb-scripts
            configMap:
-             name: configmap-mongodb-scripts 
+             name: configmap-mongodb-scripts
              items:
              - key: ensure-users.js
-               path: ensure-users.js
+               path: ensure-users.js
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/abcdesktop/templates/openldap-deployment.yaml b/charts/abcdesktop/templates/openldap-deployment.yaml
@@ -18,6 +18,10 @@ spec:
         run: openldap-od
         netpol/dns: 'true'
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: openldap
         # abcdesktopio/docker-test-openldap:master
@@ -34,4 +38,8 @@ spec:
         ports:
           - containerPort: 389
           - containerPort: 636
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{- end }}
diff --git a/charts/abcdesktop/templates/py-od-deployment.yaml b/charts/abcdesktop/templates/py-od-deployment.yaml
@@ -29,6 +29,10 @@ spec:
         netpol/router: 'true'
         netpol/nginx: 'true'
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       serviceAccountName: pyos-serviceaccount
       containers:
       - name : pyos
@@ -134,4 +138,8 @@ spec:
         - name: volume-abcdesktop-gshadow-templatefile
           configMap:
             name: abcdesktop-gshadow-templatefile
-      dnsPolicy: ClusterFirst
+      dnsPolicy: ClusterFirst
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/abcdesktop/templates/router-od-deployment.yaml b/charts/abcdesktop/templates/router-od-deployment.yaml
@@ -25,6 +25,10 @@ spec:
         netpol/nginx: 'true'
         netpol/console: 'true'
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: nginx-router
         imagePullPolicy: Always
@@ -100,4 +104,8 @@ spec:
           - name: jwtpayloadkeys
             secret:
               secretName: abcdesktopjwtdesktoppayload
-      dnsPolicy: ClusterFirst
+      dnsPolicy: ClusterFirst
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/abcdesktop/templates/speedtest-deployment.yaml b/charts/abcdesktop/templates/speedtest-deployment.yaml
@@ -14,8 +14,12 @@ spec:
     metadata:
       namespace: {{ .Release.Namespace }}
       labels:
-        run: speedtest-od 
+        run: speedtest-od
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: speedtest
         resources:
@@ -28,3 +32,7 @@ spec:
         image: {{ .Values.speedtest.image }}:{{ .Values.speedtest.tag }}
         ports:
           - containerPort: 8080
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/abcdesktop/templates/website-deployment.yaml b/charts/abcdesktop/templates/website-deployment.yaml
@@ -18,6 +18,10 @@ spec:
         run: nginx-od
         type: frontend
     spec:
+      {{- with .Values.imagePullSecrets }}
+      imagePullSecrets:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
       - name: nginx
         imagePullPolicy: Always
@@ -44,3 +48,7 @@ spec:
           requests:
             cpu: {{ .Values.website.resources.requests.cpu }}
             memory: {{ .Values.website.resources.requests.memory }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
diff --git a/charts/abcdesktop/values.yaml b/charts/abcdesktop/values.yaml
@@ -1,3 +1,6 @@
+
+imagePullSecrets: []
+
 console:
   image: ghcr.io/abcdesktopio/console
   tag: 4.2
@@ -123,6 +126,10 @@ keysgenerator:
   jwtdesktopsigningkeylength: 2048
   jwtusersigningkeylength: 2048
 
+# nodeSelector:
+#    disktype: ssd
+nodeSelector: {}
+
 od_config: |
     # od.config
     # abcdesktop Configuration File
