Support image pull secrets (grafana#145)

* define input for imagePullSecrets

* assign imagePullSecrets to each job type

* update manifest template

* add ignore for vscode

* take imagePullSecrets out of spec

* formatting

Author: kneemaa

.gitignore

@@ -24,3 +24,5 @@ bin
 /manager
 
 kubebuilder-tools-*
+
+.vscode

api/v1alpha1/k6_types.go

@@ -25,17 +25,18 @@ type PodMetadata struct {
 }
 
 type Pod struct {
-	Affinity                     *corev1.Affinity            `json:"affinity,omitempty"`
-	AutomountServiceAccountToken string                      `json:"automountServiceAccountToken,omitempty"`
-	Env                          []corev1.EnvVar             `json:"env,omitempty"`
-	Image                        string                      `json:"image,omitempty"`
-	Metadata                     PodMetadata                 `json:"metadata,omitempty"`
-	NodeSelector                 map[string]string           `json:"nodeselector,omitempty"`
-	Tolerations                  []corev1.Toleration         `json:"tolerations,omitempty"`
-	Resources                    corev1.ResourceRequirements `json:"resources,omitempty"`
-	ServiceAccountName           string                      `json:"serviceAccountName,omitempty"`
-	SecurityContext              corev1.PodSecurityContext   `json:"securityContext,omitempty"`
-	EnvFrom                      []corev1.EnvFromSource      `json:"envFrom,omitempty"`
+	Affinity                     *corev1.Affinity              `json:"affinity,omitempty"`
+	AutomountServiceAccountToken string                        `json:"automountServiceAccountToken,omitempty"`
+	Env                          []corev1.EnvVar               `json:"env,omitempty"`
+	Image                        string                        `json:"image,omitempty"`
+	ImagePullSecrets             []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`
+	Metadata                     PodMetadata                   `json:"metadata,omitempty"`
+	NodeSelector                 map[string]string             `json:"nodeselector,omitempty"`
+	Tolerations                  []corev1.Toleration           `json:"tolerations,omitempty"`
+	Resources                    corev1.ResourceRequirements   `json:"resources,omitempty"`
+	ServiceAccountName           string                        `json:"serviceAccountName,omitempty"`
+	SecurityContext              corev1.PodSecurityContext     `json:"securityContext,omitempty"`
+	EnvFrom                      []corev1.EnvFromSource        `json:"envFrom,omitempty"`
 }
 
 type K6Scuttle struct {

api/v1alpha1/zz_generated.deepcopy.go

@@ -848,6 +848,17 @@ spec:
                     type: array
                   image:
                     type: string
+                  imagePullSecrets:
+                    items:
+                      description: LocalObjectReference contains enough information
+                        to let you locate the referenced object inside the same namespace.
+                      properties:
+                        name:
+                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            TODO: Add other useful fields. apiVersion, kind, uid?'
+                          type: string
+                      type: object
+                    type: array
                   metadata:
                     properties:
                       annotations:
@@ -1877,6 +1888,17 @@ spec:
                     type: array
                   image:
                     type: string
+                  imagePullSecrets:
+                    items:
+                      description: LocalObjectReference contains enough information
+                        to let you locate the referenced object inside the same namespace.
+                      properties:
+                        name:
+                          description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                            TODO: Add other useful fields. apiVersion, kind, uid?'
+                          type: string
+                      type: object
+                    type: array
                   metadata:
                     properties:
                       annotations:

config/crd/bases/k6.io_k6s.yaml

@@ -84,6 +84,7 @@ func NewInitializerJob(k6 *v1alpha1.K6, argLine string) (*batchv1.Job, error) {
 					NodeSelector:                 k6.Spec.Runner.NodeSelector,
 					Tolerations:                  k6.Spec.Runner.Tolerations,
 					RestartPolicy:                corev1.RestartPolicyNever,
+					ImagePullSecrets:             k6.Spec.Runner.ImagePullSecrets,
 					Containers: []corev1.Container{
 						{
 							Image:        image,

pkg/resources/jobs/initializer.go

@@ -149,6 +149,7 @@ func NewRunnerJob(k6 *v1alpha1.K6, index int, testRunId, token string) (*batchv1
 					NodeSelector:                 k6.Spec.Runner.NodeSelector,
 					Tolerations:                  k6.Spec.Runner.Tolerations,
 					SecurityContext:              &k6.Spec.Runner.SecurityContext,
+					ImagePullSecrets:             k6.Spec.Runner.ImagePullSecrets,
 					Containers: []corev1.Container{{
 						Image:        image,
 						Name:         "k6",

pkg/resources/jobs/runner.go

@@ -64,6 +64,7 @@ func NewStarterJob(k6 *v1alpha1.K6, hostname []string) *batchv1.Job {
 					Tolerations:                  k6.Spec.Starter.Tolerations,
 					RestartPolicy:                corev1.RestartPolicyNever,
 					SecurityContext:              &k6.Spec.Starter.SecurityContext,
+					ImagePullSecrets:             k6.Spec.Starter.ImagePullSecrets,
 					Containers: []corev1.Container{
 						containers.NewCurlContainer(hostname, starterImage, command, env),
 					},