From b733b3103bb47e850303bfda287d22dcfd2c6c22 Mon Sep 17 00:00:00 2001
From: Vadim Rutkovsky <vrutkovs@redhat.com>
Date: Fri, 28 Feb 2020 12:27:52 +0100
Subject: [PATCH] Cincinnati: mount credentials secret in e2e test container

Required to use github token in e2e runs, see https://github.com/openshift/cincinnati/pull/233
---
 .../openshift/cincinnati/openshift-cincinnati-master.yaml  | 3 +++
 .../cincinnati/openshift-cincinnati-master-presubmits.yaml | 7 +++++++
 2 files changed, 10 insertions(+)

diff --git a/ci-operator/config/openshift/cincinnati/openshift-cincinnati-master.yaml b/ci-operator/config/openshift/cincinnati/openshift-cincinnati-master.yaml
index a97114f5cf2c..a3bee8ccefac 100644
--- a/ci-operator/config/openshift/cincinnati/openshift-cincinnati-master.yaml
+++ b/ci-operator/config/openshift/cincinnati/openshift-cincinnati-master.yaml
@@ -73,3 +73,6 @@ tests:
   openshift_installer_custom_test_image:
     cluster_profile: aws
     from: pipeline:e2e-test
+  secret:
+    mount_path: /tmp/shared/cincinnati-credentials
+    name: cincinnati-secrets-cincinnati-credentials
diff --git a/ci-operator/jobs/openshift/cincinnati/openshift-cincinnati-master-presubmits.yaml b/ci-operator/jobs/openshift/cincinnati/openshift-cincinnati-master-presubmits.yaml
index 5a3e8bf49d5c..891883491536 100644
--- a/ci-operator/jobs/openshift/cincinnati/openshift-cincinnati-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/cincinnati/openshift-cincinnati-master-presubmits.yaml
@@ -99,6 +99,7 @@ presubmits:
         - --org=openshift
         - --repo=cincinnati
         - --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
+        - --secret-dir=/tmp/shared/cincinnati-credentials
         - --secret-dir=/usr/local/e2e-cluster-profile
         - --sentry-dsn-path=/etc/sentry-dsn/ci-operator
         - --target=e2e
@@ -132,6 +133,9 @@ presubmits:
         - mountPath: /etc/boskos
           name: boskos
           readOnly: true
+        - mountPath: /tmp/shared/cincinnati-credentials
+          name: cincinnati-secrets-cincinnati-credentials
+          readOnly: true
         - mountPath: /usr/local/e2e-cluster-profile
           name: cluster-profile
         - mountPath: /usr/local/e2e
@@ -157,6 +161,9 @@ presubmits:
           - key: password
             path: password
           secretName: boskos-credentials
+      - name: cincinnati-secrets-cincinnati-credentials
+        secret:
+          secretName: cincinnati-secrets-cincinnati-credentials
       - name: cluster-profile
         projected:
           sources: