From 978d4a64e13e26126cd7039711b9462d2ee3fee0 Mon Sep 17 00:00:00 2001 From: Rafael Benevides Date: Thu, 2 Jul 2026 13:28:21 -0300 Subject: [PATCH 1/2] HYPERFLEET-1202 - feat: add subnets field to ClusterPlatform model Add SubnetSpec model and optional subnets array to ClusterPlatform to support subnet configuration in cluster platform spec. Required by E2E tests that validate Maestro Go template rendering of subnet data in ManifestWork ConfigMaps. --- CHANGELOG.md | 9 ++++++++- main.tsp | 2 +- models/cluster/model.tsp | 8 ++++++++ schemas/template/openapi.yaml | 22 +++++++++++++++++++++- schemas/template/swagger.yaml | 22 +++++++++++++++++++++- 5 files changed, 59 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a734da9..2c344e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.0.27] - 2026-07-02 + +### Added + +- `SubnetSpec` model and `subnets` optional field to `ClusterPlatform` (HYPERFLEET-1202) + ## [1.0.24] - 2026-06-22 ### Fixed @@ -91,7 +97,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `hyperfleet` npm dependency for importing shared models and services from the core repository -[Unreleased]: https://github.com/openshift-hyperfleet/hyperfleet-api-spec-template/compare/v1.0.24...HEAD +[Unreleased]: https://github.com/openshift-hyperfleet/hyperfleet-api-spec-template/compare/v1.0.27...HEAD +[1.0.27]: https://github.com/openshift-hyperfleet/hyperfleet-api-spec-template/compare/v1.0.24...v1.0.27 [1.0.24]: https://github.com/openshift-hyperfleet/hyperfleet-api-spec-template/compare/v1.0.23...v1.0.24 [1.0.23]: https://github.com/openshift-hyperfleet/hyperfleet-api-spec-template/compare/v1.0.22...v1.0.23 [1.0.22]: https://github.com/openshift-hyperfleet/hyperfleet-api-spec-template/compare/v1.0.21...v1.0.22 diff --git a/main.tsp b/main.tsp index 151ab70..b27feae 100644 --- a/main.tsp +++ b/main.tsp @@ -33,7 +33,7 @@ using OpenAPI; */ @service(#{ title: "HyperFleet API" }) @info(#{ - version: "1.0.26", + version: "1.0.27", contact: #{ name: "HyperFleet Team", url: "https://github.com/openshift-hyperfleet", diff --git a/models/cluster/model.tsp b/models/cluster/model.tsp index 3c2d038..5810c62 100644 --- a/models/cluster/model.tsp +++ b/models/cluster/model.tsp @@ -11,12 +11,20 @@ model ClusterPlatformSpec { template: ClusterPlatform; } +model SubnetSpec { + id: string; + name: string; + cidr: string; + role: string; +} + model ClusterPlatform { projectID?: string; region?: string; zone?: string; network?: string; subnet?: string; + subnets?: SubnetSpec[]; } model ReleaseSpec { diff --git a/schemas/template/openapi.yaml b/schemas/template/openapi.yaml index 46cb155..8d20f04 100644 --- a/schemas/template/openapi.yaml +++ b/schemas/template/openapi.yaml @@ -1,7 +1,7 @@ openapi: 3.0.0 info: title: HyperFleet API - version: 1.0.26 + version: 1.0.27 contact: name: HyperFleet Team url: https://github.com/openshift-hyperfleet @@ -1881,6 +1881,10 @@ components: type: string subnet: type: string + subnets: + type: array + items: + $ref: '#/components/schemas/SubnetSpec' ClusterPlatformSpec: type: object required: @@ -2523,6 +2527,22 @@ components: description: |- Aggregated status of the resource, populated by the status aggregation pipeline from adapter condition reports. + SubnetSpec: + type: object + required: + - id + - name + - cidr + - role + properties: + id: + type: string + name: + type: string + cidr: + type: string + role: + type: string TaintSpec: type: object required: diff --git a/schemas/template/swagger.yaml b/schemas/template/swagger.yaml index 3feebdf..0a5ebdf 100644 --- a/schemas/template/swagger.yaml +++ b/schemas/template/swagger.yaml @@ -17,7 +17,7 @@ info: name: Apache 2.0 url: 'https://www.apache.org/licenses/LICENSE-2.0' title: HyperFleet API - version: 1.0.26 + version: 1.0.27 host: hyperfleet.redhat.com basePath: / schemes: @@ -1902,6 +1902,10 @@ definitions: type: string subnet: type: string + subnets: + items: + $ref: '#/definitions/SubnetSpec' + type: array zone: type: string type: object @@ -2590,6 +2594,22 @@ definitions: required: - conditions type: object + SubnetSpec: + properties: + cidr: + type: string + id: + type: string + name: + type: string + role: + type: string + required: + - id + - name + - cidr + - role + type: object TaintSpec: properties: effect: From 27e39d7efc4e75d389080fb85b1d3c4fbe643e4e Mon Sep 17 00:00:00 2001 From: Rafael Benevides Date: Thu, 2 Jul 2026 14:25:32 -0300 Subject: [PATCH 2/2] HYPERFLEET-1317 - chore: add Ruclo to OWNERS --- OWNERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OWNERS b/OWNERS index 6f21108..afaffae 100644 --- a/OWNERS +++ b/OWNERS @@ -8,6 +8,7 @@ approvers: - pnguyen44 - rafabene - rh-amarin +- Ruclo - tirthct - vkareh - kuudori @@ -26,6 +27,7 @@ reviewers: - pnguyen44 - rafabene - rh-amarin +- Ruclo - tirthct - vkareh - kuudori