diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 335d83841b..a10383d3c6 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -76,6 +76,7 @@ ENV SSL_CERT_DIR=/kaniko/ssl/certs FROM kaniko-base-slim AS kaniko-base COPY --from=builder --chown=0:0 /usr/local/bin/docker-credential-gcr /kaniko/docker-credential-gcr +COPY --from=builder --chown=0:0 /usr/local/bin/docker-credential-gcr /kaniko/docker-credential-gcloud COPY --from=builder --chown=0:0 /usr/local/bin/docker-credential-ecr-login /kaniko/docker-credential-ecr-login COPY --from=builder --chown=0:0 /usr/local/bin/docker-credential-acr-env /kaniko/docker-credential-acr-env diff --git a/integration/integration_test.go b/integration/integration_test.go index ab59771652..8e4b163e81 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -18,6 +18,7 @@ package integration import ( "archive/tar" + "bytes" "context" "encoding/json" "flag" @@ -601,6 +602,23 @@ func buildImage(t *testing.T, dockerfile string, imageBuilder *DockerFileBuilder t.Logf("Building image '%v'...", dockerfile) if err := imageBuilder.BuildImage(t, config, dockerfilesPath, dockerfile); err != nil { + // Define the command and arguments + cmd := exec.Command("kubectl", "--kubeconfig=/etc/rancher/k3s/k3s.yaml", "get", "po", "-n", "kube-system") + + // Create a buffer to capture the output + var out bytes.Buffer + cmd.Stdout = &out + + // Run the command + err := cmd.Run() + if err != nil { + log.Fatal(err) + } + + // Store the output in a string + cmdOutput := out.String() + + t.Errorf("cmdOutput: %s\n", cmdOutput) t.Errorf("Error building image: %s", err) t.FailNow() } @@ -1003,7 +1021,7 @@ func initIntegrationTestConfig() *integrationTestConfig { } if c.isGcrRepository() && c.gcsBucket == "" { - log.Fatalf("You must provide a gcs bucket when using a Google Container Registry (\"%s\" was provided)", c.imageRepo) + log.Fatalf("You must provide a gcs bucket when using a Google Container Registry (\"%s\" was provided)", c.gcsBucket) } if !strings.HasSuffix(c.imageRepo, "/") { c.imageRepo = c.imageRepo + "/"