Skip to content

Commit

Permalink
fix: enable buildkit service by default (#453)
Browse files Browse the repository at this point in the history
  • Loading branch information
@matmut7
matmut7 authored Dec 19, 2023
1 parent 0c898e7 commit 661e260
Show file tree
Hide file tree
Showing 10 changed files with 211 additions and 84 deletions.
28 changes: 20 additions & 8 deletions packages/kontinuous/tests/__snapshots__/job-builds.dev.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,12 +187,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down Expand Up @@ -367,12 +373,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down
14 changes: 10 additions & 4 deletions packages/kontinuous/tests/__snapshots__/jobs-build-options.dev.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down
28 changes: 20 additions & 8 deletions packages/kontinuous/tests/__snapshots__/jobs-build-stage.dev.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -484,12 +484,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down Expand Up @@ -664,12 +670,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down
28 changes: 20 additions & 8 deletions packages/kontinuous/tests/__snapshots__/jobs-build.dev.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,12 +483,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down Expand Up @@ -662,12 +668,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down
56 changes: 40 additions & 16 deletions packages/kontinuous/tests/__snapshots__/repo.domifa.dev.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -224,12 +224,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down Expand Up @@ -408,12 +414,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down Expand Up @@ -593,12 +605,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down Expand Up @@ -774,12 +792,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down
56 changes: 40 additions & 16 deletions packages/kontinuous/tests/__snapshots__/repo.domifa.preprod.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down Expand Up @@ -402,12 +408,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down Expand Up @@ -587,12 +599,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down Expand Up @@ -768,12 +786,18 @@ spec:
buildctl_cmd=buildctl-daemonless.sh
buildctl_cmd=\\"buildctl \\\\
--addr tcp://buildkit-service.buildkit-service.svc:1234 \\\\
\\"
buildctl_options_cache=\\"\\\\
--export-cache type=inline \\\\
--import-cache type=registry,ref=$IMAGE_PATH:feature-branch-1 \\\\
if [ -f /buildkit-certs/cert.pem ]; then
buildctl_options_mtls=\\"\\\\
--tlscacert /buildkit-certs/ca.pem \\\\
--tlscert /buildkit-certs/cert.pem \\\\
--tlskey /buildkit-certs/key.pem \\\\
\\"
fi
mkdir -p /home/user/.docker
Expand Down
Loading

0 comments on commit 661e260

Please sign in to comment.