mirror of
https://github.com/project-zot/zot.git
synced 2026-06-17 21:17:58 +08:00
feat: healthz server (#3228)
* feat: healthz server Signed-off-by: Asgeir Nilsen <asgeir@twingine.no> * fix: startup and readiness probe activation points Enable startup probe at end of Controller.Init and readiness probe at end of Controller.Run Signed-off-by: Asgeir Nilsen <asgeir@twingine.no> * fix: rewrote to reuse same HTTP listener Signed-off-by: Asgeir Nilsen <asgeir@twingine.no> --------- Signed-off-by: Asgeir Nilsen <asgeir@twingine.no>
This commit is contained in:
committed by
GitHub
parent
80081bb012
commit
c298818cc2
@@ -55,6 +55,7 @@ type Controller struct {
|
||||
HTPasswdWatcher *HTPasswdWatcher
|
||||
LDAPClient *LDAPClient
|
||||
taskScheduler *scheduler.Scheduler
|
||||
Healthz *common.Healthz
|
||||
// runtime params
|
||||
chosenPort int // kernel-chosen port
|
||||
}
|
||||
@@ -63,6 +64,7 @@ func NewController(appConfig *config.Config) *Controller {
|
||||
var controller Controller
|
||||
|
||||
logger := log.NewLogger(appConfig.Log.Level, appConfig.Log.Output)
|
||||
controller.Healthz = common.NewHealthzServer(appConfig, logger)
|
||||
|
||||
if appConfig.Cluster != nil {
|
||||
// we need the set of local sockets (IP address:port) for identifying
|
||||
@@ -241,9 +243,13 @@ func (c *Controller) Run() error {
|
||||
server.TLSConfig.ClientCAs = caCertPool
|
||||
}
|
||||
|
||||
c.Healthz.Ready()
|
||||
|
||||
return server.ServeTLS(listener, c.Config.HTTP.TLS.Cert, c.Config.HTTP.TLS.Key)
|
||||
}
|
||||
|
||||
c.Healthz.Ready()
|
||||
|
||||
return server.Serve(listener)
|
||||
}
|
||||
|
||||
@@ -277,6 +283,7 @@ func (c *Controller) Init() error {
|
||||
}
|
||||
|
||||
c.InitCVEInfo()
|
||||
c.Healthz.Started()
|
||||
|
||||
if c.Config.IsHtpasswdAuthEnabled() {
|
||||
err := c.HTPasswdWatcher.ChangeFile(c.Config.HTTP.Auth.HTPasswd.Path)
|
||||
|
||||
@@ -65,6 +65,11 @@ func NewRouteHandler(c *Controller) *RouteHandler {
|
||||
}
|
||||
|
||||
func (rh *RouteHandler) SetupRoutes() {
|
||||
// health endpoints get added first
|
||||
rh.c.Router.Path("/livez").Handler(rh.c.Healthz.Handler)
|
||||
rh.c.Router.Path("/readyz").Handler(rh.c.Healthz.Handler)
|
||||
rh.c.Router.Path("/startupz").Handler(rh.c.Healthz.Handler)
|
||||
|
||||
// first get Auth middleware in order to first setup openid/ldap/htpasswd, before oidc provider routes are setup
|
||||
authHandler := AuthHandler(rh.c)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user