jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-01-30 05:59:39 +02:00
Code Issues Releases Activity

Make cert updates optional based on param value (#2722)

Browse Source
This commit is contained in:
Srinikitha Kondreddy 2021-03-25 15:32:10 +01:00 committed by GitHub
parent 9679d96e7b
commit 95ebfb3b2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmd/kanikoExecute.go
View File

@ -57,9 +57,13 @@ func runKanikoExecute(config *kanikoExecuteOptions, telemetryData *telemetry.Cus
return errors.Wrap(err, "failed to initialize Kaniko container")
}
err := certificateUpdate(config.CustomTLSCertificateLinks, httpClient, fileUtils)
if err != nil {
return errors.Wrap(err, "failed to update certificates")
if len(config.CustomTLSCertificateLinks) > 0 {
err := certificateUpdate(config.CustomTLSCertificateLinks, httpClient, fileUtils)
if err != nil {
return errors.Wrap(err, "failed to update certificates")
}
} else {
log.Entry().Info("skipping updation of certificates")
}
if !piperutils.ContainsString(config.BuildOptions, "--destination") {
@ -89,6 +93,7 @@ func runKanikoExecute(config *kanikoExecuteOptions, telemetryData *telemetry.Cus
dockerConfig := []byte(`{"auths":{}}`)
if len(config.DockerConfigJSON) > 0 {
var err error
dockerConfig, err = fileUtils.FileRead(config.DockerConfigJSON)
if err != nil {
return errors.Wrapf(err, "failed to read file '%v'", config.DockerConfigJSON)

36
cmd/kanikoExecute_test.go
View File

@ -160,6 +160,31 @@ func TestRunKanikoExecute(t *testing.T) {
})
t.Run("no error case - when cert update skipped", func(t *testing.T) {
config := &kanikoExecuteOptions{
BuildOptions: []string{"--skip-tls-verify-pull"},
ContainerImageName: "myImage",
ContainerImageTag: "1.2.3-a+x",
ContainerRegistryURL: "https://my.registry.com:50000",
ContainerPreparationCommand: "rm -f /kaniko/.docker/config.json",
CustomTLSCertificateLinks: []string{},
DockerfilePath: "Dockerfile",
DockerConfigJSON: "path/to/docker/config.json",
}
runner := &mock.ExecMockRunner{}
certClient := &kanikoMockClient{}
fileUtils := &kanikoFileMock{
fileWriteContent: map[string]string{},
fileReadErr: map[string]error{"/kaniko/ssl/certs/ca-certificates.crt": fmt.Errorf("read error")},
}
err := runKanikoExecute(config, &telemetry.CustomData{}, &commonPipelineEnvironment, runner, certClient, fileUtils)
assert.NoErrorf(t, err, "failed to update certificates: failed to load file '/kaniko/ssl/certs/ca-certificates.crt': read error")
})
t.Run("success case - no push, no docker config.json", func(t *testing.T) {
config := &kanikoExecuteOptions{
ContainerBuildOptions: "--skip-tls-verify-pull",
@ -249,7 +274,16 @@ func TestRunKanikoExecute(t *testing.T) {
})
t.Run("error case - cert update failed", func(t *testing.T) {
config := &kanikoExecuteOptions{}
config := &kanikoExecuteOptions{
BuildOptions: []string{"--skip-tls-verify-pull"},
ContainerImageName: "myImage",
ContainerImageTag: "1.2.3-a+x",
ContainerRegistryURL: "https://my.registry.com:50000",
ContainerPreparationCommand: "rm -f /kaniko/.docker/config.json",
CustomTLSCertificateLinks: []string{"https://test.url/cert.crt"},
DockerfilePath: "Dockerfile",
DockerConfigJSON: "path/to/docker/config.json",
}
runner := &mock.ExecMockRunner{}