Skip to content

Commit

Permalink
Merge pull request #1004 from gdbranco/feat/ocm-12240
Browse files Browse the repository at this point in the history
OCM-12240 |  feat: add support for hcp shared vpc
  • Loading branch information
gdbranco authored Nov 1, 2024
2 parents 018037f + cb58d8e commit 31c9ac7
Show file tree
Hide file tree
Showing 4 changed files with 37 additions and 1 deletion.
5 changes: 4 additions & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

This document describes the relevant changes between releases of the API model.

## 0.0.400 Oct 24 2024
## 0.0.401 Oct 31 2024
- Add settings for HCP Shared VPC to `Cluster` model
- Add support for cluster arch to `DNS` model

## 0.0.400 Oct 24 2024
- Update `Parameters` attribute in addon_installation_type.model to the List of `AddonInstallationParameter` type.
- Update `Parameters` attribute in addon_type.model to the List of `AddonParameter` type.

Expand Down
6 changes: 6 additions & 0 deletions model/clusters_mgmt/v1/aws_type.model
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ struct AWS {
// Role ARN for private hosted zone.
PrivateHostedZoneRoleARN String

// ID of local private hosted zone for hypershift internal communication.
HcpInternalCommunicationHostedZoneId String

// Role ARN for VPC Endpoint Service cross account role.
VpcEndpointRoleArn String

// Additional AWS Security Groups to be added to default worker (compute) machine pool.
AdditionalComputeSecurityGroupIds []String

Expand Down
24 changes: 24 additions & 0 deletions model/clusters_mgmt/v1/cluster_arch_type.model
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
Copyright (c) 2024 Red Hat, Inc.

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.
*/

// Possible cluster architectures.
enum ClusterArchitecture {
@json(name = "classic")
Classic

@json(name = "hcp")
Hcp
}
3 changes: 3 additions & 0 deletions model/clusters_mgmt/v1/dns_domain_type.model
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,7 @@ class DNSDomain {

// Indicates if this dns domain is user defined.
UserDefined Boolean

// Signals which cluster architecture the domain is ready for.
ClusterArch ClusterArchitecture
}

0 comments on commit 31c9ac7

Please sign in to comment.