Merge pull request #138 from DataDog/jlegrone/k8s-extended-config

Support Pod annotations and node tolerations in Kubernetes Driver
cnabio · Oct 3, 2019 · 525007a · 525007a
2 parents 75605e8 + 9871edc
commit 525007a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/driver/kubernetes/kubernetes.go b/driver/kubernetes/kubernetes.go
@@ -34,8 +34,10 @@ const (
 type Driver struct {
 	Namespace             string
 	ServiceAccountName    string
+	Annotations           map[string]string
 	LimitCPU              resource.Quantity
 	LimitMemory           resource.Quantity
+	Tolerations           []v1.Toleration
 	ActiveDeadlineSeconds int64
 	BackoffLimit          int32
 	SkipCleanup           bool
@@ -141,12 +143,14 @@ func (k *Driver) Run(op *driver.Operation) (driver.OperationResult, error) {
 			BackoffLimit:          &k.BackoffLimit,
 			Template: v1.PodTemplateSpec{
 				ObjectMeta: metav1.ObjectMeta{
-					Labels: labelMap,
+					Labels:      labelMap,
+					Annotations: k.Annotations,
 				},
 				Spec: v1.PodSpec{
 					ServiceAccountName:           k.ServiceAccountName,
 					AutomountServiceAccountToken: &mountServiceAccountToken,
 					RestartPolicy:                v1.RestartPolicyNever,
+					Tolerations:                  k.Tolerations,
 				},
 			},
 		},