Skip to content

feat: implement kaniko.imagePullSecret for pulling images from private registry w/ auth #9665

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.

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
6 changes: 6 additions & 0 deletions docs-v2/content/en/schemas/v4beta12.json
Original file line number Diff line number Diff line change
@@ -2763,6 +2763,11 @@
"description": "specify a file to save the image name with digest of the built image to.",
"x-intellij-html-description": "specify a file to save the image name with digest of the built image to."
},
"imagePullSecret": {
"type": "string",
"description": "name of the Kubernetes secret for pulling kaniko image and kaniko init image from a private registry.",
"x-intellij-html-description": "name of the Kubernetes secret for pulling kaniko image and kaniko init image from a private registry."
},
"initImage": {
"type": "string",
"description": "image used to run init container which mounts kaniko context.",
@@ -2929,6 +2934,7 @@
"target",
"initImage",
"image",
"imagePullSecret",
"destination",
"digestFile",
"imageFSExtractRetry",
7 changes: 7 additions & 0 deletions pkg/skaffold/build/cluster/pod.go
Original file line number Diff line number Diff line change
@@ -95,6 +95,13 @@ func (b *Builder) kanikoPodSpec(artifact *latest.KanikoArtifact, tag string, pla
addSecretVolume(pod, kaniko.DefaultSecretName, b.ClusterDetails.PullSecretMountPath, b.ClusterDetails.PullSecretName)
}

// Add secret for pulling kaniko images from a private registry
if artifact.ImagePullSecret != "" {
pod.Spec.ImagePullSecrets = []v1.LocalObjectReference{{
Name: artifact.ImagePullSecret,
}}
}

// Add host path volume for cache
if artifact.Cache != nil && artifact.Cache.HostPath != "" {
addHostPathVolume(pod, kaniko.DefaultCacheDirName, kaniko.DefaultCacheDirMountPath, artifact.Cache.HostPath)
10 changes: 7 additions & 3 deletions pkg/skaffold/build/cluster/pod_test.go
Original file line number Diff line number Diff line change
@@ -181,9 +181,10 @@ func TestKanikoArgs(t *testing.T) {

func TestKanikoPodSpec(t *testing.T) {
artifact := &latest.KanikoArtifact{
Image: "image",
DockerfilePath: "Dockerfile",
InitImage: "init/image",
Image: "image",
DockerfilePath: "Dockerfile",
InitImage: "init/image",
ImagePullSecret: "image-pull-secret",
Destination: []string{
"gcr.io/foo/bar:test-1",
"gcr.io/foo/bar:test-2",
@@ -353,6 +354,9 @@ func TestKanikoPodSpec(t *testing.T) {
},
},
}},
ImagePullSecrets: []v1.LocalObjectReference{{
Name: "image-pull-secret",
}},
ServiceAccountName: "aVerySpecialSA",
SecurityContext: &v1.PodSecurityContext{
RunAsUser: &runAsUser,
3 changes: 3 additions & 0 deletions pkg/skaffold/schema/latest/config.go
Original file line number Diff line number Diff line change
@@ -1471,6 +1471,9 @@ type KanikoArtifact struct {
// Defaults to the latest released version of `gcr.io/kaniko-project/executor`.
Image string `yaml:"image,omitempty"`

// ImagePullSecret is the name of the Kubernetes secret for pulling kaniko image and kaniko init image from a private registry.
ImagePullSecret string `yaml:"imagePullSecret,omitempty"`

// Destination is additional tags to push.
Destination []string `yaml:"destination,omitempty"`