github/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-09-05 09:16:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for k8s serviceAccount and nodeSelector (#1842)

Browse Source 
Add the possiblity to specify the Kubernetes serviceAccount and/or
nodeSelector to be used on individual steps for Kubernetes executor
This commit is contained in:
Ovidiu Calbajos
2023-06-12 17:00:59 +03:00
committed by GitHub
parent b5b3b95721
commit 609ba481b5
6 changed files with 58 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pipeline/backend/kubernetes/pod.go
View File

@@ -80,6 +80,11 @@ func Pod(namespace string, step *types.Step, labels, annotations map[string]stri
}
}
var ServiceAccountName string
if step.BackendOptions.Kubernetes.ServiceAccountName != "" {
ServiceAccountName = step.BackendOptions.Kubernetes.ServiceAccountName
}
podName, err := dnsName(step.Name)
if err != nil {
return nil, err
@@ -97,6 +102,10 @@ func Pod(namespace string, step *types.Step, labels, annotations map[string]stri
NodeSelector := map[string]string{"kubernetes.io/arch": strings.Split(platform, "/")[1]}
for key, val := range step.BackendOptions.Kubernetes.NodeSelector {
NodeSelector[key] = val
}
pod := &v1.Pod{
ObjectMeta: metav1.ObjectMeta{
Name: podName,
@@ -105,9 +114,10 @@ func Pod(namespace string, step *types.Step, labels, annotations map[string]stri
Annotations: annotations,
},
Spec: v1.PodSpec{
RestartPolicy: v1.RestartPolicyNever,
HostAliases: hostAliases,
NodeSelector: NodeSelector,
RestartPolicy: v1.RestartPolicyNever,
HostAliases: hostAliases,
NodeSelector: NodeSelector,
ServiceAccountName: ServiceAccountName,
Containers: []v1.Container{{
Name: podName,
Image: step.Image,