Global override for private registry (#21)

Co-authored-by: Eitan Steiner <[email protected]>

Author: esteinerMW

README.md

@@ -82,10 +82,12 @@ After you pull the MATLAB Production Server and MATLAB Runtime container images
 
 2. Push the images to your private registry by using [docker push](https://docs.docker.com/engine/reference/commandline/push/).
 
-3. In the `values.yaml` file, set the `productionServer` > `registry` and `matlabRuntime` > `registry` variables to the name of your private registry.
+3. In the `values-overrides.yaml` file, set the `global` > `images` > `registry` variable to the name of your private registry.
 
 4. If your private registry requires authentication, create a Kubernetes Secret that your pod can use to pull the image from the private registry. For more information, see [Pull an Image from a Private Registry](https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/) in the Kubernetes documentation. 
 
+5. In the `values-overrides.yaml` file, set the `global` > `images` > `pullSecret` variable to the name of the Kubernetes Secret you created.
+
 ### Provide Mapping for Deployable Archives
 Deploying MATLAB Production Server requires a running Kubernetes cluster. From the Kubernetes cluster that you use for MATLAB Production Server, provide a mapping from the storage location where you want to store MATLAB Production Server deployable archives (CTF files) to a storage resource in your cluster. You can store the deployable archives on the network file system or on the cloud. After the MATLAB Production Server deployment is complete, the deployable archives that you store in the mapped location are automatically deployed to the server.
 

releases/R2023a/matlab-prodserver/templates/mps-3-deployment.yaml

@@ -32,7 +32,7 @@ spec:
 
       containers:
       - name: mps
-        image: {{ .Values.images.productionServer.registry }}/{{ .Values.images.productionServer.repository }}:{{ .Values.images.productionServer.tag }}
+        image: {{ .Values.global.images.registry | default .Values.images.productionServer.registry }}/{{ .Values.images.productionServer.repository }}:{{ .Values.images.productionServer.tag }}
         env:
         - name: AGREE_TO_MATHWORKS_SOFTWARE_LICENSE
           value: {{ required "agreeToLicense must be set to \"yes\"." .Values.global.agreeToLicense | default "no" | lower | quote }}
@@ -84,7 +84,7 @@ spec:
 
       initContainers:
       - name: matlab-runtime
-        image: {{ .Values.images.matlabRuntime.registry }}/{{ .Values.images.matlabRuntime.repository }}:{{ .Values.images.matlabRuntime.tag }}
+        image: {{ .Values.global.images.registry | default .Values.images.matlabRuntime.registry }}/{{ .Values.images.matlabRuntime.repository }}:{{ .Values.images.matlabRuntime.tag }}
 
         command:
         - /bin/sh
@@ -99,10 +99,13 @@ spec:
 
       restartPolicy: {{ .Values.deploymentSettings.restartPolicy }}
       imagePullSecrets:
+      {{- if .Values.global.images.pullSecret }}
+      - name: {{ .Values.global.images.pullSecret }}
+      {{- end }}
       {{- if .Values.images.productionServer.pullSecret }}
       - name: {{ .Values.images.productionServer.pullSecret }}
       {{- end }}
-      {{- if .Values.images.matlabRuntime.pullSecret }}
+      {{- if and .Values.images.matlabRuntime.pullSecret (ne .Values.images.matlabRuntime.pullSecret .Values.images.productionServer.pullSecret) }}
       - name: {{ .Values.images.matlabRuntime.pullSecret }}
       {{- end }}
 

releases/R2023a/matlab-prodserver/values.yaml

@@ -5,6 +5,10 @@ global:
   agreeToLicense: ""
   # Network License Manager: server host and port number, example: 27000@hostname
   licenseServer: 27000@hostname
+  # Override for a private container registry, example: cr.example.com, cr-secret
+  images:
+    registry: ""
+    pullSecret: ""
   ingressController:
     # Nginx settings (optional)
     name: nginx

values-overrides.yaml

@@ -5,6 +5,10 @@ global:
   agreeToLicense: ""
   # Network License Manager: server host and port number, example: 27000@hostname
   licenseServer: 27000@hostname
+  # Override for private container registry, example: my-registry.example.com
+  images:
+    registry: ""
+    pullSecret: ""
   # Ingress settings (optional)
   ingressController:
     name: nginx