support git-sync proxy

evryfs · Sep 11, 2020 · ba2f345 · ba2f345
1 parent 214b40e
commit ba2f345
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/charts/opsgenie-marid/Chart.yaml b/charts/opsgenie-marid/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "v2.15.0"
 description: A Helm chart for Kubernetes
 name: opsgenie-marid
-version: 0.1.7
+version: 0.2.0
 icon: https://wac-cdn.atlassian.com/dam/jcr:8dbf0e36-5b84-4205-8dcb-3f7e94240ae7/[email protected]?cdnVersion=565
 home: https://docs.opsgenie.com/docs/marid-integration-server-for-opsgenie
 keywords:

diff --git a/charts/opsgenie-marid/templates/deployment.yaml b/charts/opsgenie-marid/templates/deployment.yaml
@@ -65,6 +65,12 @@ spec:
             mountPath: /etc/git-secret
           - name: scripts
             mountPath: /workspace
+          {{- if hasKey .Values.configmap "sshConfig" }}
+          - name: config
+            mountPath: /tmp/.ssh/config
+            readOnly: true
+            subPath: sshConfig
+          {{- end }}
           securityContext:
             runAsUser: 65533 # git-sync user
           env:

diff --git a/charts/opsgenie-marid/values.yaml b/charts/opsgenie-marid/values.yaml
@@ -15,8 +15,8 @@ podSecurityContext:
 gitSync:
   enabled: false
   image:
-    repository: k8s.gcr.io/git-sync
-    tag: v3.1.6
+    repository: k8s.gcr.io/git-sync/git-sync
+    tag: v3.1.7
     pullPolicy: IfNotPresent
   sshKey: ""
   knownHosts: ""
@@ -121,6 +121,14 @@ configmap:
 #    log4j.appender.console.layout.conversionPattern=%d [%t] %-5p %c - %m%n
 #    log4j.appender.console.encoding=UTF-8
 
+#  sshConfig: |
+#    Host github.com
+#    ProxyCommand socat STDIO PROXY:<theProxyHost>:%h:%p,proxyport=<theProxyPort>
+#    User git
+#    Hostname ssh.github.com
+#    Port 443
+
+
 nodeSelector: {}
 
 tolerations: []