Merge branch 'main' into oauth-testing

controller/controller.go

@@ -130,6 +130,7 @@ func Run(inCfg *config.Config) error {
 	defer func() { _ = server.Shutdown() }()
 	server.Host = cfg.Endpoint.Host
 	server.Port = cfg.Endpoint.Port
+	rest_server_zrok.HealthCheck = HealthCheckHTTP
 	server.ConfigureAPI()
 	if err := server.Serve(); err != nil {
 		return errors.Wrap(err, "api server error")
@@ -137,3 +138,7 @@ func Run(inCfg *config.Config) error {
 
 	return nil
 }
+
+func Store() *store.Store {
+	return str
+}