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

✨ feat: add liveness and readiness checks #2509

Merged
merged 22 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
144c631
:sparkles: feat: add liveness and readiness checkers
luk3skyw4lker Jun 17, 2023
fed6c5e
:memo: docs: add docs for liveness and readiness
luk3skyw4lker Jun 17, 2023
96d3944
:sparkles: feat: add options method for probe checkers
luk3skyw4lker Jun 17, 2023
ec98691
:white_check_mark: tests: add tests for liveness and readiness
luk3skyw4lker Jun 17, 2023
7615bec
:recycle: refactor: change default endpoint values
luk3skyw4lker Jun 17, 2023
b00ee64
:recycle: refactor: change default value for liveness endpoint
luk3skyw4lker Jun 17, 2023
87faa6a
:memo: docs: add return status for liveness and readiness probes
luk3skyw4lker Jun 17, 2023
789b882
:recycle: refactor: change probechecker to middleware
luk3skyw4lker Jun 27, 2023
ef1e265
:twisted_rightwards_arrows: chore: update branch with master
luk3skyw4lker Jun 27, 2023
df23f68
:memo: docs: move docs to middleware session
luk3skyw4lker Jun 30, 2023
4ad217e
:recycle: refactor: apply gofumpt formatting
luk3skyw4lker Aug 15, 2023
2c41068
:recycle: refactor: remove unused parameter
luk3skyw4lker Aug 15, 2023
7fdb8aa
split config and apply a review
efectn Dec 23, 2023
931526a
apply reviews and add testcases
efectn Dec 23, 2023
508bddb
add benchmark
efectn Dec 23, 2023
2041679
cleanup
efectn Dec 23, 2023
e987a8e
rename middleware
efectn Dec 24, 2023
c33626b
fix linter
efectn Dec 24, 2023
013e362
Update docs and config values
gaby Jan 3, 2024
5c08790
Revert change to IsReady
gaby Jan 3, 2024
92e1cac
Updates based on code review
gaby Jan 3, 2024
87b1822
Update docs to match other middlewares
gaby Jan 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions middleware/probechecker/config.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package probechecker
efectn marked this conversation as resolved.
Show resolved Hide resolved

import "github.com/gofiber/fiber/v2"

// Config is the config struct for the probechecker middleware
type Config struct {
// Config for liveness probe of the container engine being used
//
// Optional. Default: func(c *Ctx) bool { return true }
IsLive ProbeChecker

// HTTP endpoint of the liveness probe
//
// Optional. Default: /livez
IsLiveEndpoint string

// Config for readiness probe of the container engine being used
//
// Optional. Default: nil
IsReady ProbeChecker

// HTTP endpoint of the readiness probe
//
// Optional. Default: /readyz
IsReadyEndpoint string
}

const (
DefaultLivenessEndpoint = "/livez"
DefaultReadinessEndpoint = "/readyz"
)

func defaultLiveFunc(*fiber.Ctx) bool { return true }

// ConfigDefault is the default config
var ConfigDefault = Config{
IsLive: defaultLiveFunc,
IsLiveEndpoint: DefaultLivenessEndpoint,
IsReadyEndpoint: DefaultReadinessEndpoint,
}

// defaultConfig returns a default config for the probechecker middleware.
func defaultConfig(config ...Config) Config {
if len(config) < 1 {
return ConfigDefault
}

cfg := config[0]

if cfg.IsLive == nil {
cfg.IsLive = defaultLiveFunc
}

if cfg.IsLiveEndpoint == "" {
cfg.IsLiveEndpoint = DefaultLivenessEndpoint
}

if cfg.IsReadyEndpoint == "" {
cfg.IsReadyEndpoint = DefaultReadinessEndpoint
}

return cfg
}
54 changes: 0 additions & 54 deletions middleware/probechecker/probechecker.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,6 @@ type ProbeChecker func(*fiber.Ctx) bool
// ProbeCheckerHandler defines a function that returns a ProbeChecker
type ProbeCheckerHandler func(ProbeChecker) fiber.Handler

// Config is the config struct for the probechecker middleware
type Config struct {
// Config for liveness probe of the container engine being used
//
// Optional. Default: func(c *Ctx) bool { return true }
IsLive ProbeChecker

// HTTP endpoint of the liveness probe
//
// Optional. Default: /livez
IsLiveEndpoint string

// Config for readiness probe of the container engine being used
//
// Optional. Default: nil
IsReady ProbeChecker

// HTTP endpoint of the readiness probe
//
// Optional. Default: /readyz
IsReadyEndpoint string
}

const (
DefaultLivenessEndpoint = "/livez"
DefaultReadinessEndpoint = "/readyz"
)

func defaultLiveFunc(*fiber.Ctx) bool { return true }

func probeCheckerHandler(checker ProbeChecker) fiber.Handler {
return func(c *fiber.Ctx) error {
if checker == nil {
Expand Down Expand Up @@ -92,27 +62,3 @@ func New(config ...Config) fiber.Handler {
return c.Next()
}
}

func defaultConfig(config ...Config) Config {
if len(config) < 1 {
return Config{
IsLive: defaultLiveFunc,
IsLiveEndpoint: DefaultLivenessEndpoint,
IsReadyEndpoint: DefaultReadinessEndpoint,
}
}

cfg := config[0]

if cfg.IsLiveEndpoint == "" {
cfg.IsLiveEndpoint = DefaultLivenessEndpoint
}
if cfg.IsReadyEndpoint == "" {
cfg.IsReadyEndpoint = DefaultReadinessEndpoint
}
if cfg.IsLive == nil {
cfg.IsLive = defaultLiveFunc
}

return cfg
}
Loading