From 5cca24f4d68cca31776897d7f6e15ea64f76a141 Mon Sep 17 00:00:00 2001
From: Stefan Majer <stefan.majer@f-i-ts.de>
Date: Sun, 31 May 2026 08:51:04 +0200
Subject: [PATCH 1/2] Add tenant-apiserver health

---
 doc/index.html                          |  6 ++++++
 go/metalstack/api/v2/health.pb.go       | 27 +++++++++++++++----------
 js/metalstack/api/v2/health_pb.d.ts     |  8 +++++++-
 js/metalstack/api/v2/health_pb.js       |  8 +++++++-
 js/metalstack/api/v2/health_pb.ts       |  9 ++++++++-
 proto/metalstack/api/v2/health.proto    |  2 ++
 python/metalstack/api/v2/health_pb2.py  | 10 +++++----
 python/metalstack/api/v2/health_pb2.pyi |  2 ++
 8 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/doc/index.html b/doc/index.html
index 46502018..60f50271 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -19561,6 +19561,12 @@ <h3 id="metalstack.api.v2.Service">Service</h3>
                 <td><p>SERVICE_TASKS the tasks service</p></td>
               </tr>
             
+              <tr>
+                <td>SERVICE_TENANT_APISERVER</td>
+                <td>9</td>
+                <td><p>SERVICE_TENANT_APISERVER the tenant-apiserver</p></td>
+              </tr>
+            
           </tbody>
         </table>
       
diff --git a/go/metalstack/api/v2/health.pb.go b/go/metalstack/api/v2/health.pb.go
index 7b9d97ed..59e17a48 100644
--- a/go/metalstack/api/v2/health.pb.go
+++ b/go/metalstack/api/v2/health.pb.go
@@ -100,6 +100,8 @@ const (
 	Service_SERVICE_REDIS Service = 7
 	// SERVICE_TASKS the tasks service
 	Service_SERVICE_TASKS Service = 8
+	// SERVICE_TENANT_APISERVER the tenant-apiserver
+	Service_SERVICE_TENANT_APISERVER Service = 9
 )
 
 // Enum value maps for Service.
@@ -114,17 +116,19 @@ var (
 		6: "SERVICE_VPN",
 		7: "SERVICE_REDIS",
 		8: "SERVICE_TASKS",
+		9: "SERVICE_TENANT_APISERVER",
 	}
 	Service_value = map[string]int32{
-		"SERVICE_UNSPECIFIED": 0,
-		"SERVICE_IPAM":        1,
-		"SERVICE_RETHINK":     2,
-		"SERVICE_MASTERDATA":  3,
-		"SERVICE_MACHINES":    4,
-		"SERVICE_AUDIT":       5,
-		"SERVICE_VPN":         6,
-		"SERVICE_REDIS":       7,
-		"SERVICE_TASKS":       8,
+		"SERVICE_UNSPECIFIED":      0,
+		"SERVICE_IPAM":             1,
+		"SERVICE_RETHINK":          2,
+		"SERVICE_MASTERDATA":       3,
+		"SERVICE_MACHINES":         4,
+		"SERVICE_AUDIT":            5,
+		"SERVICE_VPN":              6,
+		"SERVICE_REDIS":            7,
+		"SERVICE_TASKS":            8,
+		"SERVICE_TENANT_APISERVER": 9,
 	}
 )
 
@@ -439,7 +443,7 @@ const file_metalstack_api_v2_health_proto_rawDesc = "" +
 	"\x1aSERVICE_STATUS_UNSPECIFIED\x10\x00\x12\x1b\n" +
 	"\x17SERVICE_STATUS_DEGRADED\x10\x01\x12\x1c\n" +
 	"\x18SERVICE_STATUS_UNHEALTHY\x10\x02\x12\x1a\n" +
-	"\x16SERVICE_STATUS_HEALTHY\x10\x03*\xa2\x02\n" +
+	"\x16SERVICE_STATUS_HEALTHY\x10\x03*\xd6\x02\n" +
 	"\aService\x12\x17\n" +
 	"\x13SERVICE_UNSPECIFIED\x10\x00\x12\x1a\n" +
 	"\fSERVICE_IPAM\x10\x01\x1a\b\x82\xb2\x19\x04ipam\x12\"\n" +
@@ -450,7 +454,8 @@ const file_metalstack_api_v2_health_proto_rawDesc = "" +
 	"\rSERVICE_AUDIT\x10\x05\x1a\t\x82\xb2\x19\x05audit\x12\x18\n" +
 	"\vSERVICE_VPN\x10\x06\x1a\a\x82\xb2\x19\x03vpn\x12\x1c\n" +
 	"\rSERVICE_REDIS\x10\a\x1a\t\x82\xb2\x19\x05redis\x12\x1c\n" +
-	"\rSERVICE_TASKS\x10\b\x1a\t\x82\xb2\x19\x05tasks2y\n" +
+	"\rSERVICE_TASKS\x10\b\x1a\t\x82\xb2\x19\x05tasks\x122\n" +
+	"\x18SERVICE_TENANT_APISERVER\x10\t\x1a\x14\x82\xb2\x19\x10tenant-apiserver2y\n" +
 	"\rHealthService\x12h\n" +
 	"\x03Get\x12*.metalstack.api.v2.HealthServiceGetRequest\x1a+.metalstack.api.v2.HealthServiceGetResponse\"\b\xd8\xf3\x18\x01\xe0\xf3\x18\x02B\xc1\x01\n" +
 	"\x15com.metalstack.api.v2B\vHealthProtoP\x01Z5github.com/metal-stack/api/go/metalstack/api/v2;apiv2\xa2\x02\x03MAX\xaa\x02\x11Metalstack.Api.V2\xca\x02\x11Metalstack\\Api\\V2\xe2\x02\x1dMetalstack\\Api\\V2\\GPBMetadata\xea\x02\x13Metalstack::Api::V2b\x06proto3"
diff --git a/js/metalstack/api/v2/health_pb.d.ts b/js/metalstack/api/v2/health_pb.d.ts
index 1c23d229..292e9fe2 100644
--- a/js/metalstack/api/v2/health_pb.d.ts
+++ b/js/metalstack/api/v2/health_pb.d.ts
@@ -207,7 +207,13 @@ export declare enum Service {
      *
      * @generated from enum value: SERVICE_TASKS = 8;
      */
-    TASKS = 8
+    TASKS = 8,
+    /**
+     * SERVICE_TENANT_APISERVER the tenant-apiserver
+     *
+     * @generated from enum value: SERVICE_TENANT_APISERVER = 9;
+     */
+    TENANT_APISERVER = 9
 }
 /**
  * Describes the enum metalstack.api.v2.Service.
diff --git a/js/metalstack/api/v2/health_pb.js b/js/metalstack/api/v2/health_pb.js
index 4230eb12..9da936d7 100644
--- a/js/metalstack/api/v2/health_pb.js
+++ b/js/metalstack/api/v2/health_pb.js
@@ -6,7 +6,7 @@ import { file_metalstack_api_v2_common } from "./common_pb";
 /**
  * Describes the file metalstack/api/v2/health.proto.
  */
-export const file_metalstack_api_v2_health = /*@__PURE__*/ fileDesc("Ch5tZXRhbHN0YWNrL2FwaS92Mi9oZWFsdGgucHJvdG8SEW1ldGFsc3RhY2suYXBpLnYyIjsKBkhlYWx0aBIxCghzZXJ2aWNlcxgBIAMoCzIfLm1ldGFsc3RhY2suYXBpLnYyLkhlYWx0aFN0YXR1cyKXAgoMSGVhbHRoU3RhdHVzEigKBG5hbWUYASABKA4yGi5tZXRhbHN0YWNrLmFwaS52Mi5TZXJ2aWNlEjAKBnN0YXR1cxgCIAEoDjIgLm1ldGFsc3RhY2suYXBpLnYyLlNlcnZpY2VTdGF0dXMSDwoHbWVzc2FnZRgDIAEoCRJDCgpwYXJ0aXRpb25zGAQgAygLMi8ubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU3RhdHVzLlBhcnRpdGlvbnNFbnRyeRpVCg9QYXJ0aXRpb25zRW50cnkSCwoDa2V5GAEgASgJEjEKBXZhbHVlGAIgASgLMiIubWV0YWxzdGFjay5hcGkudjIuUGFydGl0aW9uSGVhbHRoOgI4ASJUCg9QYXJ0aXRpb25IZWFsdGgSMAoGc3RhdHVzGAEgASgOMiAubWV0YWxzdGFjay5hcGkudjIuU2VydmljZVN0YXR1cxIPCgdtZXNzYWdlGAIgASgJIhkKF0hlYWx0aFNlcnZpY2VHZXRSZXF1ZXN0IkUKGEhlYWx0aFNlcnZpY2VHZXRSZXNwb25zZRIpCgZoZWFsdGgYASABKAsyGS5tZXRhbHN0YWNrLmFwaS52Mi5IZWFsdGgqhgEKDVNlcnZpY2VTdGF0dXMSHgoaU0VSVklDRV9TVEFUVVNfVU5TUEVDSUZJRUQQABIbChdTRVJWSUNFX1NUQVRVU19ERUdSQURFRBABEhwKGFNFUlZJQ0VfU1RBVFVTX1VOSEVBTFRIWRACEhoKFlNFUlZJQ0VfU1RBVFVTX0hFQUxUSFkQAyqiAgoHU2VydmljZRIXChNTRVJWSUNFX1VOU1BFQ0lGSUVEEAASGgoMU0VSVklDRV9JUEFNEAEaCIKyGQRpcGFtEiIKD1NFUlZJQ0VfUkVUSElOSxACGg2CshkJcmV0aGlua2RiEiYKElNFUlZJQ0VfTUFTVEVSREFUQRADGg6CshkKbWFzdGVyZGF0YRIiChBTRVJWSUNFX01BQ0hJTkVTEAQaDIKyGQhtYWNoaW5lcxIcCg1TRVJWSUNFX0FVRElUEAUaCYKyGQVhdWRpdBIYCgtTRVJWSUNFX1ZQThAGGgeCshkDdnBuEhwKDVNFUlZJQ0VfUkVESVMQBxoJgrIZBXJlZGlzEhwKDVNFUlZJQ0VfVEFTS1MQCBoJgrIZBXRhc2tzMnkKDUhlYWx0aFNlcnZpY2USaAoDR2V0EioubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU2VydmljZUdldFJlcXVlc3QaKy5tZXRhbHN0YWNrLmFwaS52Mi5IZWFsdGhTZXJ2aWNlR2V0UmVzcG9uc2UiCNjzGAHg8xgCQsEBChVjb20ubWV0YWxzdGFjay5hcGkudjJCC0hlYWx0aFByb3RvUAFaNWdpdGh1Yi5jb20vbWV0YWwtc3RhY2svYXBpL2dvL21ldGFsc3RhY2svYXBpL3YyO2FwaXYyogIDTUFYqgIRTWV0YWxzdGFjay5BcGkuVjLKAhFNZXRhbHN0YWNrXEFwaVxWMuICHU1ldGFsc3RhY2tcQXBpXFYyXEdQQk1ldGFkYXRh6gITTWV0YWxzdGFjazo6QXBpOjpWMmIGcHJvdG8z", [file_metalstack_api_v2_common]);
+export const file_metalstack_api_v2_health = /*@__PURE__*/ fileDesc("Ch5tZXRhbHN0YWNrL2FwaS92Mi9oZWFsdGgucHJvdG8SEW1ldGFsc3RhY2suYXBpLnYyIjsKBkhlYWx0aBIxCghzZXJ2aWNlcxgBIAMoCzIfLm1ldGFsc3RhY2suYXBpLnYyLkhlYWx0aFN0YXR1cyKXAgoMSGVhbHRoU3RhdHVzEigKBG5hbWUYASABKA4yGi5tZXRhbHN0YWNrLmFwaS52Mi5TZXJ2aWNlEjAKBnN0YXR1cxgCIAEoDjIgLm1ldGFsc3RhY2suYXBpLnYyLlNlcnZpY2VTdGF0dXMSDwoHbWVzc2FnZRgDIAEoCRJDCgpwYXJ0aXRpb25zGAQgAygLMi8ubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU3RhdHVzLlBhcnRpdGlvbnNFbnRyeRpVCg9QYXJ0aXRpb25zRW50cnkSCwoDa2V5GAEgASgJEjEKBXZhbHVlGAIgASgLMiIubWV0YWxzdGFjay5hcGkudjIuUGFydGl0aW9uSGVhbHRoOgI4ASJUCg9QYXJ0aXRpb25IZWFsdGgSMAoGc3RhdHVzGAEgASgOMiAubWV0YWxzdGFjay5hcGkudjIuU2VydmljZVN0YXR1cxIPCgdtZXNzYWdlGAIgASgJIhkKF0hlYWx0aFNlcnZpY2VHZXRSZXF1ZXN0IkUKGEhlYWx0aFNlcnZpY2VHZXRSZXNwb25zZRIpCgZoZWFsdGgYASABKAsyGS5tZXRhbHN0YWNrLmFwaS52Mi5IZWFsdGgqhgEKDVNlcnZpY2VTdGF0dXMSHgoaU0VSVklDRV9TVEFUVVNfVU5TUEVDSUZJRUQQABIbChdTRVJWSUNFX1NUQVRVU19ERUdSQURFRBABEhwKGFNFUlZJQ0VfU1RBVFVTX1VOSEVBTFRIWRACEhoKFlNFUlZJQ0VfU1RBVFVTX0hFQUxUSFkQAyrWAgoHU2VydmljZRIXChNTRVJWSUNFX1VOU1BFQ0lGSUVEEAASGgoMU0VSVklDRV9JUEFNEAEaCIKyGQRpcGFtEiIKD1NFUlZJQ0VfUkVUSElOSxACGg2CshkJcmV0aGlua2RiEiYKElNFUlZJQ0VfTUFTVEVSREFUQRADGg6CshkKbWFzdGVyZGF0YRIiChBTRVJWSUNFX01BQ0hJTkVTEAQaDIKyGQhtYWNoaW5lcxIcCg1TRVJWSUNFX0FVRElUEAUaCYKyGQVhdWRpdBIYCgtTRVJWSUNFX1ZQThAGGgeCshkDdnBuEhwKDVNFUlZJQ0VfUkVESVMQBxoJgrIZBXJlZGlzEhwKDVNFUlZJQ0VfVEFTS1MQCBoJgrIZBXRhc2tzEjIKGFNFUlZJQ0VfVEVOQU5UX0FQSVNFUlZFUhAJGhSCshkQdGVuYW50LWFwaXNlcnZlcjJ5Cg1IZWFsdGhTZXJ2aWNlEmgKA0dldBIqLm1ldGFsc3RhY2suYXBpLnYyLkhlYWx0aFNlcnZpY2VHZXRSZXF1ZXN0GisubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU2VydmljZUdldFJlc3BvbnNlIgjY8xgB4PMYAkLBAQoVY29tLm1ldGFsc3RhY2suYXBpLnYyQgtIZWFsdGhQcm90b1ABWjVnaXRodWIuY29tL21ldGFsLXN0YWNrL2FwaS9nby9tZXRhbHN0YWNrL2FwaS92MjthcGl2MqICA01BWKoCEU1ldGFsc3RhY2suQXBpLlYyygIRTWV0YWxzdGFja1xBcGlcVjLiAh1NZXRhbHN0YWNrXEFwaVxWMlxHUEJNZXRhZGF0YeoCE01ldGFsc3RhY2s6OkFwaTo6VjJiBnByb3RvMw", [file_metalstack_api_v2_common]);
 /**
  * Describes the message metalstack.api.v2.Health.
  * Use `create(HealthSchema)` to create a new message.
@@ -129,6 +129,12 @@ export var Service;
      * @generated from enum value: SERVICE_TASKS = 8;
      */
     Service[Service["TASKS"] = 8] = "TASKS";
+    /**
+     * SERVICE_TENANT_APISERVER the tenant-apiserver
+     *
+     * @generated from enum value: SERVICE_TENANT_APISERVER = 9;
+     */
+    Service[Service["TENANT_APISERVER"] = 9] = "TENANT_APISERVER";
 })(Service || (Service = {}));
 /**
  * Describes the enum metalstack.api.v2.Service.
diff --git a/js/metalstack/api/v2/health_pb.ts b/js/metalstack/api/v2/health_pb.ts
index 0c1d004f..c3874735 100644
--- a/js/metalstack/api/v2/health_pb.ts
+++ b/js/metalstack/api/v2/health_pb.ts
@@ -11,7 +11,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file metalstack/api/v2/health.proto.
  */
 export const file_metalstack_api_v2_health: GenFile = /*@__PURE__*/
-  fileDesc("Ch5tZXRhbHN0YWNrL2FwaS92Mi9oZWFsdGgucHJvdG8SEW1ldGFsc3RhY2suYXBpLnYyIjsKBkhlYWx0aBIxCghzZXJ2aWNlcxgBIAMoCzIfLm1ldGFsc3RhY2suYXBpLnYyLkhlYWx0aFN0YXR1cyKXAgoMSGVhbHRoU3RhdHVzEigKBG5hbWUYASABKA4yGi5tZXRhbHN0YWNrLmFwaS52Mi5TZXJ2aWNlEjAKBnN0YXR1cxgCIAEoDjIgLm1ldGFsc3RhY2suYXBpLnYyLlNlcnZpY2VTdGF0dXMSDwoHbWVzc2FnZRgDIAEoCRJDCgpwYXJ0aXRpb25zGAQgAygLMi8ubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU3RhdHVzLlBhcnRpdGlvbnNFbnRyeRpVCg9QYXJ0aXRpb25zRW50cnkSCwoDa2V5GAEgASgJEjEKBXZhbHVlGAIgASgLMiIubWV0YWxzdGFjay5hcGkudjIuUGFydGl0aW9uSGVhbHRoOgI4ASJUCg9QYXJ0aXRpb25IZWFsdGgSMAoGc3RhdHVzGAEgASgOMiAubWV0YWxzdGFjay5hcGkudjIuU2VydmljZVN0YXR1cxIPCgdtZXNzYWdlGAIgASgJIhkKF0hlYWx0aFNlcnZpY2VHZXRSZXF1ZXN0IkUKGEhlYWx0aFNlcnZpY2VHZXRSZXNwb25zZRIpCgZoZWFsdGgYASABKAsyGS5tZXRhbHN0YWNrLmFwaS52Mi5IZWFsdGgqhgEKDVNlcnZpY2VTdGF0dXMSHgoaU0VSVklDRV9TVEFUVVNfVU5TUEVDSUZJRUQQABIbChdTRVJWSUNFX1NUQVRVU19ERUdSQURFRBABEhwKGFNFUlZJQ0VfU1RBVFVTX1VOSEVBTFRIWRACEhoKFlNFUlZJQ0VfU1RBVFVTX0hFQUxUSFkQAyqiAgoHU2VydmljZRIXChNTRVJWSUNFX1VOU1BFQ0lGSUVEEAASGgoMU0VSVklDRV9JUEFNEAEaCIKyGQRpcGFtEiIKD1NFUlZJQ0VfUkVUSElOSxACGg2CshkJcmV0aGlua2RiEiYKElNFUlZJQ0VfTUFTVEVSREFUQRADGg6CshkKbWFzdGVyZGF0YRIiChBTRVJWSUNFX01BQ0hJTkVTEAQaDIKyGQhtYWNoaW5lcxIcCg1TRVJWSUNFX0FVRElUEAUaCYKyGQVhdWRpdBIYCgtTRVJWSUNFX1ZQThAGGgeCshkDdnBuEhwKDVNFUlZJQ0VfUkVESVMQBxoJgrIZBXJlZGlzEhwKDVNFUlZJQ0VfVEFTS1MQCBoJgrIZBXRhc2tzMnkKDUhlYWx0aFNlcnZpY2USaAoDR2V0EioubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU2VydmljZUdldFJlcXVlc3QaKy5tZXRhbHN0YWNrLmFwaS52Mi5IZWFsdGhTZXJ2aWNlR2V0UmVzcG9uc2UiCNjzGAHg8xgCQsEBChVjb20ubWV0YWxzdGFjay5hcGkudjJCC0hlYWx0aFByb3RvUAFaNWdpdGh1Yi5jb20vbWV0YWwtc3RhY2svYXBpL2dvL21ldGFsc3RhY2svYXBpL3YyO2FwaXYyogIDTUFYqgIRTWV0YWxzdGFjay5BcGkuVjLKAhFNZXRhbHN0YWNrXEFwaVxWMuICHU1ldGFsc3RhY2tcQXBpXFYyXEdQQk1ldGFkYXRh6gITTWV0YWxzdGFjazo6QXBpOjpWMmIGcHJvdG8z", [file_metalstack_api_v2_common]);
+  fileDesc("Ch5tZXRhbHN0YWNrL2FwaS92Mi9oZWFsdGgucHJvdG8SEW1ldGFsc3RhY2suYXBpLnYyIjsKBkhlYWx0aBIxCghzZXJ2aWNlcxgBIAMoCzIfLm1ldGFsc3RhY2suYXBpLnYyLkhlYWx0aFN0YXR1cyKXAgoMSGVhbHRoU3RhdHVzEigKBG5hbWUYASABKA4yGi5tZXRhbHN0YWNrLmFwaS52Mi5TZXJ2aWNlEjAKBnN0YXR1cxgCIAEoDjIgLm1ldGFsc3RhY2suYXBpLnYyLlNlcnZpY2VTdGF0dXMSDwoHbWVzc2FnZRgDIAEoCRJDCgpwYXJ0aXRpb25zGAQgAygLMi8ubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU3RhdHVzLlBhcnRpdGlvbnNFbnRyeRpVCg9QYXJ0aXRpb25zRW50cnkSCwoDa2V5GAEgASgJEjEKBXZhbHVlGAIgASgLMiIubWV0YWxzdGFjay5hcGkudjIuUGFydGl0aW9uSGVhbHRoOgI4ASJUCg9QYXJ0aXRpb25IZWFsdGgSMAoGc3RhdHVzGAEgASgOMiAubWV0YWxzdGFjay5hcGkudjIuU2VydmljZVN0YXR1cxIPCgdtZXNzYWdlGAIgASgJIhkKF0hlYWx0aFNlcnZpY2VHZXRSZXF1ZXN0IkUKGEhlYWx0aFNlcnZpY2VHZXRSZXNwb25zZRIpCgZoZWFsdGgYASABKAsyGS5tZXRhbHN0YWNrLmFwaS52Mi5IZWFsdGgqhgEKDVNlcnZpY2VTdGF0dXMSHgoaU0VSVklDRV9TVEFUVVNfVU5TUEVDSUZJRUQQABIbChdTRVJWSUNFX1NUQVRVU19ERUdSQURFRBABEhwKGFNFUlZJQ0VfU1RBVFVTX1VOSEVBTFRIWRACEhoKFlNFUlZJQ0VfU1RBVFVTX0hFQUxUSFkQAyrWAgoHU2VydmljZRIXChNTRVJWSUNFX1VOU1BFQ0lGSUVEEAASGgoMU0VSVklDRV9JUEFNEAEaCIKyGQRpcGFtEiIKD1NFUlZJQ0VfUkVUSElOSxACGg2CshkJcmV0aGlua2RiEiYKElNFUlZJQ0VfTUFTVEVSREFUQRADGg6CshkKbWFzdGVyZGF0YRIiChBTRVJWSUNFX01BQ0hJTkVTEAQaDIKyGQhtYWNoaW5lcxIcCg1TRVJWSUNFX0FVRElUEAUaCYKyGQVhdWRpdBIYCgtTRVJWSUNFX1ZQThAGGgeCshkDdnBuEhwKDVNFUlZJQ0VfUkVESVMQBxoJgrIZBXJlZGlzEhwKDVNFUlZJQ0VfVEFTS1MQCBoJgrIZBXRhc2tzEjIKGFNFUlZJQ0VfVEVOQU5UX0FQSVNFUlZFUhAJGhSCshkQdGVuYW50LWFwaXNlcnZlcjJ5Cg1IZWFsdGhTZXJ2aWNlEmgKA0dldBIqLm1ldGFsc3RhY2suYXBpLnYyLkhlYWx0aFNlcnZpY2VHZXRSZXF1ZXN0GisubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU2VydmljZUdldFJlc3BvbnNlIgjY8xgB4PMYAkLBAQoVY29tLm1ldGFsc3RhY2suYXBpLnYyQgtIZWFsdGhQcm90b1ABWjVnaXRodWIuY29tL21ldGFsLXN0YWNrL2FwaS9nby9tZXRhbHN0YWNrL2FwaS92MjthcGl2MqICA01BWKoCEU1ldGFsc3RhY2suQXBpLlYyygIRTWV0YWxzdGFja1xBcGlcVjLiAh1NZXRhbHN0YWNrXEFwaVxWMlxHUEJNZXRhZGF0YeoCE01ldGFsc3RhY2s6OkFwaTo6VjJiBnByb3RvMw", [file_metalstack_api_v2_common]);
 
 /**
  * Health reports the health status of all services.
@@ -249,6 +249,13 @@ export enum Service {
    * @generated from enum value: SERVICE_TASKS = 8;
    */
   TASKS = 8,
+
+  /**
+   * SERVICE_TENANT_APISERVER the tenant-apiserver
+   *
+   * @generated from enum value: SERVICE_TENANT_APISERVER = 9;
+   */
+  TENANT_APISERVER = 9,
 }
 
 /**
diff --git a/proto/metalstack/api/v2/health.proto b/proto/metalstack/api/v2/health.proto
index eb0e7cdd..85972ee0 100644
--- a/proto/metalstack/api/v2/health.proto
+++ b/proto/metalstack/api/v2/health.proto
@@ -45,6 +45,8 @@ enum Service {
   SERVICE_REDIS = 7 [(enum_string_value) = "redis"];
   // SERVICE_TASKS the tasks service
   SERVICE_TASKS = 8 [(enum_string_value) = "tasks"];
+  // SERVICE_TENANT_APISERVER the tenant-apiserver
+  SERVICE_TENANT_APISERVER = 9 [(enum_string_value) = "tenant-apiserver"];
 }
 
 // Health reports the health status of all services.
diff --git a/python/metalstack/api/v2/health_pb2.py b/python/metalstack/api/v2/health_pb2.py
index 5b6db11f..25e3022c 100644
--- a/python/metalstack/api/v2/health_pb2.py
+++ b/python/metalstack/api/v2/health_pb2.py
@@ -25,7 +25,7 @@
 from metalstack.api.v2 import common_pb2 as metalstack_dot_api_dot_v2_dot_common__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1emetalstack/api/v2/health.proto\x12\x11metalstack.api.v2\x1a\x1emetalstack/api/v2/common.proto\"E\n\x06Health\x12;\n\x08services\x18\x01 \x03(\x0b\x32\x1f.metalstack.api.v2.HealthStatusR\x08services\"\xc6\x02\n\x0cHealthStatus\x12.\n\x04name\x18\x01 \x01(\x0e\x32\x1a.metalstack.api.v2.ServiceR\x04name\x12\x38\n\x06status\x18\x02 \x01(\x0e\x32 .metalstack.api.v2.ServiceStatusR\x06status\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12O\n\npartitions\x18\x04 \x03(\x0b\x32/.metalstack.api.v2.HealthStatus.PartitionsEntryR\npartitions\x1a\x61\n\x0fPartitionsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x38\n\x05value\x18\x02 \x01(\x0b\x32\".metalstack.api.v2.PartitionHealthR\x05value:\x02\x38\x01\"e\n\x0fPartitionHealth\x12\x38\n\x06status\x18\x01 \x01(\x0e\x32 .metalstack.api.v2.ServiceStatusR\x06status\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\"\x19\n\x17HealthServiceGetRequest\"M\n\x18HealthServiceGetResponse\x12\x31\n\x06health\x18\x01 \x01(\x0b\x32\x19.metalstack.api.v2.HealthR\x06health*\x86\x01\n\rServiceStatus\x12\x1e\n\x1aSERVICE_STATUS_UNSPECIFIED\x10\x00\x12\x1b\n\x17SERVICE_STATUS_DEGRADED\x10\x01\x12\x1c\n\x18SERVICE_STATUS_UNHEALTHY\x10\x02\x12\x1a\n\x16SERVICE_STATUS_HEALTHY\x10\x03*\xa2\x02\n\x07Service\x12\x17\n\x13SERVICE_UNSPECIFIED\x10\x00\x12\x1a\n\x0cSERVICE_IPAM\x10\x01\x1a\x08\x82\xb2\x19\x04ipam\x12\"\n\x0fSERVICE_RETHINK\x10\x02\x1a\r\x82\xb2\x19\trethinkdb\x12&\n\x12SERVICE_MASTERDATA\x10\x03\x1a\x0e\x82\xb2\x19\nmasterdata\x12\"\n\x10SERVICE_MACHINES\x10\x04\x1a\x0c\x82\xb2\x19\x08machines\x12\x1c\n\rSERVICE_AUDIT\x10\x05\x1a\t\x82\xb2\x19\x05\x61udit\x12\x18\n\x0bSERVICE_VPN\x10\x06\x1a\x07\x82\xb2\x19\x03vpn\x12\x1c\n\rSERVICE_REDIS\x10\x07\x1a\t\x82\xb2\x19\x05redis\x12\x1c\n\rSERVICE_TASKS\x10\x08\x1a\t\x82\xb2\x19\x05tasks2y\n\rHealthService\x12h\n\x03Get\x12*.metalstack.api.v2.HealthServiceGetRequest\x1a+.metalstack.api.v2.HealthServiceGetResponse\"\x08\xd8\xf3\x18\x01\xe0\xf3\x18\x02\x42\xc1\x01\n\x15\x63om.metalstack.api.v2B\x0bHealthProtoP\x01Z5github.com/metal-stack/api/go/metalstack/api/v2;apiv2\xa2\x02\x03MAX\xaa\x02\x11Metalstack.Api.V2\xca\x02\x11Metalstack\\Api\\V2\xe2\x02\x1dMetalstack\\Api\\V2\\GPBMetadata\xea\x02\x13Metalstack::Api::V2b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1emetalstack/api/v2/health.proto\x12\x11metalstack.api.v2\x1a\x1emetalstack/api/v2/common.proto\"E\n\x06Health\x12;\n\x08services\x18\x01 \x03(\x0b\x32\x1f.metalstack.api.v2.HealthStatusR\x08services\"\xc6\x02\n\x0cHealthStatus\x12.\n\x04name\x18\x01 \x01(\x0e\x32\x1a.metalstack.api.v2.ServiceR\x04name\x12\x38\n\x06status\x18\x02 \x01(\x0e\x32 .metalstack.api.v2.ServiceStatusR\x06status\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12O\n\npartitions\x18\x04 \x03(\x0b\x32/.metalstack.api.v2.HealthStatus.PartitionsEntryR\npartitions\x1a\x61\n\x0fPartitionsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x38\n\x05value\x18\x02 \x01(\x0b\x32\".metalstack.api.v2.PartitionHealthR\x05value:\x02\x38\x01\"e\n\x0fPartitionHealth\x12\x38\n\x06status\x18\x01 \x01(\x0e\x32 .metalstack.api.v2.ServiceStatusR\x06status\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\"\x19\n\x17HealthServiceGetRequest\"M\n\x18HealthServiceGetResponse\x12\x31\n\x06health\x18\x01 \x01(\x0b\x32\x19.metalstack.api.v2.HealthR\x06health*\x86\x01\n\rServiceStatus\x12\x1e\n\x1aSERVICE_STATUS_UNSPECIFIED\x10\x00\x12\x1b\n\x17SERVICE_STATUS_DEGRADED\x10\x01\x12\x1c\n\x18SERVICE_STATUS_UNHEALTHY\x10\x02\x12\x1a\n\x16SERVICE_STATUS_HEALTHY\x10\x03*\xd6\x02\n\x07Service\x12\x17\n\x13SERVICE_UNSPECIFIED\x10\x00\x12\x1a\n\x0cSERVICE_IPAM\x10\x01\x1a\x08\x82\xb2\x19\x04ipam\x12\"\n\x0fSERVICE_RETHINK\x10\x02\x1a\r\x82\xb2\x19\trethinkdb\x12&\n\x12SERVICE_MASTERDATA\x10\x03\x1a\x0e\x82\xb2\x19\nmasterdata\x12\"\n\x10SERVICE_MACHINES\x10\x04\x1a\x0c\x82\xb2\x19\x08machines\x12\x1c\n\rSERVICE_AUDIT\x10\x05\x1a\t\x82\xb2\x19\x05\x61udit\x12\x18\n\x0bSERVICE_VPN\x10\x06\x1a\x07\x82\xb2\x19\x03vpn\x12\x1c\n\rSERVICE_REDIS\x10\x07\x1a\t\x82\xb2\x19\x05redis\x12\x1c\n\rSERVICE_TASKS\x10\x08\x1a\t\x82\xb2\x19\x05tasks\x12\x32\n\x18SERVICE_TENANT_APISERVER\x10\t\x1a\x14\x82\xb2\x19\x10tenant-apiserver2y\n\rHealthService\x12h\n\x03Get\x12*.metalstack.api.v2.HealthServiceGetRequest\x1a+.metalstack.api.v2.HealthServiceGetResponse\"\x08\xd8\xf3\x18\x01\xe0\xf3\x18\x02\x42\xc1\x01\n\x15\x63om.metalstack.api.v2B\x0bHealthProtoP\x01Z5github.com/metal-stack/api/go/metalstack/api/v2;apiv2\xa2\x02\x03MAX\xaa\x02\x11Metalstack.Api.V2\xca\x02\x11Metalstack\\Api\\V2\xe2\x02\x1dMetalstack\\Api\\V2\\GPBMetadata\xea\x02\x13Metalstack::Api::V2b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -49,6 +49,8 @@
   _globals['_SERVICE'].values_by_name["SERVICE_REDIS"]._serialized_options = b'\202\262\031\005redis'
   _globals['_SERVICE'].values_by_name["SERVICE_TASKS"]._loaded_options = None
   _globals['_SERVICE'].values_by_name["SERVICE_TASKS"]._serialized_options = b'\202\262\031\005tasks'
+  _globals['_SERVICE'].values_by_name["SERVICE_TENANT_APISERVER"]._loaded_options = None
+  _globals['_SERVICE'].values_by_name["SERVICE_TENANT_APISERVER"]._serialized_options = b'\202\262\031\020tenant-apiserver'
   _globals['_HEALTHSTATUS_PARTITIONSENTRY']._loaded_options = None
   _globals['_HEALTHSTATUS_PARTITIONSENTRY']._serialized_options = b'8\001'
   _globals['_HEALTHSERVICE'].methods_by_name['Get']._loaded_options = None
@@ -56,7 +58,7 @@
   _globals['_SERVICESTATUS']._serialized_start=695
   _globals['_SERVICESTATUS']._serialized_end=829
   _globals['_SERVICE']._serialized_start=832
-  _globals['_SERVICE']._serialized_end=1122
+  _globals['_SERVICE']._serialized_end=1174
   _globals['_HEALTH']._serialized_start=85
   _globals['_HEALTH']._serialized_end=154
   _globals['_HEALTHSTATUS']._serialized_start=157
@@ -69,6 +71,6 @@
   _globals['_HEALTHSERVICEGETREQUEST']._serialized_end=613
   _globals['_HEALTHSERVICEGETRESPONSE']._serialized_start=615
   _globals['_HEALTHSERVICEGETRESPONSE']._serialized_end=692
-  _globals['_HEALTHSERVICE']._serialized_start=1124
-  _globals['_HEALTHSERVICE']._serialized_end=1245
+  _globals['_HEALTHSERVICE']._serialized_start=1176
+  _globals['_HEALTHSERVICE']._serialized_end=1297
 # @@protoc_insertion_point(module_scope)
diff --git a/python/metalstack/api/v2/health_pb2.pyi b/python/metalstack/api/v2/health_pb2.pyi
index 321c8a39..873b1568 100644
--- a/python/metalstack/api/v2/health_pb2.pyi
+++ b/python/metalstack/api/v2/health_pb2.pyi
@@ -26,6 +26,7 @@ class Service(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
     SERVICE_VPN: _ClassVar[Service]
     SERVICE_REDIS: _ClassVar[Service]
     SERVICE_TASKS: _ClassVar[Service]
+    SERVICE_TENANT_APISERVER: _ClassVar[Service]
 SERVICE_STATUS_UNSPECIFIED: ServiceStatus
 SERVICE_STATUS_DEGRADED: ServiceStatus
 SERVICE_STATUS_UNHEALTHY: ServiceStatus
@@ -39,6 +40,7 @@ SERVICE_AUDIT: Service
 SERVICE_VPN: Service
 SERVICE_REDIS: Service
 SERVICE_TASKS: Service
+SERVICE_TENANT_APISERVER: Service
 
 class Health(_message.Message):
     __slots__ = ("services",)

From 778a5dc23e352fe52f6b78628a0d4702fba2e92d Mon Sep 17 00:00:00 2001
From: Stefan Majer <stefan.majer@f-i-ts.de>
Date: Mon, 1 Jun 2026 09:49:16 +0200
Subject: [PATCH 2/2] Remove masterdata

---
 doc/index.html                          | 10 ++--------
 go/metalstack/api/v2/health.pb.go       | 22 ++++++++--------------
 js/metalstack/api/v2/health_pb.d.ts     | 14 ++++----------
 js/metalstack/api/v2/health_pb.js       | 14 ++++----------
 js/metalstack/api/v2/health_pb.ts       | 15 ++++-----------
 proto/metalstack/api/v2/health.proto    |  6 ++----
 python/metalstack/api/v2/health_pb2.py  | 14 ++++++--------
 python/metalstack/api/v2/health_pb2.pyi |  6 ++----
 8 files changed, 32 insertions(+), 69 deletions(-)

diff --git a/doc/index.html b/doc/index.html
index 60f50271..3ccd40b9 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -19526,9 +19526,9 @@ <h3 id="metalstack.api.v2.Service">Service</h3>
               </tr>
             
               <tr>
-                <td>SERVICE_MASTERDATA</td>
+                <td>SERVICE_TENANT_APISERVER</td>
                 <td>3</td>
-                <td><p>SERVICE_MASTERDATA the masterdata API</p></td>
+                <td><p>SERVICE_TENANT_APISERVER the tenant-apiserver</p></td>
               </tr>
             
               <tr>
@@ -19561,12 +19561,6 @@ <h3 id="metalstack.api.v2.Service">Service</h3>
                 <td><p>SERVICE_TASKS the tasks service</p></td>
               </tr>
             
-              <tr>
-                <td>SERVICE_TENANT_APISERVER</td>
-                <td>9</td>
-                <td><p>SERVICE_TENANT_APISERVER the tenant-apiserver</p></td>
-              </tr>
-            
           </tbody>
         </table>
       
diff --git a/go/metalstack/api/v2/health.pb.go b/go/metalstack/api/v2/health.pb.go
index 59e17a48..fad45d15 100644
--- a/go/metalstack/api/v2/health.pb.go
+++ b/go/metalstack/api/v2/health.pb.go
@@ -88,8 +88,8 @@ const (
 	Service_SERVICE_IPAM Service = 1
 	// SERVICE_RETHINK the RethinkDB
 	Service_SERVICE_RETHINK Service = 2
-	// SERVICE_MASTERDATA the masterdata API
-	Service_SERVICE_MASTERDATA Service = 3
+	// SERVICE_TENANT_APISERVER the tenant-apiserver
+	Service_SERVICE_TENANT_APISERVER Service = 3
 	// SERVICE_MACHINES the machine service
 	Service_SERVICE_MACHINES Service = 4
 	// SERVICE_AUDIT the auditing
@@ -100,8 +100,6 @@ const (
 	Service_SERVICE_REDIS Service = 7
 	// SERVICE_TASKS the tasks service
 	Service_SERVICE_TASKS Service = 8
-	// SERVICE_TENANT_APISERVER the tenant-apiserver
-	Service_SERVICE_TENANT_APISERVER Service = 9
 )
 
 // Enum value maps for Service.
@@ -110,25 +108,23 @@ var (
 		0: "SERVICE_UNSPECIFIED",
 		1: "SERVICE_IPAM",
 		2: "SERVICE_RETHINK",
-		3: "SERVICE_MASTERDATA",
+		3: "SERVICE_TENANT_APISERVER",
 		4: "SERVICE_MACHINES",
 		5: "SERVICE_AUDIT",
 		6: "SERVICE_VPN",
 		7: "SERVICE_REDIS",
 		8: "SERVICE_TASKS",
-		9: "SERVICE_TENANT_APISERVER",
 	}
 	Service_value = map[string]int32{
 		"SERVICE_UNSPECIFIED":      0,
 		"SERVICE_IPAM":             1,
 		"SERVICE_RETHINK":          2,
-		"SERVICE_MASTERDATA":       3,
+		"SERVICE_TENANT_APISERVER": 3,
 		"SERVICE_MACHINES":         4,
 		"SERVICE_AUDIT":            5,
 		"SERVICE_VPN":              6,
 		"SERVICE_REDIS":            7,
 		"SERVICE_TASKS":            8,
-		"SERVICE_TENANT_APISERVER": 9,
 	}
 )
 
@@ -443,19 +439,17 @@ const file_metalstack_api_v2_health_proto_rawDesc = "" +
 	"\x1aSERVICE_STATUS_UNSPECIFIED\x10\x00\x12\x1b\n" +
 	"\x17SERVICE_STATUS_DEGRADED\x10\x01\x12\x1c\n" +
 	"\x18SERVICE_STATUS_UNHEALTHY\x10\x02\x12\x1a\n" +
-	"\x16SERVICE_STATUS_HEALTHY\x10\x03*\xd6\x02\n" +
+	"\x16SERVICE_STATUS_HEALTHY\x10\x03*\xae\x02\n" +
 	"\aService\x12\x17\n" +
 	"\x13SERVICE_UNSPECIFIED\x10\x00\x12\x1a\n" +
 	"\fSERVICE_IPAM\x10\x01\x1a\b\x82\xb2\x19\x04ipam\x12\"\n" +
-	"\x0fSERVICE_RETHINK\x10\x02\x1a\r\x82\xb2\x19\trethinkdb\x12&\n" +
-	"\x12SERVICE_MASTERDATA\x10\x03\x1a\x0e\x82\xb2\x19\n" +
-	"masterdata\x12\"\n" +
+	"\x0fSERVICE_RETHINK\x10\x02\x1a\r\x82\xb2\x19\trethinkdb\x122\n" +
+	"\x18SERVICE_TENANT_APISERVER\x10\x03\x1a\x14\x82\xb2\x19\x10tenant-apiserver\x12\"\n" +
 	"\x10SERVICE_MACHINES\x10\x04\x1a\f\x82\xb2\x19\bmachines\x12\x1c\n" +
 	"\rSERVICE_AUDIT\x10\x05\x1a\t\x82\xb2\x19\x05audit\x12\x18\n" +
 	"\vSERVICE_VPN\x10\x06\x1a\a\x82\xb2\x19\x03vpn\x12\x1c\n" +
 	"\rSERVICE_REDIS\x10\a\x1a\t\x82\xb2\x19\x05redis\x12\x1c\n" +
-	"\rSERVICE_TASKS\x10\b\x1a\t\x82\xb2\x19\x05tasks\x122\n" +
-	"\x18SERVICE_TENANT_APISERVER\x10\t\x1a\x14\x82\xb2\x19\x10tenant-apiserver2y\n" +
+	"\rSERVICE_TASKS\x10\b\x1a\t\x82\xb2\x19\x05tasks2y\n" +
 	"\rHealthService\x12h\n" +
 	"\x03Get\x12*.metalstack.api.v2.HealthServiceGetRequest\x1a+.metalstack.api.v2.HealthServiceGetResponse\"\b\xd8\xf3\x18\x01\xe0\xf3\x18\x02B\xc1\x01\n" +
 	"\x15com.metalstack.api.v2B\vHealthProtoP\x01Z5github.com/metal-stack/api/go/metalstack/api/v2;apiv2\xa2\x02\x03MAX\xaa\x02\x11Metalstack.Api.V2\xca\x02\x11Metalstack\\Api\\V2\xe2\x02\x1dMetalstack\\Api\\V2\\GPBMetadata\xea\x02\x13Metalstack::Api::V2b\x06proto3"
diff --git a/js/metalstack/api/v2/health_pb.d.ts b/js/metalstack/api/v2/health_pb.d.ts
index 292e9fe2..cda94c85 100644
--- a/js/metalstack/api/v2/health_pb.d.ts
+++ b/js/metalstack/api/v2/health_pb.d.ts
@@ -173,11 +173,11 @@ export declare enum Service {
      */
     RETHINK = 2,
     /**
-     * SERVICE_MASTERDATA the masterdata API
+     * SERVICE_TENANT_APISERVER the tenant-apiserver
      *
-     * @generated from enum value: SERVICE_MASTERDATA = 3;
+     * @generated from enum value: SERVICE_TENANT_APISERVER = 3;
      */
-    MASTERDATA = 3,
+    TENANT_APISERVER = 3,
     /**
      * SERVICE_MACHINES the machine service
      *
@@ -207,13 +207,7 @@ export declare enum Service {
      *
      * @generated from enum value: SERVICE_TASKS = 8;
      */
-    TASKS = 8,
-    /**
-     * SERVICE_TENANT_APISERVER the tenant-apiserver
-     *
-     * @generated from enum value: SERVICE_TENANT_APISERVER = 9;
-     */
-    TENANT_APISERVER = 9
+    TASKS = 8
 }
 /**
  * Describes the enum metalstack.api.v2.Service.
diff --git a/js/metalstack/api/v2/health_pb.js b/js/metalstack/api/v2/health_pb.js
index 9da936d7..45e2426a 100644
--- a/js/metalstack/api/v2/health_pb.js
+++ b/js/metalstack/api/v2/health_pb.js
@@ -6,7 +6,7 @@ import { file_metalstack_api_v2_common } from "./common_pb";
 /**
  * Describes the file metalstack/api/v2/health.proto.
  */
-export const file_metalstack_api_v2_health = /*@__PURE__*/ fileDesc("Ch5tZXRhbHN0YWNrL2FwaS92Mi9oZWFsdGgucHJvdG8SEW1ldGFsc3RhY2suYXBpLnYyIjsKBkhlYWx0aBIxCghzZXJ2aWNlcxgBIAMoCzIfLm1ldGFsc3RhY2suYXBpLnYyLkhlYWx0aFN0YXR1cyKXAgoMSGVhbHRoU3RhdHVzEigKBG5hbWUYASABKA4yGi5tZXRhbHN0YWNrLmFwaS52Mi5TZXJ2aWNlEjAKBnN0YXR1cxgCIAEoDjIgLm1ldGFsc3RhY2suYXBpLnYyLlNlcnZpY2VTdGF0dXMSDwoHbWVzc2FnZRgDIAEoCRJDCgpwYXJ0aXRpb25zGAQgAygLMi8ubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU3RhdHVzLlBhcnRpdGlvbnNFbnRyeRpVCg9QYXJ0aXRpb25zRW50cnkSCwoDa2V5GAEgASgJEjEKBXZhbHVlGAIgASgLMiIubWV0YWxzdGFjay5hcGkudjIuUGFydGl0aW9uSGVhbHRoOgI4ASJUCg9QYXJ0aXRpb25IZWFsdGgSMAoGc3RhdHVzGAEgASgOMiAubWV0YWxzdGFjay5hcGkudjIuU2VydmljZVN0YXR1cxIPCgdtZXNzYWdlGAIgASgJIhkKF0hlYWx0aFNlcnZpY2VHZXRSZXF1ZXN0IkUKGEhlYWx0aFNlcnZpY2VHZXRSZXNwb25zZRIpCgZoZWFsdGgYASABKAsyGS5tZXRhbHN0YWNrLmFwaS52Mi5IZWFsdGgqhgEKDVNlcnZpY2VTdGF0dXMSHgoaU0VSVklDRV9TVEFUVVNfVU5TUEVDSUZJRUQQABIbChdTRVJWSUNFX1NUQVRVU19ERUdSQURFRBABEhwKGFNFUlZJQ0VfU1RBVFVTX1VOSEVBTFRIWRACEhoKFlNFUlZJQ0VfU1RBVFVTX0hFQUxUSFkQAyrWAgoHU2VydmljZRIXChNTRVJWSUNFX1VOU1BFQ0lGSUVEEAASGgoMU0VSVklDRV9JUEFNEAEaCIKyGQRpcGFtEiIKD1NFUlZJQ0VfUkVUSElOSxACGg2CshkJcmV0aGlua2RiEiYKElNFUlZJQ0VfTUFTVEVSREFUQRADGg6CshkKbWFzdGVyZGF0YRIiChBTRVJWSUNFX01BQ0hJTkVTEAQaDIKyGQhtYWNoaW5lcxIcCg1TRVJWSUNFX0FVRElUEAUaCYKyGQVhdWRpdBIYCgtTRVJWSUNFX1ZQThAGGgeCshkDdnBuEhwKDVNFUlZJQ0VfUkVESVMQBxoJgrIZBXJlZGlzEhwKDVNFUlZJQ0VfVEFTS1MQCBoJgrIZBXRhc2tzEjIKGFNFUlZJQ0VfVEVOQU5UX0FQSVNFUlZFUhAJGhSCshkQdGVuYW50LWFwaXNlcnZlcjJ5Cg1IZWFsdGhTZXJ2aWNlEmgKA0dldBIqLm1ldGFsc3RhY2suYXBpLnYyLkhlYWx0aFNlcnZpY2VHZXRSZXF1ZXN0GisubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU2VydmljZUdldFJlc3BvbnNlIgjY8xgB4PMYAkLBAQoVY29tLm1ldGFsc3RhY2suYXBpLnYyQgtIZWFsdGhQcm90b1ABWjVnaXRodWIuY29tL21ldGFsLXN0YWNrL2FwaS9nby9tZXRhbHN0YWNrL2FwaS92MjthcGl2MqICA01BWKoCEU1ldGFsc3RhY2suQXBpLlYyygIRTWV0YWxzdGFja1xBcGlcVjLiAh1NZXRhbHN0YWNrXEFwaVxWMlxHUEJNZXRhZGF0YeoCE01ldGFsc3RhY2s6OkFwaTo6VjJiBnByb3RvMw", [file_metalstack_api_v2_common]);
+export const file_metalstack_api_v2_health = /*@__PURE__*/ fileDesc("Ch5tZXRhbHN0YWNrL2FwaS92Mi9oZWFsdGgucHJvdG8SEW1ldGFsc3RhY2suYXBpLnYyIjsKBkhlYWx0aBIxCghzZXJ2aWNlcxgBIAMoCzIfLm1ldGFsc3RhY2suYXBpLnYyLkhlYWx0aFN0YXR1cyKXAgoMSGVhbHRoU3RhdHVzEigKBG5hbWUYASABKA4yGi5tZXRhbHN0YWNrLmFwaS52Mi5TZXJ2aWNlEjAKBnN0YXR1cxgCIAEoDjIgLm1ldGFsc3RhY2suYXBpLnYyLlNlcnZpY2VTdGF0dXMSDwoHbWVzc2FnZRgDIAEoCRJDCgpwYXJ0aXRpb25zGAQgAygLMi8ubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU3RhdHVzLlBhcnRpdGlvbnNFbnRyeRpVCg9QYXJ0aXRpb25zRW50cnkSCwoDa2V5GAEgASgJEjEKBXZhbHVlGAIgASgLMiIubWV0YWxzdGFjay5hcGkudjIuUGFydGl0aW9uSGVhbHRoOgI4ASJUCg9QYXJ0aXRpb25IZWFsdGgSMAoGc3RhdHVzGAEgASgOMiAubWV0YWxzdGFjay5hcGkudjIuU2VydmljZVN0YXR1cxIPCgdtZXNzYWdlGAIgASgJIhkKF0hlYWx0aFNlcnZpY2VHZXRSZXF1ZXN0IkUKGEhlYWx0aFNlcnZpY2VHZXRSZXNwb25zZRIpCgZoZWFsdGgYASABKAsyGS5tZXRhbHN0YWNrLmFwaS52Mi5IZWFsdGgqhgEKDVNlcnZpY2VTdGF0dXMSHgoaU0VSVklDRV9TVEFUVVNfVU5TUEVDSUZJRUQQABIbChdTRVJWSUNFX1NUQVRVU19ERUdSQURFRBABEhwKGFNFUlZJQ0VfU1RBVFVTX1VOSEVBTFRIWRACEhoKFlNFUlZJQ0VfU1RBVFVTX0hFQUxUSFkQAyquAgoHU2VydmljZRIXChNTRVJWSUNFX1VOU1BFQ0lGSUVEEAASGgoMU0VSVklDRV9JUEFNEAEaCIKyGQRpcGFtEiIKD1NFUlZJQ0VfUkVUSElOSxACGg2CshkJcmV0aGlua2RiEjIKGFNFUlZJQ0VfVEVOQU5UX0FQSVNFUlZFUhADGhSCshkQdGVuYW50LWFwaXNlcnZlchIiChBTRVJWSUNFX01BQ0hJTkVTEAQaDIKyGQhtYWNoaW5lcxIcCg1TRVJWSUNFX0FVRElUEAUaCYKyGQVhdWRpdBIYCgtTRVJWSUNFX1ZQThAGGgeCshkDdnBuEhwKDVNFUlZJQ0VfUkVESVMQBxoJgrIZBXJlZGlzEhwKDVNFUlZJQ0VfVEFTS1MQCBoJgrIZBXRhc2tzMnkKDUhlYWx0aFNlcnZpY2USaAoDR2V0EioubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU2VydmljZUdldFJlcXVlc3QaKy5tZXRhbHN0YWNrLmFwaS52Mi5IZWFsdGhTZXJ2aWNlR2V0UmVzcG9uc2UiCNjzGAHg8xgCQsEBChVjb20ubWV0YWxzdGFjay5hcGkudjJCC0hlYWx0aFByb3RvUAFaNWdpdGh1Yi5jb20vbWV0YWwtc3RhY2svYXBpL2dvL21ldGFsc3RhY2svYXBpL3YyO2FwaXYyogIDTUFYqgIRTWV0YWxzdGFjay5BcGkuVjLKAhFNZXRhbHN0YWNrXEFwaVxWMuICHU1ldGFsc3RhY2tcQXBpXFYyXEdQQk1ldGFkYXRh6gITTWV0YWxzdGFjazo6QXBpOjpWMmIGcHJvdG8z", [file_metalstack_api_v2_common]);
 /**
  * Describes the message metalstack.api.v2.Health.
  * Use `create(HealthSchema)` to create a new message.
@@ -94,11 +94,11 @@ export var Service;
      */
     Service[Service["RETHINK"] = 2] = "RETHINK";
     /**
-     * SERVICE_MASTERDATA the masterdata API
+     * SERVICE_TENANT_APISERVER the tenant-apiserver
      *
-     * @generated from enum value: SERVICE_MASTERDATA = 3;
+     * @generated from enum value: SERVICE_TENANT_APISERVER = 3;
      */
-    Service[Service["MASTERDATA"] = 3] = "MASTERDATA";
+    Service[Service["TENANT_APISERVER"] = 3] = "TENANT_APISERVER";
     /**
      * SERVICE_MACHINES the machine service
      *
@@ -129,12 +129,6 @@ export var Service;
      * @generated from enum value: SERVICE_TASKS = 8;
      */
     Service[Service["TASKS"] = 8] = "TASKS";
-    /**
-     * SERVICE_TENANT_APISERVER the tenant-apiserver
-     *
-     * @generated from enum value: SERVICE_TENANT_APISERVER = 9;
-     */
-    Service[Service["TENANT_APISERVER"] = 9] = "TENANT_APISERVER";
 })(Service || (Service = {}));
 /**
  * Describes the enum metalstack.api.v2.Service.
diff --git a/js/metalstack/api/v2/health_pb.ts b/js/metalstack/api/v2/health_pb.ts
index c3874735..79aaf555 100644
--- a/js/metalstack/api/v2/health_pb.ts
+++ b/js/metalstack/api/v2/health_pb.ts
@@ -11,7 +11,7 @@ import type { Message } from "@bufbuild/protobuf";
  * Describes the file metalstack/api/v2/health.proto.
  */
 export const file_metalstack_api_v2_health: GenFile = /*@__PURE__*/
-  fileDesc("Ch5tZXRhbHN0YWNrL2FwaS92Mi9oZWFsdGgucHJvdG8SEW1ldGFsc3RhY2suYXBpLnYyIjsKBkhlYWx0aBIxCghzZXJ2aWNlcxgBIAMoCzIfLm1ldGFsc3RhY2suYXBpLnYyLkhlYWx0aFN0YXR1cyKXAgoMSGVhbHRoU3RhdHVzEigKBG5hbWUYASABKA4yGi5tZXRhbHN0YWNrLmFwaS52Mi5TZXJ2aWNlEjAKBnN0YXR1cxgCIAEoDjIgLm1ldGFsc3RhY2suYXBpLnYyLlNlcnZpY2VTdGF0dXMSDwoHbWVzc2FnZRgDIAEoCRJDCgpwYXJ0aXRpb25zGAQgAygLMi8ubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU3RhdHVzLlBhcnRpdGlvbnNFbnRyeRpVCg9QYXJ0aXRpb25zRW50cnkSCwoDa2V5GAEgASgJEjEKBXZhbHVlGAIgASgLMiIubWV0YWxzdGFjay5hcGkudjIuUGFydGl0aW9uSGVhbHRoOgI4ASJUCg9QYXJ0aXRpb25IZWFsdGgSMAoGc3RhdHVzGAEgASgOMiAubWV0YWxzdGFjay5hcGkudjIuU2VydmljZVN0YXR1cxIPCgdtZXNzYWdlGAIgASgJIhkKF0hlYWx0aFNlcnZpY2VHZXRSZXF1ZXN0IkUKGEhlYWx0aFNlcnZpY2VHZXRSZXNwb25zZRIpCgZoZWFsdGgYASABKAsyGS5tZXRhbHN0YWNrLmFwaS52Mi5IZWFsdGgqhgEKDVNlcnZpY2VTdGF0dXMSHgoaU0VSVklDRV9TVEFUVVNfVU5TUEVDSUZJRUQQABIbChdTRVJWSUNFX1NUQVRVU19ERUdSQURFRBABEhwKGFNFUlZJQ0VfU1RBVFVTX1VOSEVBTFRIWRACEhoKFlNFUlZJQ0VfU1RBVFVTX0hFQUxUSFkQAyrWAgoHU2VydmljZRIXChNTRVJWSUNFX1VOU1BFQ0lGSUVEEAASGgoMU0VSVklDRV9JUEFNEAEaCIKyGQRpcGFtEiIKD1NFUlZJQ0VfUkVUSElOSxACGg2CshkJcmV0aGlua2RiEiYKElNFUlZJQ0VfTUFTVEVSREFUQRADGg6CshkKbWFzdGVyZGF0YRIiChBTRVJWSUNFX01BQ0hJTkVTEAQaDIKyGQhtYWNoaW5lcxIcCg1TRVJWSUNFX0FVRElUEAUaCYKyGQVhdWRpdBIYCgtTRVJWSUNFX1ZQThAGGgeCshkDdnBuEhwKDVNFUlZJQ0VfUkVESVMQBxoJgrIZBXJlZGlzEhwKDVNFUlZJQ0VfVEFTS1MQCBoJgrIZBXRhc2tzEjIKGFNFUlZJQ0VfVEVOQU5UX0FQSVNFUlZFUhAJGhSCshkQdGVuYW50LWFwaXNlcnZlcjJ5Cg1IZWFsdGhTZXJ2aWNlEmgKA0dldBIqLm1ldGFsc3RhY2suYXBpLnYyLkhlYWx0aFNlcnZpY2VHZXRSZXF1ZXN0GisubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU2VydmljZUdldFJlc3BvbnNlIgjY8xgB4PMYAkLBAQoVY29tLm1ldGFsc3RhY2suYXBpLnYyQgtIZWFsdGhQcm90b1ABWjVnaXRodWIuY29tL21ldGFsLXN0YWNrL2FwaS9nby9tZXRhbHN0YWNrL2FwaS92MjthcGl2MqICA01BWKoCEU1ldGFsc3RhY2suQXBpLlYyygIRTWV0YWxzdGFja1xBcGlcVjLiAh1NZXRhbHN0YWNrXEFwaVxWMlxHUEJNZXRhZGF0YeoCE01ldGFsc3RhY2s6OkFwaTo6VjJiBnByb3RvMw", [file_metalstack_api_v2_common]);
+  fileDesc("Ch5tZXRhbHN0YWNrL2FwaS92Mi9oZWFsdGgucHJvdG8SEW1ldGFsc3RhY2suYXBpLnYyIjsKBkhlYWx0aBIxCghzZXJ2aWNlcxgBIAMoCzIfLm1ldGFsc3RhY2suYXBpLnYyLkhlYWx0aFN0YXR1cyKXAgoMSGVhbHRoU3RhdHVzEigKBG5hbWUYASABKA4yGi5tZXRhbHN0YWNrLmFwaS52Mi5TZXJ2aWNlEjAKBnN0YXR1cxgCIAEoDjIgLm1ldGFsc3RhY2suYXBpLnYyLlNlcnZpY2VTdGF0dXMSDwoHbWVzc2FnZRgDIAEoCRJDCgpwYXJ0aXRpb25zGAQgAygLMi8ubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU3RhdHVzLlBhcnRpdGlvbnNFbnRyeRpVCg9QYXJ0aXRpb25zRW50cnkSCwoDa2V5GAEgASgJEjEKBXZhbHVlGAIgASgLMiIubWV0YWxzdGFjay5hcGkudjIuUGFydGl0aW9uSGVhbHRoOgI4ASJUCg9QYXJ0aXRpb25IZWFsdGgSMAoGc3RhdHVzGAEgASgOMiAubWV0YWxzdGFjay5hcGkudjIuU2VydmljZVN0YXR1cxIPCgdtZXNzYWdlGAIgASgJIhkKF0hlYWx0aFNlcnZpY2VHZXRSZXF1ZXN0IkUKGEhlYWx0aFNlcnZpY2VHZXRSZXNwb25zZRIpCgZoZWFsdGgYASABKAsyGS5tZXRhbHN0YWNrLmFwaS52Mi5IZWFsdGgqhgEKDVNlcnZpY2VTdGF0dXMSHgoaU0VSVklDRV9TVEFUVVNfVU5TUEVDSUZJRUQQABIbChdTRVJWSUNFX1NUQVRVU19ERUdSQURFRBABEhwKGFNFUlZJQ0VfU1RBVFVTX1VOSEVBTFRIWRACEhoKFlNFUlZJQ0VfU1RBVFVTX0hFQUxUSFkQAyquAgoHU2VydmljZRIXChNTRVJWSUNFX1VOU1BFQ0lGSUVEEAASGgoMU0VSVklDRV9JUEFNEAEaCIKyGQRpcGFtEiIKD1NFUlZJQ0VfUkVUSElOSxACGg2CshkJcmV0aGlua2RiEjIKGFNFUlZJQ0VfVEVOQU5UX0FQSVNFUlZFUhADGhSCshkQdGVuYW50LWFwaXNlcnZlchIiChBTRVJWSUNFX01BQ0hJTkVTEAQaDIKyGQhtYWNoaW5lcxIcCg1TRVJWSUNFX0FVRElUEAUaCYKyGQVhdWRpdBIYCgtTRVJWSUNFX1ZQThAGGgeCshkDdnBuEhwKDVNFUlZJQ0VfUkVESVMQBxoJgrIZBXJlZGlzEhwKDVNFUlZJQ0VfVEFTS1MQCBoJgrIZBXRhc2tzMnkKDUhlYWx0aFNlcnZpY2USaAoDR2V0EioubWV0YWxzdGFjay5hcGkudjIuSGVhbHRoU2VydmljZUdldFJlcXVlc3QaKy5tZXRhbHN0YWNrLmFwaS52Mi5IZWFsdGhTZXJ2aWNlR2V0UmVzcG9uc2UiCNjzGAHg8xgCQsEBChVjb20ubWV0YWxzdGFjay5hcGkudjJCC0hlYWx0aFByb3RvUAFaNWdpdGh1Yi5jb20vbWV0YWwtc3RhY2svYXBpL2dvL21ldGFsc3RhY2svYXBpL3YyO2FwaXYyogIDTUFYqgIRTWV0YWxzdGFjay5BcGkuVjLKAhFNZXRhbHN0YWNrXEFwaVxWMuICHU1ldGFsc3RhY2tcQXBpXFYyXEdQQk1ldGFkYXRh6gITTWV0YWxzdGFjazo6QXBpOjpWMmIGcHJvdG8z", [file_metalstack_api_v2_common]);
 
 /**
  * Health reports the health status of all services.
@@ -209,11 +209,11 @@ export enum Service {
   RETHINK = 2,
 
   /**
-   * SERVICE_MASTERDATA the masterdata API
+   * SERVICE_TENANT_APISERVER the tenant-apiserver
    *
-   * @generated from enum value: SERVICE_MASTERDATA = 3;
+   * @generated from enum value: SERVICE_TENANT_APISERVER = 3;
    */
-  MASTERDATA = 3,
+  TENANT_APISERVER = 3,
 
   /**
    * SERVICE_MACHINES the machine service
@@ -249,13 +249,6 @@ export enum Service {
    * @generated from enum value: SERVICE_TASKS = 8;
    */
   TASKS = 8,
-
-  /**
-   * SERVICE_TENANT_APISERVER the tenant-apiserver
-   *
-   * @generated from enum value: SERVICE_TENANT_APISERVER = 9;
-   */
-  TENANT_APISERVER = 9,
 }
 
 /**
diff --git a/proto/metalstack/api/v2/health.proto b/proto/metalstack/api/v2/health.proto
index 85972ee0..d931bb41 100644
--- a/proto/metalstack/api/v2/health.proto
+++ b/proto/metalstack/api/v2/health.proto
@@ -33,8 +33,8 @@ enum Service {
   SERVICE_IPAM = 1 [(enum_string_value) = "ipam"];
   // SERVICE_RETHINK the RethinkDB
   SERVICE_RETHINK = 2 [(enum_string_value) = "rethinkdb"];
-  // SERVICE_MASTERDATA the masterdata API
-  SERVICE_MASTERDATA = 3 [(enum_string_value) = "masterdata"];
+  // SERVICE_TENANT_APISERVER the tenant-apiserver
+  SERVICE_TENANT_APISERVER = 3 [(enum_string_value) = "tenant-apiserver"];
   // SERVICE_MACHINES the machine service
   SERVICE_MACHINES = 4 [(enum_string_value) = "machines"];
   // SERVICE_AUDIT the auditing
@@ -45,8 +45,6 @@ enum Service {
   SERVICE_REDIS = 7 [(enum_string_value) = "redis"];
   // SERVICE_TASKS the tasks service
   SERVICE_TASKS = 8 [(enum_string_value) = "tasks"];
-  // SERVICE_TENANT_APISERVER the tenant-apiserver
-  SERVICE_TENANT_APISERVER = 9 [(enum_string_value) = "tenant-apiserver"];
 }
 
 // Health reports the health status of all services.
diff --git a/python/metalstack/api/v2/health_pb2.py b/python/metalstack/api/v2/health_pb2.py
index 25e3022c..14af7e63 100644
--- a/python/metalstack/api/v2/health_pb2.py
+++ b/python/metalstack/api/v2/health_pb2.py
@@ -25,7 +25,7 @@
 from metalstack.api.v2 import common_pb2 as metalstack_dot_api_dot_v2_dot_common__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1emetalstack/api/v2/health.proto\x12\x11metalstack.api.v2\x1a\x1emetalstack/api/v2/common.proto\"E\n\x06Health\x12;\n\x08services\x18\x01 \x03(\x0b\x32\x1f.metalstack.api.v2.HealthStatusR\x08services\"\xc6\x02\n\x0cHealthStatus\x12.\n\x04name\x18\x01 \x01(\x0e\x32\x1a.metalstack.api.v2.ServiceR\x04name\x12\x38\n\x06status\x18\x02 \x01(\x0e\x32 .metalstack.api.v2.ServiceStatusR\x06status\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12O\n\npartitions\x18\x04 \x03(\x0b\x32/.metalstack.api.v2.HealthStatus.PartitionsEntryR\npartitions\x1a\x61\n\x0fPartitionsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x38\n\x05value\x18\x02 \x01(\x0b\x32\".metalstack.api.v2.PartitionHealthR\x05value:\x02\x38\x01\"e\n\x0fPartitionHealth\x12\x38\n\x06status\x18\x01 \x01(\x0e\x32 .metalstack.api.v2.ServiceStatusR\x06status\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\"\x19\n\x17HealthServiceGetRequest\"M\n\x18HealthServiceGetResponse\x12\x31\n\x06health\x18\x01 \x01(\x0b\x32\x19.metalstack.api.v2.HealthR\x06health*\x86\x01\n\rServiceStatus\x12\x1e\n\x1aSERVICE_STATUS_UNSPECIFIED\x10\x00\x12\x1b\n\x17SERVICE_STATUS_DEGRADED\x10\x01\x12\x1c\n\x18SERVICE_STATUS_UNHEALTHY\x10\x02\x12\x1a\n\x16SERVICE_STATUS_HEALTHY\x10\x03*\xd6\x02\n\x07Service\x12\x17\n\x13SERVICE_UNSPECIFIED\x10\x00\x12\x1a\n\x0cSERVICE_IPAM\x10\x01\x1a\x08\x82\xb2\x19\x04ipam\x12\"\n\x0fSERVICE_RETHINK\x10\x02\x1a\r\x82\xb2\x19\trethinkdb\x12&\n\x12SERVICE_MASTERDATA\x10\x03\x1a\x0e\x82\xb2\x19\nmasterdata\x12\"\n\x10SERVICE_MACHINES\x10\x04\x1a\x0c\x82\xb2\x19\x08machines\x12\x1c\n\rSERVICE_AUDIT\x10\x05\x1a\t\x82\xb2\x19\x05\x61udit\x12\x18\n\x0bSERVICE_VPN\x10\x06\x1a\x07\x82\xb2\x19\x03vpn\x12\x1c\n\rSERVICE_REDIS\x10\x07\x1a\t\x82\xb2\x19\x05redis\x12\x1c\n\rSERVICE_TASKS\x10\x08\x1a\t\x82\xb2\x19\x05tasks\x12\x32\n\x18SERVICE_TENANT_APISERVER\x10\t\x1a\x14\x82\xb2\x19\x10tenant-apiserver2y\n\rHealthService\x12h\n\x03Get\x12*.metalstack.api.v2.HealthServiceGetRequest\x1a+.metalstack.api.v2.HealthServiceGetResponse\"\x08\xd8\xf3\x18\x01\xe0\xf3\x18\x02\x42\xc1\x01\n\x15\x63om.metalstack.api.v2B\x0bHealthProtoP\x01Z5github.com/metal-stack/api/go/metalstack/api/v2;apiv2\xa2\x02\x03MAX\xaa\x02\x11Metalstack.Api.V2\xca\x02\x11Metalstack\\Api\\V2\xe2\x02\x1dMetalstack\\Api\\V2\\GPBMetadata\xea\x02\x13Metalstack::Api::V2b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1emetalstack/api/v2/health.proto\x12\x11metalstack.api.v2\x1a\x1emetalstack/api/v2/common.proto\"E\n\x06Health\x12;\n\x08services\x18\x01 \x03(\x0b\x32\x1f.metalstack.api.v2.HealthStatusR\x08services\"\xc6\x02\n\x0cHealthStatus\x12.\n\x04name\x18\x01 \x01(\x0e\x32\x1a.metalstack.api.v2.ServiceR\x04name\x12\x38\n\x06status\x18\x02 \x01(\x0e\x32 .metalstack.api.v2.ServiceStatusR\x06status\x12\x18\n\x07message\x18\x03 \x01(\tR\x07message\x12O\n\npartitions\x18\x04 \x03(\x0b\x32/.metalstack.api.v2.HealthStatus.PartitionsEntryR\npartitions\x1a\x61\n\x0fPartitionsEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12\x38\n\x05value\x18\x02 \x01(\x0b\x32\".metalstack.api.v2.PartitionHealthR\x05value:\x02\x38\x01\"e\n\x0fPartitionHealth\x12\x38\n\x06status\x18\x01 \x01(\x0e\x32 .metalstack.api.v2.ServiceStatusR\x06status\x12\x18\n\x07message\x18\x02 \x01(\tR\x07message\"\x19\n\x17HealthServiceGetRequest\"M\n\x18HealthServiceGetResponse\x12\x31\n\x06health\x18\x01 \x01(\x0b\x32\x19.metalstack.api.v2.HealthR\x06health*\x86\x01\n\rServiceStatus\x12\x1e\n\x1aSERVICE_STATUS_UNSPECIFIED\x10\x00\x12\x1b\n\x17SERVICE_STATUS_DEGRADED\x10\x01\x12\x1c\n\x18SERVICE_STATUS_UNHEALTHY\x10\x02\x12\x1a\n\x16SERVICE_STATUS_HEALTHY\x10\x03*\xae\x02\n\x07Service\x12\x17\n\x13SERVICE_UNSPECIFIED\x10\x00\x12\x1a\n\x0cSERVICE_IPAM\x10\x01\x1a\x08\x82\xb2\x19\x04ipam\x12\"\n\x0fSERVICE_RETHINK\x10\x02\x1a\r\x82\xb2\x19\trethinkdb\x12\x32\n\x18SERVICE_TENANT_APISERVER\x10\x03\x1a\x14\x82\xb2\x19\x10tenant-apiserver\x12\"\n\x10SERVICE_MACHINES\x10\x04\x1a\x0c\x82\xb2\x19\x08machines\x12\x1c\n\rSERVICE_AUDIT\x10\x05\x1a\t\x82\xb2\x19\x05\x61udit\x12\x18\n\x0bSERVICE_VPN\x10\x06\x1a\x07\x82\xb2\x19\x03vpn\x12\x1c\n\rSERVICE_REDIS\x10\x07\x1a\t\x82\xb2\x19\x05redis\x12\x1c\n\rSERVICE_TASKS\x10\x08\x1a\t\x82\xb2\x19\x05tasks2y\n\rHealthService\x12h\n\x03Get\x12*.metalstack.api.v2.HealthServiceGetRequest\x1a+.metalstack.api.v2.HealthServiceGetResponse\"\x08\xd8\xf3\x18\x01\xe0\xf3\x18\x02\x42\xc1\x01\n\x15\x63om.metalstack.api.v2B\x0bHealthProtoP\x01Z5github.com/metal-stack/api/go/metalstack/api/v2;apiv2\xa2\x02\x03MAX\xaa\x02\x11Metalstack.Api.V2\xca\x02\x11Metalstack\\Api\\V2\xe2\x02\x1dMetalstack\\Api\\V2\\GPBMetadata\xea\x02\x13Metalstack::Api::V2b\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -37,8 +37,8 @@
   _globals['_SERVICE'].values_by_name["SERVICE_IPAM"]._serialized_options = b'\202\262\031\004ipam'
   _globals['_SERVICE'].values_by_name["SERVICE_RETHINK"]._loaded_options = None
   _globals['_SERVICE'].values_by_name["SERVICE_RETHINK"]._serialized_options = b'\202\262\031\trethinkdb'
-  _globals['_SERVICE'].values_by_name["SERVICE_MASTERDATA"]._loaded_options = None
-  _globals['_SERVICE'].values_by_name["SERVICE_MASTERDATA"]._serialized_options = b'\202\262\031\nmasterdata'
+  _globals['_SERVICE'].values_by_name["SERVICE_TENANT_APISERVER"]._loaded_options = None
+  _globals['_SERVICE'].values_by_name["SERVICE_TENANT_APISERVER"]._serialized_options = b'\202\262\031\020tenant-apiserver'
   _globals['_SERVICE'].values_by_name["SERVICE_MACHINES"]._loaded_options = None
   _globals['_SERVICE'].values_by_name["SERVICE_MACHINES"]._serialized_options = b'\202\262\031\010machines'
   _globals['_SERVICE'].values_by_name["SERVICE_AUDIT"]._loaded_options = None
@@ -49,8 +49,6 @@
   _globals['_SERVICE'].values_by_name["SERVICE_REDIS"]._serialized_options = b'\202\262\031\005redis'
   _globals['_SERVICE'].values_by_name["SERVICE_TASKS"]._loaded_options = None
   _globals['_SERVICE'].values_by_name["SERVICE_TASKS"]._serialized_options = b'\202\262\031\005tasks'
-  _globals['_SERVICE'].values_by_name["SERVICE_TENANT_APISERVER"]._loaded_options = None
-  _globals['_SERVICE'].values_by_name["SERVICE_TENANT_APISERVER"]._serialized_options = b'\202\262\031\020tenant-apiserver'
   _globals['_HEALTHSTATUS_PARTITIONSENTRY']._loaded_options = None
   _globals['_HEALTHSTATUS_PARTITIONSENTRY']._serialized_options = b'8\001'
   _globals['_HEALTHSERVICE'].methods_by_name['Get']._loaded_options = None
@@ -58,7 +56,7 @@
   _globals['_SERVICESTATUS']._serialized_start=695
   _globals['_SERVICESTATUS']._serialized_end=829
   _globals['_SERVICE']._serialized_start=832
-  _globals['_SERVICE']._serialized_end=1174
+  _globals['_SERVICE']._serialized_end=1134
   _globals['_HEALTH']._serialized_start=85
   _globals['_HEALTH']._serialized_end=154
   _globals['_HEALTHSTATUS']._serialized_start=157
@@ -71,6 +69,6 @@
   _globals['_HEALTHSERVICEGETREQUEST']._serialized_end=613
   _globals['_HEALTHSERVICEGETRESPONSE']._serialized_start=615
   _globals['_HEALTHSERVICEGETRESPONSE']._serialized_end=692
-  _globals['_HEALTHSERVICE']._serialized_start=1176
-  _globals['_HEALTHSERVICE']._serialized_end=1297
+  _globals['_HEALTHSERVICE']._serialized_start=1136
+  _globals['_HEALTHSERVICE']._serialized_end=1257
 # @@protoc_insertion_point(module_scope)
diff --git a/python/metalstack/api/v2/health_pb2.pyi b/python/metalstack/api/v2/health_pb2.pyi
index 873b1568..6f19f9d4 100644
--- a/python/metalstack/api/v2/health_pb2.pyi
+++ b/python/metalstack/api/v2/health_pb2.pyi
@@ -20,13 +20,12 @@ class Service(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
     SERVICE_UNSPECIFIED: _ClassVar[Service]
     SERVICE_IPAM: _ClassVar[Service]
     SERVICE_RETHINK: _ClassVar[Service]
-    SERVICE_MASTERDATA: _ClassVar[Service]
+    SERVICE_TENANT_APISERVER: _ClassVar[Service]
     SERVICE_MACHINES: _ClassVar[Service]
     SERVICE_AUDIT: _ClassVar[Service]
     SERVICE_VPN: _ClassVar[Service]
     SERVICE_REDIS: _ClassVar[Service]
     SERVICE_TASKS: _ClassVar[Service]
-    SERVICE_TENANT_APISERVER: _ClassVar[Service]
 SERVICE_STATUS_UNSPECIFIED: ServiceStatus
 SERVICE_STATUS_DEGRADED: ServiceStatus
 SERVICE_STATUS_UNHEALTHY: ServiceStatus
@@ -34,13 +33,12 @@ SERVICE_STATUS_HEALTHY: ServiceStatus
 SERVICE_UNSPECIFIED: Service
 SERVICE_IPAM: Service
 SERVICE_RETHINK: Service
-SERVICE_MASTERDATA: Service
+SERVICE_TENANT_APISERVER: Service
 SERVICE_MACHINES: Service
 SERVICE_AUDIT: Service
 SERVICE_VPN: Service
 SERVICE_REDIS: Service
 SERVICE_TASKS: Service
-SERVICE_TENANT_APISERVER: Service
 
 class Health(_message.Message):
     __slots__ = ("services",)