Skip to content

HYPERFLEET-1202 - feat: add subnets field to ClusterPlatform model #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Jul 2, 2026
Merged

HYPERFLEET-1202 - feat: add subnets field to ClusterPlatform model #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

<!-- Links -->
[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
Expand Down
2 changes: 1 addition & 1 deletion main.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 8 additions & 0 deletions models/cluster/example_cluster.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ const exampleCluster: Cluster = #{
zone: "us-central1-a",
network: "network-123",
subnet: "subnet-123",
subnets: #[
#{ id: "subnet-01", name: "control-plane", cidr: "10.0.1.0/24", role: "control-plane" },
#{ id: "subnet-02", name: "worker-nodes", cidr: "10.0.2.0/24", role: "worker" },
],
},
},
release: #{
Expand Down Expand Up @@ -97,6 +101,10 @@ const exampleDeletedCluster: Cluster = #{
zone: "us-central1-a",
network: "network-123",
subnet: "subnet-123",
subnets: #[
#{ id: "subnet-01", name: "control-plane", cidr: "10.0.1.0/24", role: "control-plane" },
#{ id: "subnet-02", name: "worker-nodes", cidr: "10.0.2.0/24", role: "worker" },
],
},
},
release: #{
Expand Down
4 changes: 4 additions & 0 deletions models/cluster/example_post.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@ const exampleClusterCreateRequest: ClusterCreateRequest = #{
zone: "us-central1-a",
network: "network-123",
subnet: "subnet-123",
subnets: #[
#{ id: "subnet-01", name: "control-plane", cidr: "10.0.1.0/24", role: "control-plane" },
#{ id: "subnet-02", name: "worker-nodes", cidr: "10.0.2.0/24", role: "worker" },
],
},
},
release: #{
Expand Down
8 changes: 8 additions & 0 deletions models/cluster/model.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,20 @@ model ClusterPlatformSpec {
template: ClusterPlatform;
}

model SubnetSpec {
id: string;
name: string;
cidr: string;
role: string;
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

model ClusterPlatform {
projectID?: string;
region?: string;
zone?: string;
network?: string;
subnet?: string;
subnets?: SubnetSpec[];
}

model ReleaseSpec {
Expand Down
49 changes: 48 additions & 1 deletion schemas/template/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -685,6 +685,15 @@ paths:
zone: us-central1-a
network: network-123
subnet: subnet-123
subnets:
- id: subnet-01
name: control-plane
cidr: 10.0.1.0/24
role: control-plane
- id: subnet-02
name: worker-nodes
cidr: 10.0.2.0/24
role: worker
release:
image: registry.redhat.io/openshift4/ose-cluster-version-operator:v4.14.0
version: 4.14.0
Expand Down Expand Up @@ -1701,6 +1710,15 @@ components:
zone: us-central1-a
network: network-123
subnet: subnet-123
subnets:
- id: subnet-01
name: control-plane
cidr: 10.0.1.0/24
role: control-plane
- id: subnet-02
name: worker-nodes
cidr: 10.0.2.0/24
role: worker
release:
image: registry.redhat.io/openshift4/ose-cluster-version-operator:v4.14.0
version: 4.14.0
Expand Down Expand Up @@ -1795,6 +1813,15 @@ components:
zone: us-central1-a
network: network-123
subnet: subnet-123
subnets:
- id: subnet-01
name: control-plane
cidr: 10.0.1.0/24
role: control-plane
- id: subnet-02
name: worker-nodes
cidr: 10.0.2.0/24
role: worker
release:
image: registry.redhat.io/openshift4/ose-cluster-version-operator:v4.14.0
version: 4.14.0
Expand Down Expand Up @@ -1881,6 +1908,10 @@ components:
type: string
subnet:
type: string
subnets:
type: array
items:
$ref: '#/components/schemas/SubnetSpec'
ClusterPlatformSpec:
type: object
required:
Expand Down Expand Up @@ -2523,6 +2554,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:
Expand Down
49 changes: 48 additions & 1 deletion schemas/template/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -621,6 +621,15 @@ paths:
projectID: project-123
region: us-central1
subnet: subnet-123
subnets:
- cidr: 10.0.1.0/24
id: subnet-01
name: control-plane
role: control-plane
- cidr: 10.0.2.0/24
id: subnet-02
name: worker-nodes
role: worker
zone: us-central1-a
type: template
release:
Expand Down Expand Up @@ -1664,6 +1673,15 @@ definitions:
projectID: project-123
region: us-central1
subnet: subnet-123
subnets:
- cidr: 10.0.1.0/24
id: subnet-01
name: control-plane
role: control-plane
- cidr: 10.0.2.0/24
id: subnet-02
name: worker-nodes
role: worker
zone: us-central1-a
type: template
release:
Expand Down Expand Up @@ -1797,6 +1815,15 @@ definitions:
projectID: project-123
region: us-central1
subnet: subnet-123
subnets:
- cidr: 10.0.1.0/24
id: subnet-01
name: control-plane
role: control-plane
- cidr: 10.0.2.0/24
id: subnet-02
name: worker-nodes
role: worker
zone: us-central1-a
type: template
release:
Expand Down Expand Up @@ -1902,6 +1929,10 @@ definitions:
type: string
subnet:
type: string
subnets:
items:
$ref: '#/definitions/SubnetSpec'
type: array
zone:
type: string
type: object
Expand Down Expand Up @@ -2590,6 +2621,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:
Expand Down