fixes

Author: ib-steffen

deploy/infrabox/templates/function_crd.yaml

@@ -34,11 +34,6 @@ spec:
     -
         mountPath: /local-cache
         name: local-cache
-{{ end }}
-{{ if .Values.gerrit.enabled }}
-    -
-        mountPath: /var/run/gerrit/
-        name: gerrit-ssh
 {{ end }}
     volumes:
     -
@@ -54,9 +49,3 @@ spec:
         hostPath:
             path: {{ default "/tmp/infrabox/local_cache" .Values.local_cache.host_path }}
 {{ end }}
-{{ if .Values.gerrit.enabled }}
-    -
-        name: gerrit-ssh
-        secret:
-            secretName: infrabox-gerrit-ssh
-{{ end }}

src/api/handlers/projects/projects.py

@@ -158,11 +158,15 @@ def post(self):
             owner = split[0]
             repo_name = split[1]
 
+            clone_url = repo['clone_url']
+            if repo['private']:
+                clone_url = repo['ssh_url']
+
             g.db.execute('''
                 INSERT INTO repository (name, html_url, clone_url, github_id,
                                         private, project_id, github_owner)
                 VALUES (%s, %s, %s, %s, %s, %s, %s)
-            ''', [repo['name'], repo['html_url'], repo['clone_url'],
+            ''', [repo['name'], repo['html_url'], clone_url,
                   repo['id'], repo['private'], project_id, repo['owner']['login']])
 
             insecure_ssl = "0"

src/job/entrypoint.sh

@@ -31,24 +31,14 @@ else
     echo "Using host docker daemon socket"
 fi
 
-if [ -z "$INFRABOX_GIT_PRIVATE_KEY" ]; then
+if [ ! -z "$INFRABOX_GIT_PRIVATE_KEY" ]; then
     echo "Setting private key"
     eval `ssh-agent -s`
     echo $INFRABOX_GIT_PRIVATE_KEY > ~/.ssh/id_rsa
     chmod 600 ~/.ssh/id_rsa
     echo "StrictHostKeyChecking no" > ~/.ssh/config
     ssh-add ~/.ssh/id_rsa
     ssh-keyscan -p $INFRABOX_GIT_PORT $INFRABOX_GIT_HOSTNAME >> ~/.ssh/known_hosts
-fi
-
-if [ -f /var/run/gerrit/id_rsa ]; then
-    echo "Setting private key"
-    eval `ssh-agent -s`
-    cp /var/run/gerrit/id_rsa ~/.ssh/id_rsa
-    chmod 600 ~/.ssh/id_rsa
-    echo "StrictHostKeyChecking no" > ~/.ssh/config
-    ssh-add ~/.ssh/id_rsa
-    ssh-keyscan -p $INFRABOX_GERRIT_PORT $INFRABOX_GERRIT_HOSTNAME >> ~/.ssh/known_hosts
 else
     echo "No private key configured"
 fi

src/scheduler/kubernetes/scheduler.py

@@ -564,7 +564,7 @@ def kube_job(self, job_id, cpu, mem, private_key, services=None):
         if private_key:
             env += [{
                 'name': 'INFRABOX_GIT_PORT',
-                'value': 443
+                'value': '443'
             }, {
                 'name': 'INFRABOX_GIT_HOSTNAME',
                 'value': 'github.com'
@@ -602,8 +602,6 @@ def kube_job(self, job_id, cpu, mem, private_key, services=None):
                             }
                         },
                         'env': env,
-                        'volumes': volumes,
-                        'volumeMounts': volumeMounts
                     }
                 }
             }
@@ -656,7 +654,7 @@ def schedule_job(self, job_id, cpu, memory):
             cursor = self.conn.cursor()
             cursor.execute('''
                 SELECT r.private_key
-                FROM repositor r
+                FROM repository r
                 WHERE r.project_id = %s
             ''', [project_id])
             result = cursor.fetchone()