Move all the binaries and respective files into cmd/ #77
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
mmlb
force-pushed
the
move-binaries-to-cmd-dir
branch
from
607a887
to
c466c15
Compare
|
@mmlb Please resolve the conflicts. |
mmlb
force-pushed
the
move-binaries-to-cmd-dir
branch
from
c466c15
to
ac5afe4
Compare
|
@gauravgahlot updated PTAL |
gauravgahlot
suggested changes
Apr 28, 2020
There was a problem hiding this comment.
@mmlb Please resolve the conflict and the requested change. Rest LGTM.
|
@mmlb It would be great if we can conclude this PR asap. |
mmlb
force-pushed
the
move-binaries-to-cmd-dir
branch
from
ac5afe4
to
608bcd3
Compare
|
@gauravgahlot should be good now, PTAL. |
gauravgahlot
previously requested changes
May 11, 2020
There was a problem hiding this comment.
@mmlb I'm not sure if we should move the deploy directory to /cmd/tink-server/deploy.
If we do, you will need to update the setup.sh accordingly and test the setup.
|
@gauravgahlot hmm that makes sense, I'll split the deploy files into those needed by tink-server and those for other things then. |
Keeps all binaries and their support files grouped nicely instead of littered randomly. Signed-off-by: Manuel Mendez <manny@packet.com>
mmlb
force-pushed
the
move-binaries-to-cmd-dir
branch
from
608bcd3
to
e7b269c
Compare
nathangoulding
approved these changes
May 14, 2020
mergify bot
added a commit
that referenced
this pull request
Sep 16, 2020
## Description Replacing `logrus` with `packethost/pkg/log`. Depends on: - [Boots PR #77](tinkerbell/smee#77) - [Hegel PR #33](tinkerbell/hegel#33) ## Why is this needed The PR aims to keep the logging package consistent across the Tink repository. ## How Has This Been Tested? Tested the changes by executing an end-to-end workflow. ## Worker Logs ``` {"log":"{\"level\":\"info\",\"ts\":1598612543.5217416,\"caller\":\"tink-worker/main.go:48\",\"msg\":\"starting version: 6960d5f\",\"service\":\"github.com/tinkerbell/tink\"}\r\n","stream":"stdout","time":"2020-08-28T11:02:23.526199655Z"} {"log":"{\"level\":\"info\",\"ts\":1598612543.5223653,\"caller\":\"tink-worker/main.go:85\",\"msg\":\"RETRY_INTERVAL not set, using default 3 seconds\",\"service\":\"github.com/tinkerbell/tink\"}\r\n","stream":"stdout","time":"2020-08-28T11:02:23.526229686Z"} {"log":"{\"level\":\"info\",\"ts\":1598612543.5223973,\"caller\":\"tink-worker/main.go:99\",\"msg\":\"MAX_RETRY not set, using default 3 retries\",\"service\":\"github.com/tinkerbell/tink\"}\r\n","stream":"stdout","time":"2020-08-28T11:02:23.526236012Z"} {"log":"{\"level\":\"info\",\"ts\":1598612543.5452757,\"caller\":\"tink-worker/worker.go:142\",\"msg\":\"starting with action\",\"service\":\"github.com/tinkerbell/tink\",\"workerId\":\"0eba0bf8-3772-4b4a-ab9f-6ebe93b90a94\",\"workflowId\":\"b3a88595-5bfd-40ed-bd32-766adeab4fa2\",\"actionName\":\"hello_world\",\"taskName\":\"hello world\"}\r\n","stream":"stdout","time":"2020-08-28T11:02:23.545666793Z"} {"log":"{\"level\":\"info\",\"ts\":1598612543.5510116,\"caller\":\"tink-worker/worker.go:166\",\"msg\":\"sent action status\",\"service\":\"github.com/tinkerbell/tink\",\"workerId\":\"0eba0bf8-3772-4b4a-ab9f-6ebe93b90a94\",\"workflowId\":\"b3a88595-5bfd-40ed-bd32-766adeab4fa2\",\"actionName\":\"hello_world\",\"taskName\":\"hello world\"}\r\n","stream":"stdout","time":"2020-08-28T11:02:23.551388082Z"} {"log":"{\"status\":\"Pulling from hello-world\",\"id\":\"latest\"}\r\r\n","stream":"stdout","time":"2020-08-28T11:02:23.644575307Z"} {"log":"{\"status\":\"Pulling fs layer\",\"progressDetail\":{},\"id\":\"0e03bdcc26d7\"}\r\r\n","stream":"stdout","time":"2020-08-28T11:02:23.644659223Z"} {"log":"{\"status\":\"Downloading\",\"progressDetail\":{\"current\":730,\"total\":2529},\"progress\":\"[==============\\u003e ] 730B/2.529kB\",\"id\":\"0e03bdcc26d7\"}\r\r\n","stream":"stdout","time":"2020-08-28T11:02:23.66942451Z"} {"log":"{\"status\":\"Downloading\",\"progressDetail\":{\"current\":2529,\"total\":2529},\"progress\":\"[==================================================\\u003e] 2.529kB/2.529kB\",\"id\":\"0e03bdcc26d7\"}\r\r\n","stream":"stdout","time":"2020-08-28T11:02:23.669436361Z"} {"log":"{\"status\":\"Verifying Checksum\",\"progressDetail\":{},\"id\":\"0e03bdcc26d7\"}\r\r\n","stream":"stdout","time":"2020-08-28T11:02:23.669439988Z"} {"log":"{\"status\":\"Download complete\",\"progressDetail\":{},\"id\":\"0e03bdcc26d7\"}\r\r\n","stream":"stdout","time":"2020-08-28T11:02:23.66944226Z"} {"log":"{\"status\":\"Extracting\",\"progressDetail\":{\"current\":2529,\"total\":2529},\"progress\":\"[==================================================\\u003e] 2.529kB/2.529kB\",\"id\":\"0e03bdcc26d7\"}\r\r\n","stream":"stdout","time":"2020-08-28T11:02:23.66944429Z"} {"log":"{\"status\":\"Extracting\",\"progressDetail\":{\"current\":2529,\"total\":2529},\"progress\":\"[==================================================\\u003e] 2.529kB/2.529kB\",\"id\":\"0e03bdcc26d7\"}\r\r\n","stream":"stdout","time":"2020-08-28T11:02:23.66944685Z"} {"log":"{\"status\":\"Pull complete\",\"progressDetail\":{},\"id\":\"0e03bdcc26d7\"}\r\r\n","stream":"stdout","time":"2020-08-28T11:02:23.731208642Z"} {"log":"{\"status\":\"Digest: sha256:90659bf80b44ce6be8234e6ff90a1ac34acbeb826903b02cfa0da11c82cbc042\"}\r\r\n","stream":"stdout","time":"2020-08-28T11:02:23.731223756Z"} {"log":"{\"status\":\"Status: Downloaded newer image for 192.168.1.1/hello-world:latest\"}\r\r\n","stream":"stdout","time":"2020-08-28T11:02:23.731226604Z"} {"log":"{\"level\":\"info\",\"ts\":1598612543.6948822,\"caller\":\"tink-worker/action.go:203\",\"msg\":\"starting container with cmd: []\",\"service\":\"github.com/tinkerbell/tink\",\"workflowId\":\"b3a88595-5bfd-40ed-bd32-766adeab4fa2\",\"workerId\":\"0eba0bf8-3772-4b4a-ab9f-6ebe93b90a94\",\"actionName\":\"hello_world\"}\r\n","stream":"stdout","time":"2020-08-28T11:02:23.731228638Z"} {"log":"\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864270483Z"} {"log":"Hello from Docker!\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864278931Z"} {"log":"This message shows that your installation appears to be working correctly.\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864281213Z"} {"log":"\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864283136Z"} {"log":"To generate this message, Docker took the following steps:\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864284705Z"} {"log":" 1. The Docker client contacted the Docker daemon.\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864286483Z"} {"log":" 2. The Docker daemon pulled the \"hello-world\" image from the Docker Hub.\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864288907Z"} {"log":" (amd64)\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864290903Z"} {"log":" 3. The Docker daemon created a new container from that image which runs the\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864292477Z"} {"log":" executable that produces the output you are currently reading.\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864294192Z"} {"log":" 4. The Docker daemon streamed that output to the Docker client, which sent it\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864295866Z"} {"log":" to your terminal.\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864297598Z"} {"log":"\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864299188Z"} {"log":"To try something more ambitious, you can run an Ubuntu container with:\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864300687Z"} {"log":" $ docker run -it ubuntu bash\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864302378Z"} {"log":"\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864303968Z"} {"log":"Share images, automate workflows, and more with a free Docker ID:\r\n","stream":"stdout","time":"2020-08-28T11:02:23.86430546Z"} {"log":" https://hub.docker.com/\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864307212Z"} {"log":"\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864308793Z"} {"log":"For more examples and ideas, visit:\r\n","stream":"stdout","time":"2020-08-28T11:02:23.86431029Z"} {"log":" https://docs.docker.com/get-started/\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864311973Z"} {"log":"\r\n","stream":"stdout","time":"2020-08-28T11:02:23.864313659Z"} {"log":"{\"level\":\"info\",\"ts\":1598612543.9096792,\"caller\":\"tink-worker/action.go:266\",\"msg\":\"starting to remove container: eff322d7a5a7bada3d179be6ec927ac2fcac8873c677d2d91d79cfe3fee359f2\",\"service\":\"github.com/tinkerbell/tink\",\"workflowId\":\"b3a88595-5bfd-40ed-bd32-766adeab4fa2\",\"workerId\":\"0eba0bf8-3772-4b4a-ab9f-6ebe93b90a94\",\"actionName\":\"hello_world\"}\r\n","stream":"stdout","time":"2020-08-28T11:02:23.911821295Z"} {"log":"{\"level\":\"info\",\"ts\":1598612543.9113615,\"caller\":\"tink-worker/action.go:86\",\"msg\":\"container removed with status: ACTION_SUCCESS\",\"service\":\"github.com/tinkerbell/tink\",\"workflowId\":\"b3a88595-5bfd-40ed-bd32-766adeab4fa2\",\"workerId\":\"0eba0bf8-3772-4b4a-ab9f-6ebe93b90a94\",\"actionName\":\"hello_world\"}\r\n","stream":"stdout","time":"2020-08-28T11:02:23.911833548Z"} {"log":"{\"level\":\"info\",\"ts\":1598612543.9113853,\"caller\":\"tink-worker/action.go:133\",\"msg\":\"action container exit status code: ACTION_SUCCESS\",\"service\":\"github.com/tinkerbell/tink\",\"workflowId\":\"b3a88595-5bfd-40ed-bd32-766adeab4fa2\",\"workerId\":\"0eba0bf8-3772-4b4a-ab9f-6ebe93b90a94\",\"actionName\":\"hello_world\"}\r\n","stream":"stdout","time":"2020-08-28T11:02:23.91183715Z"} {"log":"{\"level\":\"info\",\"ts\":1598612543.9146202,\"caller\":\"tink-worker/worker.go:211\",\"msg\":\"sent action status\",\"service\":\"github.com/tinkerbell/tink\",\"workerId\":\"0eba0bf8-3772-4b4a-ab9f-6ebe93b90a94\",\"workflowId\":\"b3a88595-5bfd-40ed-bd32-766adeab4fa2\",\"actionName\":\"hello_world\",\"taskName\":\"hello world\"}\r\n","stream":"stdout","time":"2020-08-28T11:02:23.915028437Z"} {"log":"{\"level\":\"info\",\"ts\":1598612543.916867,\"caller\":\"tink-worker/worker.go:217\",\"msg\":\"reached to end of workflow\",\"service\":\"github.com/tinkerbell/tink\",\"workerId\":\"0eba0bf8-3772-4b4a-ab9f-6ebe93b90a94\",\"workflowId\":\"b3a88595-5bfd-40ed-bd32-766adeab4fa2\"}\r\n","stream":"stdout","time":"2020-08-28T11:02:23.917199393Z"} ```
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.
Keeps all binaries and their support files grouped nicely instead of
littered randomly.
Signed-off-by: Manuel Mendez manny@packet.com