Merge pull request #7 from modelix/http-proxy

feat: support git clone via http proxy

Author: slisson

helm/modelix/templates/_helpers.tpl

@@ -88,3 +88,9 @@ http://{{ include "modelix.fullname" . }}-keycloak:8080/
   value: "{{ .Values.authorization.enabled }}"
 {{- end }}
 
+{{- define "modelix.commonVariables" -}}
+{{- if .Values.httpProxy }}
+- name: MODELIX_HTTP_PROXY
+  value: "{{ .Values.httpProxy }}"
+{{- end }}
+{{- end }}

helm/modelix/templates/common/workspace-manager-deployment.yaml

@@ -66,6 +66,7 @@ spec:
           - name: INTERNAL_DOCKER_REGISTRY_AUTHORITY
             value: "localhost:{{ .Values.internalDockerRegistry.nodePort }}"
           {{- include "modelix.authorizationConfig" . | nindent 10 }}
+          {{- include "modelix.commonVariables" . | nindent 10 }}
         image: "{{ .Values.dockerProxy.prefix }}modelix/modelix-workspace-manager:{{ .Values.imageTags.wsManager | default .Values.versions.modelix.workspaces }}"
         imagePullPolicy: IfNotPresent
         name: workspace-manager

helm/modelix/values.yaml

@@ -4,7 +4,7 @@ fullnameOverride: ""
 
 versions:
   modelix:
-    workspaces: "0.11.0"
+    workspaces: "0.12.0"
     core: "11.3.0"
     kubernetes: ""
     vncBaseImage: "0.9.4"
@@ -90,3 +90,5 @@ serviceAccount: ""
 
 authorization:
   enabled: true
+
+httpProxy: ""