allow entire podspec to be passed in run collector

replicatedhq · Apr 19, 2022 · 648f9b8 · 648f9b8
1 parent aeb89e5
commit 648f9b8
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 27 deletions.
diff --git a/pkg/apis/troubleshoot/v1beta2/collector_shared.go b/pkg/apis/troubleshoot/v1beta2/collector_shared.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/replicatedhq/troubleshoot/pkg/multitype"
 	authorizationv1 "k8s.io/api/authorization/v1"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -75,6 +76,7 @@ type Run struct {
 	ImagePullPolicy    string            `json:"imagePullPolicy,omitempty" yaml:"imagePullPolicy,omitempty"`
 	ImagePullSecret    *ImagePullSecrets `json:"imagePullSecret,omitempty" yaml:"imagePullSecret,omitempty"`
 	ServiceAccountName string            `json:"serviceAccountName,omitempty" yaml:"serviceAccountName,omitempty"`
+	PodSpec            corev1.PodSpec    `json:"podSpec,omitempty" yaml:"podSpec,omitempty"`
 }
 
 type ImagePullSecrets struct {

diff --git a/pkg/apis/troubleshoot/v1beta2/zz_generated.deepcopy.go b/pkg/apis/troubleshoot/v1beta2/zz_generated.deepcopy.go
diff --git a/pkg/collect/run.go b/pkg/collect/run.go
@@ -140,38 +140,63 @@ func runPod(ctx context.Context, client *kubernetes.Clientset, runCollector *tro
 		serviceAccountName = runCollector.ServiceAccountName
 	}
 
-	pod := corev1.Pod{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      runCollector.CollectorName,
-			Namespace: namespace,
-			Labels:    podLabels,
-		},
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: "v1",
-			Kind:       "Pod",
-		},
-		Spec: corev1.PodSpec{
-			RestartPolicy:      corev1.RestartPolicyNever,
-			ServiceAccountName: serviceAccountName,
-			Containers: []corev1.Container{
-				{
-					Image:           runCollector.Image,
-					ImagePullPolicy: pullPolicy,
-					Name:            "collector",
-					Command:         runCollector.Command,
-					Args:            runCollector.Args,
+	pod := corev1.Pod{}
+	if runCollector.PodSpec.Containers != nil {
+		pod = corev1.Pod{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      runCollector.CollectorName,
+				Namespace: namespace,
+				Labels:    podLabels,
+			},
+			TypeMeta: metav1.TypeMeta{
+				APIVersion: "v1",
+				Kind:       "Pod",
+			},
+			Spec: runCollector.PodSpec,
+		}
+
+		if runCollector.PodSpec.ImagePullSecret != nil && runCollector.PodSpec.ImagePullSecret.Data != nil {
+			secretName, err := createSecret(ctx, client, pod.Namespace, runCollector.PodSpec.ImagePullSecret)
+			if err != nil {
+				return nil, errors.Wrap(err, "failed to create secret")
+			}
+			pod.Spec.ImagePullSecrets = append(pod.Spec.ImagePullSecrets, corev1.LocalObjectReference{Name: secretName})
+		}
+	} else {
+		pod = corev1.Pod{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      runCollector.CollectorName,
+				Namespace: namespace,
+				Labels:    podLabels,
+			},
+			TypeMeta: metav1.TypeMeta{
+				APIVersion: "v1",
+				Kind:       "Pod",
+			},
+			Spec: corev1.PodSpec{
+				RestartPolicy:      corev1.RestartPolicyNever,
+				ServiceAccountName: serviceAccountName,
+				Containers: []corev1.Container{
+					{
+						Image:           runCollector.Image,
+						ImagePullPolicy: pullPolicy,
+						Name:            "collector",
+						Command:         runCollector.Command,
+						Args:            runCollector.Args,
+					},
 				},
 			},
-		},
-	}
+		}
 
-	if runCollector.ImagePullSecret != nil && runCollector.ImagePullSecret.Data != nil {
-		secretName, err := createSecret(ctx, client, pod.Namespace, runCollector.ImagePullSecret)
-		if err != nil {
-			return nil, errors.Wrap(err, "failed to create secret")
+		if runCollector.ImagePullSecret != nil && runCollector.ImagePullSecret.Data != nil {
+			secretName, err := createSecret(ctx, client, pod.Namespace, runCollector.ImagePullSecret)
+			if err != nil {
+				return nil, errors.Wrap(err, "failed to create secret")
+			}
+			pod.Spec.ImagePullSecrets = append(pod.Spec.ImagePullSecrets, corev1.LocalObjectReference{Name: secretName})
 		}
-		pod.Spec.ImagePullSecrets = append(pod.Spec.ImagePullSecrets, corev1.LocalObjectReference{Name: secretName})
 	}
+
 	created, err := client.CoreV1().Pods(namespace).Create(ctx, &pod, metav1.CreateOptions{})
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create pod")