From df7c49e9e60fe5e58976707eca508c7a9c498b73 Mon Sep 17 00:00:00 2001 From: aaksinenko Date: Thu, 7 Mar 2024 14:32:02 +0300 Subject: [PATCH 1/3] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=20?= =?UTF-8?q?seaf.ta.components.k8s=5Fpod=20=D0=B8=20seaf.ta.components.k8s?= =?UTF-8?q?=5Fcontainer=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B0=20=D0=BD=D0=BE=D0=B2=D0=B0=D1=8F=20=D1=81=D1=83=D1=89?= =?UTF-8?q?=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20seaf.ta.components.k8s=5Fstate?= =?UTF-8?q?fulset.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entities/ta/presentation/components.yaml | 60 +++++++++++++++++++ .../ta/presentation/templates/components.md | 3 + 2 files changed, 63 insertions(+) diff --git a/entities/ta/presentation/components.yaml b/entities/ta/presentation/components.yaml index ba554bf..37e28ff 100644 --- a/entities/ta/presentation/components.yaml +++ b/entities/ta/presentation/components.yaml @@ -253,6 +253,66 @@ entities: template: templates/list.md source: > ( {'title': $self.title, 'id':$params."ta-component-id", "base-name":$split($self."$base", "/")[2]};) + seaf.ta.components.k8s_statefulset: + presentations: + table: + type: table + headers: + - value: title + text: Наименование + sortable: true + align: left + width: 20% + link: link + + - value: description + text: Описание + sortable: true + align: left + width: 20% + link: link + + - value: availabilityzone_id + text: Availability Zone ID + sortable: true + align: left + width: 20% + + - value: kubernetes_id + text: Kubernetes cluster ID + sortable: true + align: left + width: 20% + + source: > + ( + [[$."seaf.ta.components.k8s_statefulset".$spread().( + $COMPONENT_ID := $keys()[0]; + $.*.{ + "title": title, + "description": description, + "kubernetes_id": kubernetes_id, + "availabilityzone_id": availabilityzone_id, + "link": '/entities/seaf.ta.components.k8s_deployment/list?ta-component-id=' & $COMPONENT_ID + } + )]^(title)] + ) + + + list: + title: Карточка спецификации + params: + type: object + properties: + seaf-ta-component-id: + title: Идентификатор спецификации k8s statefulset + type: string + required: + - ta-component-id + type: markdown + template: templates/list.md + source: > + ( {'title': $self.title, 'id':$params."ta-component-id", "base-name":$split($self."$base", "/")[2]};) seaf.ta.components.k8s_pod: presentations: table: diff --git a/entities/ta/presentation/templates/components.md b/entities/ta/presentation/templates/components.md index b35883d..fc57184 100644 --- a/entities/ta/presentation/templates/components.md +++ b/entities/ta/presentation/templates/components.md @@ -10,6 +10,9 @@ ## K8s Deployment ![K8s Deployment](@entity/seaf.ta.components.k8s_deployment/table) +## K8s StatefulSet +![K8s StatefulSet](@entity/seaf.ta.components.k8s_statefulset/table) + ## K8s POD ![POD K8s](@entity/seaf.ta.components.k8s_pod/table) From b7afc49a83689413632b291e1cf6e1b8174dd030 Mon Sep 17 00:00:00 2001 From: Konstantin Myachin Date: Tue, 12 Mar 2024 14:21:24 +0300 Subject: [PATCH 2/3] =?UTF-8?q?=D0=9C=D0=BE=D0=B4=D0=B8=D1=84=D0=B8=D1=86?= =?UTF-8?q?=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=BF=D1=80=D0=B8=D0=B7?= =?UTF-8?q?=D0=BD=D0=B0=D0=BA=20has=5Finterest=20=D1=83=20=D1=81=D1=83?= =?UTF-8?q?=D1=89=D0=BD=D0=BE=D1=81=D1=82=D0=B8=20parties=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=B8=20=D1=80=D0=B0=D1=81=D1=88=D0=B8=D1=80=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entities/ba/parties/parties.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/entities/ba/parties/parties.yaml b/entities/ba/parties/parties.yaml index 3d058ac..f9371f7 100644 --- a/entities/ba/parties/parties.yaml +++ b/entities/ba/parties/parties.yaml @@ -18,7 +18,13 @@ entities: description: Продукты, потребляемые или потенциально интересные Участнику type: array items: - $ref: "#/$rels/seaf.ba.products.product" + type: object + properties: + id: + title: Идентификатор продукта + $ref: "#/$rels/seaf.ba.products.product" + required: + - id is_part_of: title: Является частью description: Отношение n к 1 для описания строгих иерархических связей From beed7ded4cc52fc8b1c1e9fcf2aee098d0af7957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=A1=D1=8B=D1=87=D0=B5?= =?UTF-8?q?=D0=B2?= Date: Sun, 10 Mar 2024 19:12:59 +0300 Subject: [PATCH 3/3] =?UTF-8?q?=D0=B2=D0=B5=D1=80=D1=81=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0=20=D0=BE=D0=B1=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dochub.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dochub.yaml b/dochub.yaml index 5be028b..fb7f755 100644 --- a/dochub.yaml +++ b/dochub.yaml @@ -8,7 +8,7 @@ $package: # Описание description: Sber Enterprise Architect Framework # Версия - version: 1.2.4 + version: 1.2.5 # Зависимости от других пакетов dependencies: dochub: ">=3.9.0"