Skip to content

feat: support for docker buildx k8s driver #3743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 16, 2023
Merged

feat: support for docker buildx k8s driver #3743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c23c94f
flags added to configure buildx kubedriver
gireesh-naidu Aug 7, 2023
dfd2eae
taking buildnodes as comma seperated strings
gireesh-naidu Aug 7, 2023
52e94a0
Merge branch 'main' into buildx-k8s-driver
gireesh-naidu Aug 8, 2023
4aaae86
deriving buildxK8sDriver from drivernodes
gireesh-naidu Aug 10, 2023
0a7043c
using buildxK8sDriver when useBuildx is true
gireesh-naidu Aug 10, 2023
f89a9c0
getting raw buildxDriverOptions from env var
gireesh-naidu Aug 10, 2023
fbf7ac0
added prestop lifecycle hook to clean up buildx k8s driver nodes
gireesh-naidu Aug 13, 2023
1fca9bf
add life cycle hook for buildx k8s driver mode only
gireesh-naidu Aug 14, 2023
67356a1
removed lifecycle hook
gireesh-naidu Aug 14, 2023
b21595f
Merge branch 'main' into buildx-k8s-driver
gireesh-naidu Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pkg/pipeline/CiConfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ type CiConfig struct {
ImageRetryInterval int `env:"IMAGE_RETRY_INTERVAL" envDefault:"5"` //image retry interval takes value in seconds
OrchestratorHost string `env:"ORCH_HOST" envDefault:"http://devtroncd-orchestrator-service-prod.devtroncd/webhook/msg/nats"`
OrchestratorToken string `env:"ORCH_TOKEN" envDefault:""`
BuildxK8sDriverOptions string `env:"BUILDX_K8S_DRIVER_OPTIONS" envDefault:""`
}

type CiVolumeMount struct {
Expand Down
28 changes: 28 additions & 0 deletions pkg/pipeline/CiService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package pipeline

import (
"encoding/json"
"errors"
"fmt"
appRepository "github.com/devtron-labs/devtron/internal/sql/repository/app"
Expand Down Expand Up @@ -171,6 +172,14 @@ func (impl *CiServiceImpl) TriggerCiPipeline(trigger Trigger) (int, error) {
return 0, err
}

if impl.ciConfig != nil && impl.ciConfig.UseBuildx && impl.ciConfig.BuildxK8sDriverOptions != "" {
err = impl.setBuildxK8sDriverData(workflowRequest)
if err != nil {
impl.Logger.Errorw("error in setBuildxK8sDriverData", "BUILDX_K8S_DRIVER_OPTIONS", impl.ciConfig.BuildxK8sDriverOptions, "err", err)
return 0, err
}
}

//savedCiWf.LogLocation = impl.ciConfig.DefaultBuildLogsKeyPrefix + "/" + workflowRequest.WorkflowNamePrefix + "/main.log"
savedCiWf.LogLocation = fmt.Sprintf("%s/%s/main.log", impl.ciConfig.DefaultBuildLogsKeyPrefix, workflowRequest.WorkflowNamePrefix)
err = impl.updateCiWorkflow(workflowRequest, savedCiWf)
Expand All @@ -192,6 +201,25 @@ func (impl *CiServiceImpl) TriggerCiPipeline(trigger Trigger) (int, error) {
return savedCiWf.Id, err
}

func (impl *CiServiceImpl) setBuildxK8sDriverData(workflowRequest *WorkflowRequest) error {
ciBuildConfig := workflowRequest.CiBuildConfig
if ciBuildConfig != nil {
if dockerBuildConfig := ciBuildConfig.DockerBuildConfig; dockerBuildConfig != nil {
buildxK8sDriverOptions := make([]map[string]string, 0)
err := json.Unmarshal([]byte(impl.ciConfig.BuildxK8sDriverOptions), &buildxK8sDriverOptions)
if err != nil {
errMsg := "error in parsing BUILDX_K8S_DRIVER_OPTIONS from the devtron-cm, "
err = errors.New(errMsg + "error : " + err.Error())
impl.Logger.Errorw(errMsg, "err", err)
return err
} else {
dockerBuildConfig.BuildxK8sDriverOptions = buildxK8sDriverOptions
}
}
}
return nil
}

func (impl *CiServiceImpl) getEnvironmentForJob(pipeline *pipelineConfig.CiPipeline, trigger Trigger) (*repository1.Environment, bool, error) {
app, err := impl.appRepository.FindById(pipeline.AppId)
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions pkg/pipeline/WorkflowService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ func (impl *WorkflowServiceImpl) SubmitWorkflow(workflowRequest *WorkflowRequest
ArchiveLogs: &archiveLogs,
},
}

if isJob {
ciTemplate, err = getCiTemplateWithConfigMapsAndSecrets(&configMaps, &secrets, ciTemplate, existingConfigMap, existingSecrets)
}
Expand Down
19 changes: 10 additions & 9 deletions pkg/pipeline/bean/CiBuildConfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,16 @@ type CiBuildConfigBean struct {
}

type DockerBuildConfig struct {
DockerfilePath string `json:"dockerfileRelativePath,omitempty"`
DockerfileContent string `json:"dockerfileContent"`
Args map[string]string `json:"args,omitempty"`
TargetPlatform string `json:"targetPlatform,omitempty"`
Language string `json:"language,omitempty"`
LanguageFramework string `json:"languageFramework,omitempty"`
DockerBuildOptions map[string]string `json:"dockerBuildOptions,omitempty"`
BuildContext string `json:"buildContext,omitempty"`
UseBuildx bool `json:"useBuildx"`
DockerfilePath string `json:"dockerfileRelativePath,omitempty"`
DockerfileContent string `json:"dockerfileContent"`
Args map[string]string `json:"args,omitempty"`
TargetPlatform string `json:"targetPlatform,omitempty"`
Language string `json:"language,omitempty"`
LanguageFramework string `json:"languageFramework,omitempty"`
DockerBuildOptions map[string]string `json:"dockerBuildOptions,omitempty"`
BuildContext string `json:"buildContext,omitempty"`
UseBuildx bool `json:"useBuildx"`
BuildxK8sDriverOptions []map[string]string `json:"buildxK8SDriverOptions,omitempty"`
}

type BuildPackConfig struct {
Expand Down