Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Caddy Integration (First Round) #393

Merged
merged 30 commits into from
Sep 1, 2023
Merged

Caddy Integration (First Round) #393

merged 30 commits into from
Sep 1, 2023

Conversation

michaelquigley
Copy link
Collaborator

A first round of integration work pulling Caddy into zrok.

#330, #388, #391, #392

@michaelquigley michaelquigley self-assigned this Aug 25, 2023
@vercel
Copy link

vercel bot commented Aug 25, 2023

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
zrok ⬜️ Ignored (Inspect) Visit Preview Aug 31, 2023 9:42pm

@michaelquigley michaelquigley added enhancement Enhancement of an existing feature feature New feature description labels Aug 25, 2023
@michaelquigley michaelquigley added this to the v0.4 milestone Aug 25, 2023
@michaelquigley michaelquigley changed the title First Round of Caddy Integration Caddy Integration (First Round) Aug 30, 2023
@michaelquigley michaelquigley marked this pull request as ready for review August 30, 2023 18:25
@michaelquigley michaelquigley requested review from camotts and a team August 30, 2023 18:25
Copy link
Member

@qrkourier qrkourier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This error means I must test this with a zrok controller built from the same branch, not the staging instance's zrok controller, right?

❯ /tmp/zrok version
               _    
 _____ __ ___ | | __
|_  / '__/ _ \| |/ /
 / /| | | (_) |   < 
/___|_|  \___/|_|\_\

refs/heads/v0.4_caddy [a896b3c05a29413503d73d9675e4348dd50d9816]

❯ /tmp/zrok share public --backend-mode caddy --verbose --panic $PWD
panic: unable to create share: response status code does not match any response statuses defined for this endpoint in the swagger spec (status 422): {}

goroutine 1 [running]:
main.(*sharePublicCommand).run(0xc00071cff0, 0x0?, {0xc00071d180?, 0x0?, 0x0?})
        /home/runner/work/zrok/zrok/cmd/zrok/sharePublic.go:106 +0xcff
github.com/spf13/cobra.(*Command).execute(0xc000767500, {0xc00071d130, 0x5, 0x5})
        /home/runner/go/pkg/mod/github.com/spf13/cobra@v1.7.0/command.go:944 +0x863
github.com/spf13/cobra.(*Command).ExecuteC(0x4cf05a0)
        /home/runner/go/pkg/mod/github.com/spf13/cobra@v1.7.0/command.go:1068 +0x3a5
github.com/spf13/cobra.(*Command).Execute(...)
        /home/runner/go/pkg/mod/github.com/spf13/cobra@v1.7.0/command.go:992
main.main()
        /home/runner/work/zrok/zrok/cmd/zrok/main.go:99 +0x1a

CHANGELOG.md Outdated Show resolved Hide resolved
etc/caddy/multiple_upstream.Caddyfile Outdated Show resolved Hide resolved
@michaelquigley
Copy link
Collaborator Author

This error means I must test this with a zrok controller built from the same branch, not the staging instance's zrok controller, right?

Correct. --backend-mode caddy won't work with a zrok controller before this merge.

@michaelquigley michaelquigley merged commit ca6a11c into main Sep 1, 2023
6 checks passed
@michaelquigley michaelquigley deleted the v0.4_caddy branch September 1, 2023 00:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Enhancement of an existing feature feature New feature description
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants