From 02fadf1ccb693a17dbfe3ab137c0ab476eb16bf1 Mon Sep 17 00:00:00 2001 From: Ciaran Roche Date: Tue, 4 Apr 2023 14:55:18 +0100 Subject: [PATCH 1/2] chore: update metamodel version --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 787803ac..64900562 100644 --- a/Makefile +++ b/Makefile @@ -15,9 +15,9 @@ # # Details of the metamodel used to check the model: -metamodel_version:=v0.0.54 +metamodel_version:=v0.0.57 metamodel_url:=https://github.com/openshift-online/ocm-api-metamodel/releases/download/$(metamodel_version)/metamodel-linux-amd64 -metamodel_sum:=76ea3d91a7d601c5e8891455c8c43a918e8dac21c9b1397f636c5b01af0afa7d +metamodel_sum:=c229bd1fbaa882de5d2ba1f435d10cb3f86d6f79a441e8accc9c90ebb5365e93 .PHONY: check check: metamodel From 105215f3363ccf2b52b9e519f362f5f73d9c2230 Mon Sep 17 00:00:00 2001 From: Ciaran Roche Date: Tue, 4 Apr 2023 14:56:21 +0100 Subject: [PATCH 2/2] fix: remove circular dependencies from clusters mgmt objects --- model/clusters_mgmt/v1/add_on_installation_type.model | 3 --- model/clusters_mgmt/v1/ingress_type.model | 3 --- model/clusters_mgmt/v1/machine_pool_type.model | 3 --- model/clusters_mgmt/v1/node_pool_type.model | 3 --- 4 files changed, 12 deletions(-) diff --git a/model/clusters_mgmt/v1/add_on_installation_type.model b/model/clusters_mgmt/v1/add_on_installation_type.model index 2e7ce5a2..09e82ba4 100644 --- a/model/clusters_mgmt/v1/add_on_installation_type.model +++ b/model/clusters_mgmt/v1/add_on_installation_type.model @@ -16,9 +16,6 @@ limitations under the License. // Representation of an add-on installation in a cluster. class AddOnInstallation { - // ID used to identify the cluster that this add-on is attached to. - link Cluster Cluster - // Link to add-on attached to this cluster. link Addon AddOn diff --git a/model/clusters_mgmt/v1/ingress_type.model b/model/clusters_mgmt/v1/ingress_type.model index f823d38b..9e2506c9 100644 --- a/model/clusters_mgmt/v1/ingress_type.model +++ b/model/clusters_mgmt/v1/ingress_type.model @@ -16,9 +16,6 @@ limitations under the License. // Representation of an ingress. class Ingress { - // ID used to identify the cluster that this ingress is attached to. - link Cluster Cluster - // Indicates if this is the default ingress. Default Boolean diff --git a/model/clusters_mgmt/v1/machine_pool_type.model b/model/clusters_mgmt/v1/machine_pool_type.model index 836684c2..97042130 100644 --- a/model/clusters_mgmt/v1/machine_pool_type.model +++ b/model/clusters_mgmt/v1/machine_pool_type.model @@ -16,9 +16,6 @@ limitations under the License. // Representation of a machine pool in a cluster. class MachinePool { - // ID used to identify the cluster that this machinepool is attached to. - link Cluster Cluster - // The number of Machines (and Nodes) to create. // Replicas and autoscaling cannot be used together. Replicas Integer diff --git a/model/clusters_mgmt/v1/node_pool_type.model b/model/clusters_mgmt/v1/node_pool_type.model index 6daba9d5..ad4f9806 100644 --- a/model/clusters_mgmt/v1/node_pool_type.model +++ b/model/clusters_mgmt/v1/node_pool_type.model @@ -16,9 +16,6 @@ limitations under the License. // Representation of a node pool in a cluster. class NodePool { - // ID used to identify the cluster that this node pool is attached to. - link Cluster Cluster - // The number of Machines (and Nodes) to create. // Replicas and autoscaling cannot be used together. Replicas Integer