feat: added environment setup.

README.md

@@ -31,6 +31,8 @@ kind: Runner
 metadata:
   name: runner-sample
 spec:
+  environment:
+    - "bar=foo"
   concurrent: 1
   log_level: info
   gitlab_instance_url: https://gitlab.com

api/v1beta1/runner_types.go

@@ -45,6 +45,10 @@ type RunnerSpec struct {
 	CheckInterval int `json:"check_interval,omitempty"`
 
 	ExecutorConfig KubernetesConfig `json:"executor_config,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// Environment contains custom environment variables injected to build environment
+	Environment []string `json:"environment,omitempty"`
 }
 
 // RunnerStatus defines the observed state of Runner

config/crd/bases/gitlab.k8s.alekc.dev_runners.yaml

@@ -42,6 +42,12 @@ spec:
               concurrent:
                 minimum: 1
                 type: integer
+              environment:
+                description: Environment contains custom environment variables injected
+                  to build environment
+                items:
+                  type: string
+                type: array
               executor_config:
                 properties:
                   affinity:

controllers/runner_controller_test.go

@@ -134,6 +134,7 @@ var _ = Describe("Runner controller", func() {
 			//
 			tc.CheckRunner(createdRunner)
 		},
+		table.Entry("Should support setting of env var for build env", caseEnvironmentIsSpecified),
 		table.Entry("Should have created a different registration on tag update", caseTagsChanged),
 		table.Entry("Should have created a different registration on registration token update", caseRegistrationTokenChanged),
 		table.Entry("Should have updated runner status with auth token", caseTestAuthToken),
@@ -211,6 +212,17 @@ func caseCheckDeployment(tc *testCase) {
 	}
 }
 
+func caseEnvironmentIsSpecified(tc *testCase) {
+	ctx := context.Background()
+	tc.Runner.Spec.Environment = []string{"foo=bar"}
+	tc.CheckRunner = func(runner *v1beta1.Runner) {
+		var deployment appsv1.Deployment
+		Eventually(func() bool {
+			return k8sClient.Get(ctx, nameSpacedDependencyName(runner), &deployment) == nil
+		}, timeout, interval).Should(BeTrue())
+	}
+}
+
 // caseTagsChanged deals with situation when we change tags for an existing runner
 func caseTagsChanged(tc *testCase) {
 	ctx := context.Background()

internal/generate/config.go

@@ -21,8 +21,9 @@ func ConfigText(runnerObject *v1beta1.Runner) (gitlabConfig, configHashKey strin
 			URL:   runnerObject.Spec.GitlabInstanceURL,
 		},
 		RunnerSettings: config.RunnerSettings{
-			Executor:   "kubernetes",
-			Kubernetes: &runnerObject.Spec.ExecutorConfig,
+			Environment: runnerObject.Spec.Environment,
+			Executor:    "kubernetes",
+			Kubernetes:  &runnerObject.Spec.ExecutorConfig,
 		},
 	}
 	// set the namespace to the same one as the runner object if not declared otherwise