[image-builder] Backport mkIII from gitpod-com #4251
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
csweichel
force-pushed
the
cw/imgbuilder-mk3
branch
7 times, most recently
from
b08fff7 to
5cfb685
Compare
aledbf
reviewed
May 19, 2021
csweichel
force-pushed
the
cw/imgbuilder-mk3
branch
2 times, most recently
from
5be432b to
f504484
Compare
aledbf
reviewed
May 19, 2021
csweichel
force-pushed
the
cw/imgbuilder-mk3
branch
2 times, most recently
from
9abc5c3 to
07d3643
Compare
aledbf
reviewed
May 19, 2021
csweichel
force-pushed
the
cw/imgbuilder-mk3
branch
6 times, most recently
from
6ce0835 to
c24d574
Compare
|
/werft run 👍 started the job as gitpod-build-cw-imgbuilder-mk3.21 |
csweichel
force-pushed
the
cw/imgbuilder-mk3
branch
9 times, most recently
from
5cb6552 to
4a02b90
Compare
csweichel
force-pushed
the
cw/imgbuilder-mk3
branch
10 times, most recently
from
0110a7b to
6797b4d
Compare
|
It's building again: |
csweichel
force-pushed
the
cw/imgbuilder-mk3
branch
6 times, most recently
from
9a7b1c8 to
ee1bce9
Compare
csweichel
force-pushed
the
cw/imgbuilder-mk3
branch
from
ee1bce9 to
04af15a
Compare
|
/werft run 👍 started the job as gitpod-build-cw-imgbuilder-mk3.51 |
|
Here are some first results of trying this out:
Logs of the imagebuild pod
|
There was a problem hiding this comment.
I've looked over the code. However, due to the amount not everything in detail. What I've seen looks pretty good so far. I have a few minor comments.
I have not been able to test this completely yet (see comment). Don't know if it's just the preview env or whether there is a bug. Would like to run some additional tests when it works again.
| "ghost.yaml": | | ||
| {{ dict | merge ($comp.templates.ghost | default dict) (include "coreWorkspaceAffinity" (dict "comp" $comp "tpe" "ghost") | fromYaml) | toJson | indent 4 }} | ||
| {{- end }} | ||
| {{ if (or $comp.templates.imagebuild $comp.affinity) }} | ||
| "imagebuild.yaml": | | ||
| {{ dict | merge ($comp.templates.ghost | default dict) (include "coreWorkspaceAffinity" (dict "comp" $comp "tpe" "imagebuild") | fromYaml) | toJson | indent 4 }} |
There was a problem hiding this comment.
Is there a reason that it is $comp.templates.ghost instead of $comp.templates.imagebuild?
Suggested change
| {{ dict | merge ($comp.templates.ghost | default dict) (include "coreWorkspaceAffinity" (dict "comp" $comp "tpe" "imagebuild") | fromYaml) | toJson | indent 4 }} | |
| {{ dict | merge ($comp.templates.imagebuild | default dict) (include "coreWorkspaceAffinity" (dict "comp" $comp "tpe" "imagebuild") | fromYaml) | toJson | indent 4 }} |
Comment on lines
+36
to
+43
| "wsman": { | ||
| "address": "ws-manager:8080", | ||
| "tls": { | ||
| "ca": "/wsman-certs/ca.crt", | ||
| "crt": "/wsman-certs/tls.crt", | ||
| "key": "/wsman-certs/tls.key" | ||
| } | ||
| }, |
There was a problem hiding this comment.
I know that the selection of the ws-manager is future work but what do you think of at least having something like this:
(However, that's not a blocker, though. Feel free to ignore.)
Suggested change
| "wsman": { | |
| "address": "ws-manager:8080", | |
| "tls": { | |
| "ca": "/wsman-certs/ca.crt", | |
| "crt": "/wsman-certs/tls.crt", | |
| "key": "/wsman-certs/tls.key" | |
| } | |
| }, | |
| {{- if $comp.wsman -}} | |
| {{ $comp.wsman | fromYaml | toJson }} | |
| {{- else -}} | |
| "wsman": { | |
| "address": "ws-manager:8080", | |
| "tls": { | |
| "ca": "/wsman-certs/ca.crt", | |
| "crt": "/wsman-certs/tls.crt", | |
| "key": "/wsman-certs/tls.key" | |
| } | |
| }, | |
| {{- end -}} |
Comment on lines
+25
to
+30
| touch ~/.hushlogin && \ | ||
| # Configure shell | ||
| BASH_RC=~/.bashrc; if [ -f "$BASH_RC" ]; then cp "$BASH_RC" ~/.bashrc-org; else touch ~/.bashrc-org; fi && \ | ||
| cat /var/gitpod/gitpod/.bashrc-prepend > "$BASH_RC" && \ | ||
| cat ~/.bashrc-org >> "$BASH_RC" && \ | ||
| cat /var/gitpod/gitpod/.bashrc-append >> "$BASH_RC" |
There was a problem hiding this comment.
Minor: Ugly whitespacing.
Suggested change
| touch ~/.hushlogin && \ | |
| # Configure shell | |
| BASH_RC=~/.bashrc; if [ -f "$BASH_RC" ]; then cp "$BASH_RC" ~/.bashrc-org; else touch ~/.bashrc-org; fi && \ | |
| cat /var/gitpod/gitpod/.bashrc-prepend > "$BASH_RC" && \ | |
| cat ~/.bashrc-org >> "$BASH_RC" && \ | |
| cat /var/gitpod/gitpod/.bashrc-append >> "$BASH_RC" | |
| touch ~/.hushlogin && \ | |
| # Configure shell | |
| BASH_RC=~/.bashrc; if [ -f "$BASH_RC" ]; then cp "$BASH_RC" ~/.bashrc-org; else touch ~/.bashrc-org; fi && \ | |
| cat /var/gitpod/gitpod/.bashrc-prepend > "$BASH_RC" && \ | |
| cat ~/.bashrc-org >> "$BASH_RC" && \ | |
| cat /var/gitpod/gitpod/.bashrc-append >> "$BASH_RC" |
| } | ||
|
|
||
| func prewarmCache(cl *client.Client, images []string) error { | ||
| bld := llb.Image("alpine:latest").Run(llb.Shlex("echo")) |
There was a problem hiding this comment.
Would love if we could make the alpine:latest image configurable in the values.yaml file again.
| } | ||
| pulllb, err := bld.Marshal(context.Background()) | ||
| if err != nil { | ||
| log.WithError(err).Fatal("cannot produce iamge pull LLB") |
There was a problem hiding this comment.
Typo:
Suggested change
| log.WithError(err).Fatal("cannot produce iamge pull LLB") | |
| log.WithError(err).Fatal("cannot produce image pull LLB") |
5 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR backports the image-builder mkIII from the gitpod-com repo. image-builder mkIII is the third rewrite of image-builder and works fundamentally different to is predecessors:
While its implementation is really different to previous iterations it maintains the same interface and is a drop-in replacement for image-builder mkII.
Note: because this is essentially a backport of previous work it comes in a single commit.
ToDo
Future Work
Known defects
initializerMapinmonitor.go