Skip to content
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

feat(image-builder): Add mechanism to pass api server env vars to kaniko build jobs #398

Merged
merged 3 commits into from
Jan 2, 2025
Merged

feat(image-builder): Add mechanism to pass api server env vars to kaniko build jobs #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
648565b
Add mechanism to pass api server env vars to kaniko build jobs
deadlycoconuts Jan 2, 2025
c77bc15
Fix lint comments
deadlycoconuts Jan 2, 2025
d0f0b05
Fix inline comments
deadlycoconuts Jan 2, 2025
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
7 changes: 6 additions & 1 deletion api/turing/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,8 @@ type KanikoConfig struct {
ImageVersion string `validate:"required"`
// AdditionalArgs allows platform-level additional arguments to be configured for Kaniko jobs
AdditionalArgs []string
// APIServerEnvVars allows extra API-server environment variables to be passed to Kaniko jobs
APIServerEnvVars []string
// Kaniko kubernetes service account
ServiceAccount string
// ResourceRequestsLimits is the resources required by Kaniko executor.
Expand Down Expand Up @@ -439,8 +441,11 @@ type MlflowConfig struct {
// Note that the Kaniko image builder needs to be configured correctly to have the necessary credentials to download
// the artifacts from the blob storage tool depending on the artifact service type selected (gcs/s3). For gcs, the
// credentials can be provided via a k8s service account or a secret but for s3, the credentials can be provided via
// additional arguments in the config KanikoConfig.AdditionalArgs e.g.
// 1) additional arguments in the config KanikoConfig.AdditionalArgs e.g.
// --build-arg=[AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY/AWS_DEFAULT_REGION/AWS_ENDPOINT_URL]=xxx
// OR
// 2) additional arguments in the config KanikoConfig.APIServerEnvVars, which will pass the specified environment
// variables PRESENT within the Turing API server's container to the image builder as build arguments
ArtifactServiceType string `validate:"required,oneof=nop gcs s3"`
}

Expand Down
6 changes: 6 additions & 0 deletions api/turing/imagebuilder/imagebuilder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"net/http"
"os"
"sort"
"strings"
"time"
Expand Down Expand Up @@ -320,6 +321,11 @@ func (ib *imageBuilder) createKanikoJob(
volumes, volumeMounts = ib.configureVolumesAndVolumeMountsToAddCredentials(volumes, volumeMounts)
envVars = ib.configureEnvVarsToAddCredentials(envVars)

// Add all other env vars that are propagated from the API server as build args
for _, envVar := range ib.imageBuildingConfig.KanikoConfig.APIServerEnvVars {
kanikoArgs = append(kanikoArgs, fmt.Sprintf("--build-arg=%s=%s", envVar, os.Getenv(envVar)))
}

job := cluster.Job{
Name: kanikoJobName,
Namespace: ib.imageBuildingConfig.BuildNamespace,
Expand Down
Loading