From 130e1dac8ec41a6088a122c7ff81a945e5e82e7d Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Mon, 9 Apr 2018 14:49:27 +0100
Subject: [PATCH] Clone GCP Git repo on K9 IDE startup

---
 deploy/k9/flux-dep.yaml |  4 ++--
 deploy/k9/git-dep.yaml  |  4 ++--
 deploy/k9/k9-cfg.yaml   | 16 ++++++++++++++++
 deploy/k9/k9-dep.yaml   | 21 +++++++++++++++++++--
 4 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 deploy/k9/k9-cfg.yaml

diff --git a/deploy/k9/flux-dep.yaml b/deploy/k9/flux-dep.yaml
index ad73e35..4f10c50 100755
--- a/deploy/k9/flux-dep.yaml
+++ b/deploy/k9/flux-dep.yaml
@@ -45,8 +45,8 @@ spec:
         args:
         - --ssh-keygen-dir=/var/fluxd/keygen
         - --k8s-secret-name=ssh-git
-        - --git-url=ssh://git@gitsrv/git-server/repos/k8s-podinfo.git
+        - --git-url=ssh://git@gitsrv/git-server/repos/cluster.git
         - --git-branch=master
-        - --git-path=deploy/canary
+        #- --git-path=deploy/canary
         #- --connect=wss://cloud.weave.works/api/flux
         #- --token=yghrfcs5berdqp68z7wfndcea93rq6nx
diff --git a/deploy/k9/git-dep.yaml b/deploy/k9/git-dep.yaml
index e43e732..d23e127 100644
--- a/deploy/k9/git-dep.yaml
+++ b/deploy/k9/git-dep.yaml
@@ -21,9 +21,9 @@ spec:
         name: git
         env:
         - name: REPO
-          value: "k8s-podinfo.git"
+          value: "cluster.git"
         - name: TAR_URL
-          value: "https://github.com/stefanprodan/k8s-podinfo/archive/0.2.2.tar.gz"
+          value: "https://github.com/stefanprodan/kubecon-cluster/archive/0.0.1.tar.gz"
         ports:
         - containerPort: 22
           name: ssh
diff --git a/deploy/k9/k9-cfg.yaml b/deploy/k9/k9-cfg.yaml
new file mode 100644
index 0000000..65587a8
--- /dev/null
+++ b/deploy/k9/k9-cfg.yaml
@@ -0,0 +1,16 @@
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: k9-cfg
+  namespace: ide
+data:
+  gcp-clone.sh: |
+    #!/usr/bin/env sh
+
+    export PATH=/google-cloud-sdk/bin:$PATH
+    git config --global credential.helper gcloud.sh
+    git config --global user.email "dx+training@weave.works"
+    git config --global user.name "k8s fan"
+
+    git clone -b master $1
diff --git a/deploy/k9/k9-dep.yaml b/deploy/k9/k9-dep.yaml
index 236d70b..74a3eb0 100644
--- a/deploy/k9/k9-dep.yaml
+++ b/deploy/k9/k9-dep.yaml
@@ -21,11 +21,11 @@ spec:
       serviceAccount: ide
       serviceAccountName: ide
       initContainers:
-      - name: git-clone
+      - name: git-clone-cluster
         command:
         - /bin/sh
         - -c
-        - test -d /workspace/k8s-podinfo || git clone -b master ssh://git@gitsrv/git-server/repos/k8s-podinfo.git
+        - test -d /workspace/cluster || git clone -b master ssh://git@gitsrv/git-server/repos/cluster.git
         image: stefanprodan/k9c:v2-gcloud
         imagePullPolicy: IfNotPresent
         volumeMounts:
@@ -33,6 +33,19 @@ spec:
           name: ide-workspace-data
         - mountPath: /root/.ssh
           name: ssh-git
+      - name: git-clone-podinfo
+        command:
+        - /bin/bash
+        - -c
+        - /root/gcp-clone.sh https://source.developers.google.com/p/dx-general/r/podinfo
+        image: stefanprodan/k9c:v2-gcloud
+        imagePullPolicy: IfNotPresent
+        volumeMounts:
+        - mountPath: /workspace
+          name: ide-workspace-data
+        - mountPath: /root/gcp-clone.sh
+          subPath: gcp-clone.sh
+          name: git-init
       containers:
       - name: ide
         args:
@@ -82,6 +95,10 @@ spec:
         secret:
           defaultMode: 0600
           secretName: ssh-git
+      - name: git-init
+        configMap:
+          defaultMode: 0744
+          name: k9-cfg
       - name: dockersocket
         hostPath:
           path: /var/run/docker.sock