Merge pull request #797 from kitsudaiki/feat/add-probes-to-kubernetes-setup

kitsudaiki · web-flow · commit 6ac6976027d7 · 2026-01-04T18:23:57.000+01:00
related issue: #594
diff --git a/dockerfiles/Dockerfile_hanami b/dockerfiles/Dockerfile_hanami
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM kitsudaiki/ainari_build_base:0.2.0@sha256:b11c3a334aae2ef1dd456917239ed82617d3473147035573c42ab72eb0c5eb15 AS builder
+FROM kitsudaiki/ainari_build_base:0.2.0@sha256:763aad737f50a8774e1beacef80c3174de145301194e78ef505553111ac46107 AS builder
 
 WORKDIR /app
 
diff --git a/dockerfiles/Dockerfile_miko b/dockerfiles/Dockerfile_miko
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM kitsudaiki/ainari_build_base:0.2.0@sha256:b11c3a334aae2ef1dd456917239ed82617d3473147035573c42ab72eb0c5eb15 AS builder
+FROM kitsudaiki/ainari_build_base:0.2.0@sha256:763aad737f50a8774e1beacef80c3174de145301194e78ef505553111ac46107 AS builder
 
 WORKDIR /app
 
diff --git a/dockerfiles/Dockerfile_omamori b/dockerfiles/Dockerfile_omamori
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM kitsudaiki/ainari_build_base:0.2.0@sha256:b11c3a334aae2ef1dd456917239ed82617d3473147035573c42ab72eb0c5eb15 AS builder
+FROM kitsudaiki/ainari_build_base:0.2.0@sha256:763aad737f50a8774e1beacef80c3174de145301194e78ef505553111ac46107 AS builder
 
 WORKDIR /app
 
diff --git a/dockerfiles/Dockerfile_onsen b/dockerfiles/Dockerfile_onsen
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM kitsudaiki/ainari_build_base:0.2.0@sha256:b11c3a334aae2ef1dd456917239ed82617d3473147035573c42ab72eb0c5eb15 AS builder
+FROM kitsudaiki/ainari_build_base:0.2.0@sha256:763aad737f50a8774e1beacef80c3174de145301194e78ef505553111ac46107 AS builder
 
 WORKDIR /app
 
diff --git a/dockerfiles/Dockerfile_ryokan b/dockerfiles/Dockerfile_ryokan
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM kitsudaiki/ainari_build_base:0.2.0@sha256:b11c3a334aae2ef1dd456917239ed82617d3473147035573c42ab72eb0c5eb15 AS builder
+FROM kitsudaiki/ainari_build_base:0.2.0@sha256:763aad737f50a8774e1beacef80c3174de145301194e78ef505553111ac46107 AS builder
 
 WORKDIR /app
 
diff --git a/dockerfiles/Dockerfile_sakura b/dockerfiles/Dockerfile_sakura
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM kitsudaiki/ainari_build_base:0.2.0@sha256:b11c3a334aae2ef1dd456917239ed82617d3473147035573c42ab72eb0c5eb15 AS builder
+FROM kitsudaiki/ainari_build_base:0.2.0@sha256:763aad737f50a8774e1beacef80c3174de145301194e78ef505553111ac46107 AS builder
 
 WORKDIR /app
 
diff --git a/dockerfiles/Dockerfile_torii b/dockerfiles/Dockerfile_torii
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM kitsudaiki/ainari_build_base:0.2.0@sha256:b11c3a334aae2ef1dd456917239ed82617d3473147035573c42ab72eb0c5eb15 AS builder
+FROM kitsudaiki/ainari_build_base:0.2.0@sha256:763aad737f50a8774e1beacef80c3174de145301194e78ef505553111ac46107 AS builder
 
 WORKDIR /app
 
diff --git a/src/binaries/hanami/src/api/routes/v1alpha.rs b/src/binaries/hanami/src/api/routes/v1alpha.rs
@@ -24,6 +24,10 @@ pub fn v1alpha_routes() -> Scope {
         .service(
             scope("/version").service(resource("").route(get().to(get_version_v1_0::get_version))),
         )
+        .service(
+            scope("/is_ready")
+                .service(resource("").route(get().to(is_ready_v1_0::get_ready_status))),
+        )
         .service(
             scope("/cluster")
                 .service(
diff --git a/src/binaries/miko/src/api/miko_auth_middleware.rs b/src/binaries/miko/src/api/miko_auth_middleware.rs
@@ -39,6 +39,7 @@ pub async fn authorization_middleware(
     log::debug!("call uri: '{uri}' for method: '{}'", *req.method());
 
     // skip check for specific endpoints
+    skip_check |= uri == "/v1alpha/is_ready" && *req.method() == Method::GET;
     skip_check |= uri == "/v1alpha/token" && *req.method() == Method::POST;
     skip_check |= uri == "/openapi.json" && *req.method() == Method::GET;
     skip_check |= uri == "/v1alpha/endpoints" && *req.method() == Method::GET;
diff --git a/src/binaries/miko/src/api/routes/v1alpha.rs b/src/binaries/miko/src/api/routes/v1alpha.rs
@@ -27,6 +27,10 @@ pub fn v1alpha_routes() -> Scope {
         .service(
             scope("/version").service(resource("").route(get().to(get_version_v1_0::get_version))),
         )
+        .service(
+            scope("/is_ready")
+                .service(resource("").route(get().to(is_ready_v1_0::get_ready_status))),
+        )
         .service(
             scope("/token").service(
                 resource("")
diff --git a/src/binaries/omamori/src/api/routes/v1alpha.rs b/src/binaries/omamori/src/api/routes/v1alpha.rs
@@ -23,6 +23,10 @@ pub fn v1alpha_routes() -> Scope {
         .service(
             scope("/version").service(resource("").route(get().to(get_version_v1_0::get_version))),
         )
+        .service(
+            scope("/is_ready")
+                .service(resource("").route(get().to(is_ready_v1_0::get_ready_status))),
+        )
         .service(
             scope("/secret")
                 .service(
diff --git a/src/binaries/ryokan/src/api/routes/v1alpha.rs b/src/binaries/ryokan/src/api/routes/v1alpha.rs
@@ -25,6 +25,10 @@ pub fn v1alpha_routes() -> Scope {
         .service(
             scope("/version").service(resource("").route(get().to(get_version_v1_0::get_version))),
         )
+        .service(
+            scope("/is_ready")
+                .service(resource("").route(get().to(is_ready_v1_0::get_ready_status))),
+        )
         .service(
             scope("/dataset")
                 .service(
diff --git a/src/binaries/sakura/src/api/routes/v1alpha.rs b/src/binaries/sakura/src/api/routes/v1alpha.rs
@@ -24,6 +24,10 @@ pub fn v1alpha_routes() -> Scope {
         .service(
             scope("/version").service(resource("").route(get().to(get_version_v1_0::get_version))),
         )
+        .service(
+            scope("/is_ready")
+                .service(resource("").route(get().to(is_ready_v1_0::get_ready_status))),
+        )
         .service(
             scope("/cluster")
                 .service(
diff --git a/src/binaries/torii/src/api/routes/v1alpha.rs b/src/binaries/torii/src/api/routes/v1alpha.rs
@@ -23,6 +23,10 @@ pub fn v1alpha_routes() -> Scope {
         .service(
             scope("/version").service(resource("").route(get().to(get_version_v1_0::get_version))),
         )
+        .service(
+            scope("/is_ready")
+                .service(resource("").route(get().to(is_ready_v1_0::get_ready_status))),
+        )
         .service(
             scope("/proxy")
                 .service(
diff --git a/src/libs/rust/ainari_api/src/auth_middleware.rs b/src/libs/rust/ainari_api/src/auth_middleware.rs
@@ -65,6 +65,8 @@ pub async fn authorization_middleware(
 
     log::debug!("call uri: '{uri}' for method: '{}'", *req.method());
 
+    // request of ready-status can be done without token
+    skip_token_check |= uri == "/v1alpha/is_ready" && *req.method() == Method::GET;
     // request of openapi-specs can be done without token
     skip_token_check |= uri == "/openapi.json";
     // sakura-hosts can call a registration without token, becuase it is triggered by themself
diff --git a/src/libs/rust/ainari_api/src/endpoints/is_ready_v1_0.rs b/src/libs/rust/ainari_api/src/endpoints/is_ready_v1_0.rs
@@ -0,0 +1,34 @@
+// Copyright 2022-2026 Tobias Anker <tobias.anker@kitsunemimi.moe>
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+
+//     http://www.apache.org/licenses/LICENSE-2.0
+
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use actix_web::web::Json;
+use apistos::api_operation;
+
+use crate::errors::ErrorResponse;
+use ainari_api_structs::common_structs::ReadyResp;
+use ainari_api_structs::user_context::UserContext;
+
+#[api_operation(
+    tag = "version",
+    summary = "Get ready status",
+    description = r###"Get status of the service endpoint."###,
+    error_code = 400,
+    error_code = 401,
+    error_code = 500
+)]
+pub async fn get_ready_status(_: UserContext) -> Result<Json<ReadyResp>, ErrorResponse> {
+    let resp = ReadyResp { api: true };
+
+    Ok(Json(resp))
+}
diff --git a/src/libs/rust/ainari_api/src/endpoints/mod.rs b/src/libs/rust/ainari_api/src/endpoints/mod.rs
@@ -13,3 +13,4 @@
 // limitations under the License.
 
 pub mod get_version_v1_0;
+pub mod is_ready_v1_0;
diff --git a/src/libs/rust/ainari_api_structs/src/common_structs.rs b/src/libs/rust/ainari_api_structs/src/common_structs.rs
@@ -23,6 +23,11 @@ pub struct VersionResp {
     pub timestamp: String,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone, JsonSchema, ApiComponent)]
+pub struct ReadyResp {
+    pub api: bool,
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema, ApiComponent)]
 pub struct Count {
     pub number_of_items: u64,
