From b002e7614da9518f5537d8b067cf10470c638894 Mon Sep 17 00:00:00 2001
From: Kacper Rzetelski <rzetelski.k@gmail.com>
Date: Tue, 4 Jun 2024 10:27:43 +0200
Subject: [PATCH] Propagate kubeconfigs to e2e Pod

---
 hack/.ci/lib/e2e.sh                        | 10 ++++++++++
 pkg/genericclioptions/genericclioptions.go |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/hack/.ci/lib/e2e.sh b/hack/.ci/lib/e2e.sh
index d8e002f1664..302b8d7d610 100755
--- a/hack/.ci/lib/e2e.sh
+++ b/hack/.ci/lib/e2e.sh
@@ -212,6 +212,9 @@ function run-e2e {
   kubectl -n=scylla-manager patch --field-manager="${FIELD_MANAGER}" deployment/scylla-manager-controller --type=json -p='[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value": "--loglevel=4"}]'
   kubectl -n=scylla-manager rollout status deployment/scylla-manager-controller
 
+  kubectl create -n=e2e secret generic kubeconfigs ${KUBECONFIGS[@]/#/--from-file=} --dry-run=client -o=yaml | kubectl_create -f=-
+  kubeconfigs_in_container_path=$( IFS=','; basenames=( "${KUBECONFIGS[@]##*/}" ) && in_container_paths="${basenames[@]/#//var/run/secrets/kubeconfigs/}" && echo "${in_container_paths[*]}" )
+
   gcs_sa_in_container_path=""
   if [[ -n "${SO_GCS_SERVICE_ACCOUNT_CREDENTIALS_PATH+x}" ]]; then
     gcs_sa_in_container_path=/var/run/secrets/gcs-service-account-credentials/gcs-service-account.json
@@ -248,6 +251,7 @@ spec:
     - scylla-operator-tests
     - run
     - "${SO_SUITE}"
+    - "--kubeconfig=${kubeconfigs_in_container_path}"
     - --loglevel=2
     - --color=false
     - --artifacts-dir=/tmp/artifacts
@@ -267,12 +271,18 @@ spec:
       mountPath: /tmp/artifacts
     - name: gcs-service-account-credentials
       mountPath: /var/run/secrets/gcs-service-account-credentials
+    - name: kubeconfigs
+      mountPath: /var/run/secrets/kubeconfigs
+      readOnly: true
   volumes:
   - name: artifacts
     emptyDir: {}
   - name: gcs-service-account-credentials
     secret:
       secretName: gcs-service-account-credentials
+  - name: kubeconfigs
+    secret:
+      secretName: kubeconfigs
 EOF
   kubectl -n=e2e wait --for=condition=Ready pod/e2e
 
diff --git a/pkg/genericclioptions/genericclioptions.go b/pkg/genericclioptions/genericclioptions.go
index 3ab1eee41cb..1ab4290b93f 100644
--- a/pkg/genericclioptions/genericclioptions.go
+++ b/pkg/genericclioptions/genericclioptions.go
@@ -71,7 +71,7 @@ func NewClientConfigSet(userAgentName string) ClientConfigSet {
 func (ccs *ClientConfigSet) AddFlags(cmd *cobra.Command) {
 	ccs.ClientConfigBase.AddFlags(cmd)
 
-	cmd.PersistentFlags().StringArrayVarP(&ccs.kubeconfigs, "kubeconfig", "", ccs.kubeconfigs, "Path to kubeconfig file(s).")
+	cmd.PersistentFlags().StringSliceVarP(&ccs.kubeconfigs, "kubeconfig", "", ccs.kubeconfigs, "Path to kubeconfig file(s).")
 }
 
 func (ccs *ClientConfigSet) Validate() error {