From 0206418015f1fdefdc986ea56c34df93d12d2ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Mi=C5=9Bkiewicz?= Date: Mon, 26 Aug 2019 15:20:01 +0200 Subject: [PATCH] Git SSH support (#17) --- charts/helm-broker/templates/deploy.yaml | 6 ++++++ charts/helm-broker/templates/ssh-cfg.yaml | 14 ++++++++++++++ deploy/controller/Dockerfile | 3 ++- deploy/controller/start.sh | 4 ++++ 4 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 charts/helm-broker/templates/ssh-cfg.yaml create mode 100755 deploy/controller/start.sh diff --git a/charts/helm-broker/templates/deploy.yaml b/charts/helm-broker/templates/deploy.yaml index af7cd81d..919024f5 100644 --- a/charts/helm-broker/templates/deploy.yaml +++ b/charts/helm-broker/templates/deploy.yaml @@ -115,6 +115,9 @@ spec: - mountPath: /etc/certs name: helm-certs readOnly: true + - mountPath: /root/.ssh + name: ssh-cfg + readOnly: true ports: - containerPort: {{ .Values.global.service.internalPort }} # Temporary solution for readiness probe @@ -144,6 +147,9 @@ spec: - name: config-volume configMap: name: helm-config-map + - name: ssh-cfg + configMap: + name: ssh-cfg - name: helm-certs secret: secretName: helm-secret diff --git a/charts/helm-broker/templates/ssh-cfg.yaml b/charts/helm-broker/templates/ssh-cfg.yaml new file mode 100644 index 00000000..679abdc5 --- /dev/null +++ b/charts/helm-broker/templates/ssh-cfg.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: ssh-cfg + namespace: {{ .Release.Namespace }} + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" +data: + known_hosts: |- + # generated from the command: ssh-keyscan -t rsa github.com + github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== + bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw== + gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9 \ No newline at end of file diff --git a/deploy/controller/Dockerfile b/deploy/controller/Dockerfile index 422a663c..a30fdcaa 100644 --- a/deploy/controller/Dockerfile +++ b/deploy/controller/Dockerfile @@ -4,8 +4,9 @@ RUN apk --no-cache add ca-certificates RUN apk add --no-cache curl RUN apk add --no-cache curl git openssh +COPY ./start.sh /root/start.sh COPY ./controller /root/controller LABEL source=git@github.com:kyma-project/kyma.git -ENTRYPOINT ["/root/controller"] \ No newline at end of file +CMD ["/root/start.sh"] diff --git a/deploy/controller/start.sh b/deploy/controller/start.sh new file mode 100755 index 00000000..271557bf --- /dev/null +++ b/deploy/controller/start.sh @@ -0,0 +1,4 @@ +#!/bin/sh +eval "$(ssh-agent -s)" + +/root/controller