diff --git a/site/services/stand1/109_zones_v2.yaml b/site/services/dev/109_zones_v2.yaml similarity index 100% rename from site/services/stand1/109_zones_v2.yaml rename to site/services/dev/109_zones_v2.yaml diff --git a/site/services/stand1/111_dnsrecord.yaml b/site/services/dev/111_dnsrecord.yaml similarity index 100% rename from site/services/stand1/111_dnsrecord.yaml rename to site/services/dev/111_dnsrecord.yaml diff --git a/site/services/stand1/115_mariadb.yaml b/site/services/dev/115_mariadb.yaml similarity index 100% rename from site/services/stand1/115_mariadb.yaml rename to site/services/dev/115_mariadb.yaml diff --git a/site/services/stand1/116_kafka.yaml b/site/services/dev/116_kafka.yaml similarity index 100% rename from site/services/stand1/116_kafka.yaml rename to site/services/dev/116_kafka.yaml diff --git a/site/services/stand1/119_akhq.yaml b/site/services/dev/119_akhq.yaml similarity index 100% rename from site/services/stand1/119_akhq.yaml rename to site/services/dev/119_akhq.yaml diff --git a/site/services/stand1/120_clickhouse.yaml b/site/services/dev/120_clickhouse.yaml similarity index 100% rename from site/services/stand1/120_clickhouse.yaml rename to site/services/dev/120_clickhouse.yaml diff --git a/site/services/stand1/12_s3.yaml b/site/services/dev/12_s3.yaml similarity index 100% rename from site/services/stand1/12_s3.yaml rename to site/services/dev/12_s3.yaml diff --git a/site/services/stand1/13_s3bucket.yaml b/site/services/dev/13_s3bucket.yaml similarity index 100% rename from site/services/stand1/13_s3bucket.yaml rename to site/services/dev/13_s3bucket.yaml diff --git a/site/services/stand1/148_vc_mgmt_sthutrval_cluster.yaml b/site/services/dev/148_vc_mgmt_sthutrval_cluster.yaml similarity index 100% rename from site/services/stand1/148_vc_mgmt_sthutrval_cluster.yaml rename to site/services/dev/148_vc_mgmt_sthutrval_cluster.yaml diff --git a/site/services/stand1/149_valo_tenant.yaml b/site/services/dev/149_valo_tenant.yaml similarity index 100% rename from site/services/stand1/149_valo_tenant.yaml rename to site/services/dev/149_valo_tenant.yaml diff --git a/site/services/stand1/150_k8s_sthutrval_cluster.yaml b/site/services/dev/150_k8s_sthutrval_cluster.yaml similarity index 100% rename from site/services/stand1/150_k8s_sthutrval_cluster.yaml rename to site/services/dev/150_k8s_sthutrval_cluster.yaml diff --git a/site/services/stand1/151_k8s_openbao.yaml b/site/services/dev/151_k8s_openbao.yaml similarity index 100% rename from site/services/stand1/151_k8s_openbao.yaml rename to site/services/dev/151_k8s_openbao.yaml diff --git a/site/services/stand1/163_llm_ai.yaml b/site/services/dev/163_llm_ai.yaml similarity index 100% rename from site/services/stand1/163_llm_ai.yaml rename to site/services/dev/163_llm_ai.yaml diff --git a/site/services/stand1/19_vc_org.yaml b/site/services/dev/19_vc_org.yaml similarity index 100% rename from site/services/stand1/19_vc_org.yaml rename to site/services/dev/19_vc_org.yaml diff --git a/site/services/stand1/1_dummy.yaml b/site/services/dev/1_dummy.yaml similarity index 100% rename from site/services/stand1/1_dummy.yaml rename to site/services/dev/1_dummy.yaml diff --git a/site/services/stand1/21_vc_vdc.yaml b/site/services/dev/21_vc_vdc.yaml similarity index 100% rename from site/services/stand1/21_vc_vdc.yaml rename to site/services/dev/21_vc_vdc.yaml diff --git a/site/services/stand1/22_vc_nsxt.yaml b/site/services/dev/22_vc_nsxt.yaml similarity index 100% rename from site/services/stand1/22_vc_nsxt.yaml rename to site/services/dev/22_vc_nsxt.yaml diff --git a/site/services/stand1/25_vcexternalip.yaml b/site/services/dev/25_vcexternalip.yaml similarity index 100% rename from site/services/stand1/25_vcexternalip.yaml rename to site/services/dev/25_vcexternalip.yaml diff --git a/site/services/stand1/26_vapp.yaml b/site/services/dev/26_vapp.yaml similarity index 100% rename from site/services/stand1/26_vapp.yaml rename to site/services/dev/26_vapp.yaml diff --git a/site/services/stand1/27_vc_vm_v2.yaml b/site/services/dev/27_vc_vm_v2.yaml similarity index 100% rename from site/services/stand1/27_vc_vm_v2.yaml rename to site/services/dev/27_vc_vm_v2.yaml diff --git a/site/services/stand1/28_vc_vm_v3.yaml b/site/services/dev/28_vc_vm_v3.yaml similarity index 100% rename from site/services/stand1/28_vc_vm_v3.yaml rename to site/services/dev/28_vc_vm_v3.yaml diff --git a/site/services/stand1/29_vc_vdc_group.yaml b/site/services/dev/29_vc_vdc_group.yaml similarity index 100% rename from site/services/stand1/29_vc_vdc_group.yaml rename to site/services/dev/29_vc_vdc_group.yaml diff --git a/site/services/stand1/2_template.yaml b/site/services/dev/2_template.yaml similarity index 100% rename from site/services/stand1/2_template.yaml rename to site/services/dev/2_template.yaml diff --git a/site/services/stand1/50_nextcloud.yaml b/site/services/dev/50_nextcloud.yaml similarity index 100% rename from site/services/stand1/50_nextcloud.yaml rename to site/services/dev/50_nextcloud.yaml diff --git a/site/services/stand1/81_superset.yaml b/site/services/dev/81_superset.yaml similarity index 100% rename from site/services/stand1/81_superset.yaml rename to site/services/dev/81_superset.yaml diff --git a/site/services/stand1/82_harbor.yaml b/site/services/dev/82_harbor.yaml similarity index 100% rename from site/services/stand1/82_harbor.yaml rename to site/services/dev/82_harbor.yaml diff --git a/site/services/stand1/86_k8s_velero.yaml b/site/services/dev/86_k8s_velero.yaml similarity index 100% rename from site/services/stand1/86_k8s_velero.yaml rename to site/services/dev/86_k8s_velero.yaml diff --git a/site/services/stand1/89_flask.yaml b/site/services/dev/89_flask.yaml similarity index 100% rename from site/services/stand1/89_flask.yaml rename to site/services/dev/89_flask.yaml diff --git a/site/services/stand1/90_postgres.yaml b/site/services/dev/90_postgres.yaml similarity index 100% rename from site/services/stand1/90_postgres.yaml rename to site/services/dev/90_postgres.yaml diff --git a/site/services/stand1/91_redis.yaml b/site/services/dev/91_redis.yaml similarity index 100% rename from site/services/stand1/91_redis.yaml rename to site/services/dev/91_redis.yaml diff --git a/site/services/stand1/92_mongodb.yaml b/site/services/dev/92_mongodb.yaml similarity index 100% rename from site/services/stand1/92_mongodb.yaml rename to site/services/dev/92_mongodb.yaml diff --git a/site/services/stand1/93_rabbitmq.yaml b/site/services/dev/93_rabbitmq.yaml similarity index 100% rename from site/services/stand1/93_rabbitmq.yaml rename to site/services/dev/93_rabbitmq.yaml diff --git a/site/services/stand1/94_lucee.yaml b/site/services/dev/94_lucee.yaml similarity index 100% rename from site/services/stand1/94_lucee.yaml rename to site/services/dev/94_lucee.yaml diff --git a/site/services/stand1/95_nodejs.yaml b/site/services/dev/95_nodejs.yaml similarity index 100% rename from site/services/stand1/95_nodejs.yaml rename to site/services/dev/95_nodejs.yaml diff --git a/site/services/stand1/96_pgadmin.yaml b/site/services/dev/96_pgadmin.yaml similarity index 100% rename from site/services/stand1/96_pgadmin.yaml rename to site/services/dev/96_pgadmin.yaml diff --git a/site/services/stand1/98_http.yaml b/site/services/dev/98_http.yaml similarity index 100% rename from site/services/stand1/98_http.yaml rename to site/services/dev/98_http.yaml diff --git a/site/services/stand1/99_gitea.yaml b/site/services/dev/99_gitea.yaml similarity index 100% rename from site/services/stand1/99_gitea.yaml rename to site/services/dev/99_gitea.yaml diff --git a/site/services/stand3/109_zones_v2.yaml b/site/services/prod/109_zones_v2.yaml similarity index 94% rename from site/services/stand3/109_zones_v2.yaml rename to site/services/prod/109_zones_v2.yaml index 26c6972..27b061a 100644 --- a/site/services/stand3/109_zones_v2.yaml +++ b/site/services/prod/109_zones_v2.yaml @@ -127,16 +127,10 @@ cfsParams: - SSHFP - svcOperationCfsParamId: 780 svcOperationCfsParam: recordInput - dataType: array-map-fixed + dataType: string isRequired: true - defaultValue: '[{}]' + defaultValue: '' isModifiable: false - dataDescriptor: - record: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false - svcOperationCfsParamId: 781 svcOperationCfsParam: recordName dataType: string @@ -150,16 +144,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - recordName: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false - recordTTL: - dataType: integer > 0 - defaultValue: '3600' - isRequired: true - isModifiable: false recordType: dataType: string defaultValue: A @@ -181,6 +165,16 @@ cfsParams: defaultValue: '' isRequired: true isModifiable: false + recordName: + dataType: string + defaultValue: '' + isRequired: true + isModifiable: false + recordTTL: + dataType: integer > 0 + defaultValue: '3600' + isRequired: true + isModifiable: false - svcOperationCfsParamId: 783 svcOperationCfsParam: recordName dataType: string @@ -211,16 +205,10 @@ cfsParams: - SSHFP - svcOperationCfsParamId: 786 svcOperationCfsParam: recordInput - dataType: array-map-fixed + dataType: string isRequired: true - defaultValue: '[{}]' + defaultValue: '' isModifiable: true - dataDescriptor: - record: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false cfsParamsByOp: 254: - 761 diff --git a/site/services/stand2/111_dnsrecord.yaml b/site/services/prod/111_dnsrecord.yaml similarity index 100% rename from site/services/stand2/111_dnsrecord.yaml rename to site/services/prod/111_dnsrecord.yaml diff --git a/site/services/stand3/115_mariadb.yaml b/site/services/prod/115_mariadb.yaml similarity index 96% rename from site/services/stand3/115_mariadb.yaml rename to site/services/prod/115_mariadb.yaml index 18f23c8..16509f2 100644 --- a/site/services/stand3/115_mariadb.yaml +++ b/site/services/prod/115_mariadb.yaml @@ -60,12 +60,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 878 svcOperationCfsParam: clusterConfiguration dataType: map-fixed @@ -156,14 +155,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - enabled: - dataType: boolean - defaultValue: 'false' - isRequired: true - isModifiable: false - valueList: - - 'false' - - 'true' schedule: dataType: integer >= 0 defaultValue: '0' @@ -188,23 +179,31 @@ cfsParams: - '10' - '15' - '20' + enabled: + dataType: boolean + defaultValue: 'false' + isRequired: true + isModifiable: false + valueList: + - 'false' + - 'true' - svcOperationCfsParamId: 734 svcOperationCfsParam: dbName dataType: string isRequired: true - defaultValue: db-ebbjso21 + defaultValue: db-utkbjfp1 isModifiable: false - svcOperationCfsParamId: 735 svcOperationCfsParam: username dataType: string isRequired: true - defaultValue: user3vanbmfy + defaultValue: user4qtyx9eo isModifiable: false - svcOperationCfsParamId: 736 svcOperationCfsParam: password dataType: string isRequired: true - defaultValue: p4egnsar + defaultValue: j84crbfp isModifiable: false - svcOperationCfsParamId: 737 svcOperationCfsParam: dbName @@ -313,11 +312,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - schedule: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false s3Uid: dataType: uuid defaultValue: '' @@ -328,6 +322,11 @@ cfsParams: defaultValue: '' isRequired: true isModifiable: false + schedule: + dataType: string + defaultValue: '' + isRequired: true + isModifiable: false - svcOperationCfsParamId: 887 svcOperationCfsParam: autoscaleConfiguration dataType: map-fixed @@ -335,15 +334,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - percent: - dataType: integer > 0 - defaultValue: '' - isRequired: true - isModifiable: false - valueList: - - '10' - - '15' - - '20' enabled: dataType: boolean defaultValue: '' @@ -367,6 +357,15 @@ cfsParams: defaultValue: '' isRequired: true isModifiable: false + percent: + dataType: integer > 0 + defaultValue: '' + isRequired: true + isModifiable: false + valueList: + - '10' + - '15' + - '20' cfsParamsByOp: 138: - 877 @@ -398,9 +397,9 @@ cfsParamsByOp: 141: [] 140: [] stateParams: - startupConfiguration: '{"resourceRealm": ""}' + startupConfiguration: '{"resourceRealm": "k8s-4-ext-nubes-ru"}' clusterConfiguration: '{"cpu": 500, "memory": 512, "replicas": 1, "disk": 10}' accessConfiguration: '{"masterAccessList": "[]", "masterIpSpace": ""}' mariadbConfiguration: '{"version": "9.4.0"}' backupConfiguration: '{"s3Uid": "", "retain": 720, "schedule": "0 0 * * *"}' - autoscaleConfiguration: '{"enabled": false, "schedule": 0, "quota": 100, "percent": 10}' + autoscaleConfiguration: '{"schedule": 0, "quota": 100, "percent": 10, "enabled": false}' diff --git a/site/services/stand3/116_kafka.yaml b/site/services/prod/116_kafka.yaml similarity index 98% rename from site/services/stand3/116_kafka.yaml rename to site/services/prod/116_kafka.yaml index e6a93cb..b9fe91b 100644 --- a/site/services/stand3/116_kafka.yaml +++ b/site/services/prod/116_kafka.yaml @@ -78,12 +78,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 1085 svcOperationCfsParam: clusterConfiguration dataType: map-fixed @@ -210,17 +209,17 @@ cfsParams: dataDescriptor: cpu: dataType: integer > 0 - defaultValue: '2000' + defaultValue: '' isRequired: true isModifiable: false memory: dataType: integer > 0 - defaultValue: '2048' + defaultValue: '' isRequired: true isModifiable: false replicas: dataType: integer > 0 - defaultValue: '1' + defaultValue: '' isRequired: true isModifiable: false valueList: @@ -230,7 +229,7 @@ cfsParams: - '7' disk: dataType: integer > 0 - defaultValue: '1' + defaultValue: '' isRequired: true isModifiable: false - svcOperationCfsParamId: 1088 @@ -342,6 +341,6 @@ cfsParamsByOp: 161: [] 160: [] stateParams: - startupConfiguration: '{"resourceRealm": ""}' + startupConfiguration: '{"resourceRealm": "k8s-4-ext-nubes-ru"}' clusterConfiguration: '{"cpu": 2000, "memory": 2048, "replicas": 0, "disk": 1}' accessConfiguration: '{"allocationExternal": false, "masterAccessList": "[]"}' diff --git a/site/services/stand3/119_akhq.yaml b/site/services/prod/119_akhq.yaml similarity index 98% rename from site/services/stand3/119_akhq.yaml rename to site/services/prod/119_akhq.yaml index 129e0c3..3202b95 100644 --- a/site/services/stand3/119_akhq.yaml +++ b/site/services/prod/119_akhq.yaml @@ -44,11 +44,10 @@ cfsParams: svcOperationCfsParam: resourceRealm dataType: string isRequired: true - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 551 svcOperationCfsParam: resourceMemory dataType: integer > 0 @@ -99,7 +98,7 @@ cfsParamsByOp: 178: [] 177: [] stateParams: - resourceRealm: '' + resourceRealm: k8s-4-ext-nubes-ru resourceMemory: '512' resourceCPU: '500' domain: '' diff --git a/site/services/stand3/120_clickhouse.yaml b/site/services/prod/120_clickhouse.yaml similarity index 97% rename from site/services/stand3/120_clickhouse.yaml rename to site/services/prod/120_clickhouse.yaml index a85941b..e55fd4e 100644 --- a/site/services/stand3/120_clickhouse.yaml +++ b/site/services/prod/120_clickhouse.yaml @@ -81,12 +81,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 838 svcOperationCfsParam: clusterConfiguration dataType: map-fixed @@ -94,6 +93,20 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: + shards: + dataType: integer > 0 + defaultValue: '1' + isRequired: true + isModifiable: false + valueList: + - '1' + - '2' + - '3' + disk: + dataType: integer > 0 + defaultValue: '10' + isRequired: true + isModifiable: false cpu: dataType: integer > 0 defaultValue: '1000' @@ -114,20 +127,6 @@ cfsParams: - '3' - '5' - '7' - shards: - dataType: integer > 0 - defaultValue: '1' - isRequired: true - isModifiable: false - valueList: - - '1' - - '2' - - '3' - disk: - dataType: integer > 0 - defaultValue: '10' - isRequired: true - isModifiable: false - svcOperationCfsParamId: 839 svcOperationCfsParam: accessConfiguration dataType: map-fixed @@ -135,16 +134,16 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - masterIpSpace: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false masterAccessList: dataType: json defaultValue: '[]' isRequired: true isModifiable: false + masterIpSpace: + dataType: string + defaultValue: '' + isRequired: true + isModifiable: false - svcOperationCfsParamId: 840 svcOperationCfsParam: clickhouseKeeperConfiguration dataType: map-fixed @@ -192,11 +191,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - schedule: - dataType: string - defaultValue: 0 0 * * * - isRequired: true - isModifiable: false s3Uid: dataType: uuid defaultValue: '' @@ -207,6 +201,11 @@ cfsParams: defaultValue: '7' isRequired: true isModifiable: false + schedule: + dataType: string + defaultValue: 0 0 * * * + isRequired: true + isModifiable: false - svcOperationCfsParamId: 843 svcOperationCfsParam: autoscaleConfiguration dataType: map-fixed @@ -214,16 +213,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - schedule: - dataType: integer >= 0 - defaultValue: '0' - isRequired: true - isModifiable: false - valueList: - - '0' - - '5' - - '12' - - '23' quota: dataType: integer > 0 defaultValue: '100' @@ -246,6 +235,16 @@ cfsParams: valueList: - 'false' - 'true' + schedule: + dataType: integer >= 0 + defaultValue: '0' + isRequired: true + isModifiable: false + valueList: + - '0' + - '5' + - '12' + - '23' - svcOperationCfsParamId: 851 svcOperationCfsParam: clickhouseFilesConfiguration dataType: array-map-fixed @@ -312,6 +311,16 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: + replicas: + dataType: integer > 0 + defaultValue: '' + isRequired: true + isModifiable: false + valueList: + - '1' + - '3' + - '5' + - '7' shards: dataType: integer > 0 defaultValue: '' @@ -336,16 +345,6 @@ cfsParams: defaultValue: '' isRequired: true isModifiable: false - replicas: - dataType: integer > 0 - defaultValue: '' - isRequired: true - isModifiable: false - valueList: - - '1' - - '3' - - '5' - - '7' - svcOperationCfsParamId: 845 svcOperationCfsParam: clickhouseKeeperConfiguration dataType: map-fixed @@ -353,15 +352,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - replicas: - dataType: integer >= 0 - defaultValue: '' - isRequired: true - isModifiable: false - valueList: - - '0' - - '1' - - '3' cpu: dataType: integer > 0 defaultValue: '' @@ -372,6 +362,15 @@ cfsParams: defaultValue: '' isRequired: true isModifiable: false + replicas: + dataType: integer >= 0 + defaultValue: '' + isRequired: true + isModifiable: false + valueList: + - '0' + - '1' + - '3' - svcOperationCfsParamId: 846 svcOperationCfsParam: accessConfiguration dataType: map-fixed @@ -432,6 +431,15 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: + percent: + dataType: integer > 0 + defaultValue: '' + isRequired: true + isModifiable: false + valueList: + - '10' + - '15' + - '20' enabled: dataType: boolean defaultValue: false,true @@ -452,15 +460,6 @@ cfsParams: defaultValue: '' isRequired: true isModifiable: false - percent: - dataType: integer > 0 - defaultValue: '' - isRequired: true - isModifiable: false - valueList: - - '10' - - '15' - - '20' - svcOperationCfsParamId: 850 svcOperationCfsParam: clickhouseFilesConfiguration dataType: array-map-fixed @@ -511,11 +510,11 @@ cfsParamsByOp: 183: [] 182: [] stateParams: - startupConfiguration: '{"resourceRealm": ""}' - clusterConfiguration: '{"cpu": 1000, "memory": 2048, "replicas": 1, "shards": 1, "disk": 10}' - accessConfiguration: '{"masterIpSpace": "", "masterAccessList": "[]"}' + startupConfiguration: '{"resourceRealm": "k8s-4-ext-nubes-ru"}' + clusterConfiguration: '{"shards": 1, "disk": 10, "cpu": 1000, "memory": 2048, "replicas": 1}' + accessConfiguration: '{"masterAccessList": "[]", "masterIpSpace": ""}' clickhouseKeeperConfiguration: '{"cpu": 500, "memory": 512, "replicas": 0}' clickhouseConfiguration: '{"version": "25.10"}' - backupConfiguration: '{"schedule": "0 0 * * *", "s3Uid": "", "retain": 7}' - autoscaleConfiguration: '{"schedule": 0, "quota": 100, "percent": 10, "enabled": false}' + backupConfiguration: '{"s3Uid": "", "retain": 7, "schedule": "0 0 * * *"}' + autoscaleConfiguration: '{"quota": 100, "percent": 10, "enabled": false, "schedule": 0}' clickhouseFilesConfiguration: '{"path": "something.xml", "xmlConfig": ""}' diff --git a/site/services/stand3/12_s3.yaml b/site/services/prod/12_s3.yaml similarity index 96% rename from site/services/stand3/12_s3.yaml rename to site/services/prod/12_s3.yaml index f6ecdbd..24de4b8 100644 --- a/site/services/stand3/12_s3.yaml +++ b/site/services/prod/12_s3.yaml @@ -46,10 +46,10 @@ cfsParams: svcOperationCfsParam: resourceRealm dataType: string isRequired: true - defaultValue: ceph.tst.nubes.ru + defaultValue: s3.msk-1.ngcloud.ru isModifiable: false valueList: - - ceph.tst.nubes.ru + - s3.msk-1.ngcloud.ru - svcOperationCfsParamId: 320 svcOperationCfsParam: displayName dataType: string @@ -115,5 +115,5 @@ cfsParamsByOp: 3: [] 2: [] stateParams: - resourceRealm: ceph.tst.nubes.ru + resourceRealm: s3.msk-1.ngcloud.ru displayName: '' diff --git a/site/services/stand2/13_s3bucket.yaml b/site/services/prod/13_s3bucket.yaml similarity index 100% rename from site/services/stand2/13_s3bucket.yaml rename to site/services/prod/13_s3bucket.yaml diff --git a/site/services/stand3/148_vc_mgmt_sthutrval_cluster.yaml b/site/services/prod/148_vc_mgmt_sthutrval_cluster.yaml similarity index 86% rename from site/services/stand3/148_vc_mgmt_sthutrval_cluster.yaml rename to site/services/prod/148_vc_mgmt_sthutrval_cluster.yaml index e583079..62d0228 100644 --- a/site/services/stand3/148_vc_mgmt_sthutrval_cluster.yaml +++ b/site/services/prod/148_vc_mgmt_sthutrval_cluster.yaml @@ -21,14 +21,14 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: sandbox.nubes.ru + defaultValue: ngcloud.ru isRequired: true isModifiable: false valueList: - - sandbox.nubes.ru + - ngcloud.ru clusterName: dataType: string - defaultValue: example-brcyqrjr + defaultValue: example-cgvxzckk isRequired: true isModifiable: false - svcOperationCfsParamId: 772 @@ -54,6 +54,15 @@ cfsParams: defaultValue: '' isModifiable: false dataDescriptor: + count: + dataType: integer > 0 + defaultValue: '1' + isRequired: true + isModifiable: false + valueList: + - '1' + - '3' + - '5' sizingPolicy: dataType: string defaultValue: '' @@ -66,15 +75,6 @@ cfsParams: defaultValue: '50' isRequired: true isModifiable: false - count: - dataType: integer > 0 - defaultValue: '1' - isRequired: true - isModifiable: false - valueList: - - '1' - - '3' - - '5' - svcOperationCfsParamId: 774 svcOperationCfsParam: workerConfiguration dataType: array-map-fixed @@ -94,7 +94,7 @@ cfsParams: isModifiable: false groupName: dataType: string - defaultValue: workers-jax0kk2f + defaultValue: workers-wqtdfsen isRequired: true isModifiable: false sizingPolicy: @@ -111,6 +111,11 @@ cfsParams: defaultValue: '' isModifiable: false dataDescriptor: + accessIpListIngress: + dataType: json + defaultValue: '[]' + isRequired: true + isModifiable: false needExternalAddressAPI: dataType: boolean defaultValue: 'true' @@ -130,11 +135,6 @@ cfsParams: isModifiable: false valueList: - 'true' - accessIpListIngress: - dataType: json - defaultValue: '[]' - isRequired: true - isModifiable: false cfsParamsByOp: 258: - 771 @@ -143,8 +143,8 @@ cfsParamsByOp: - 774 - 775 stateParams: - startupConfiguration: '{"resourceRealm": "sandbox.nubes.ru", "clusterName": "example-brcyqrjr"}' + startupConfiguration: '{"resourceRealm": "ngcloud.ru", "clusterName": "example-cgvxzckk"}' clusterConfiguration: '{"appVersion": "2.13.1"}' - controlPlaneConfiguration: '{"sizingPolicy": "", "sizingDisk": 50, "count": 1}' - workerConfiguration: '{"sizingDisk": 50, "count": 2, "groupName": "workers-jax0kk2f", "sizingPolicy": ""}' - accessConfiguration: '{"needExternalAddressAPI": true, "accessIpListAPI": "[]", "needExternalAddressIngress": true, "accessIpListIngress": "[]"}' + controlPlaneConfiguration: '{"count": 1, "sizingPolicy": "", "sizingDisk": 50}' + workerConfiguration: '{"sizingDisk": 50, "count": 2, "groupName": "workers-wqtdfsen", "sizingPolicy": ""}' + accessConfiguration: '{"accessIpListIngress": "[]", "needExternalAddressAPI": true, "accessIpListAPI": "[]", "needExternalAddressIngress": true}' diff --git a/site/services/stand3/149_valo_tenant.yaml b/site/services/prod/149_valo_tenant.yaml similarity index 97% rename from site/services/stand3/149_valo_tenant.yaml rename to site/services/prod/149_valo_tenant.yaml index b23a975..07be7b9 100644 --- a/site/services/stand3/149_valo_tenant.yaml +++ b/site/services/prod/149_valo_tenant.yaml @@ -62,35 +62,6 @@ cfsParams: defaultValue: '{}' isModifiable: true dataDescriptor: - ffThemes: - dataType: boolean - defaultValue: 'true' - isRequired: true - isModifiable: false - valueList: - - 'false' - - 'true' - ffPublicLink: - dataType: boolean - defaultValue: 'true' - isRequired: true - isModifiable: false - valueList: - - 'false' - - 'true' - ffLogging: - dataType: boolean - defaultValue: 'true' - isRequired: true - isModifiable: false - valueList: - - 'false' - - 'true' - userCount: - dataType: integer > 0 - defaultValue: '10' - isRequired: true - isModifiable: false requestApproveMaxPeriod: dataType: integer > 0 defaultValue: '2' @@ -120,6 +91,35 @@ cfsParams: valueList: - 'false' - 'true' + ffThemes: + dataType: boolean + defaultValue: 'true' + isRequired: true + isModifiable: false + valueList: + - 'false' + - 'true' + ffPublicLink: + dataType: boolean + defaultValue: 'true' + isRequired: true + isModifiable: false + valueList: + - 'false' + - 'true' + ffLogging: + dataType: boolean + defaultValue: 'true' + isRequired: true + isModifiable: false + valueList: + - 'false' + - 'true' + userCount: + dataType: integer > 0 + defaultValue: '10' + isRequired: true + isModifiable: false - svcOperationCfsParamId: 658 svcOperationCfsParam: s3Storage dataType: integer > 0 @@ -133,30 +133,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - ffWatermark: - dataType: boolean - defaultValue: '' - isRequired: true - isModifiable: false - valueList: - - 'false' - - 'true' - ffUserImport: - dataType: boolean - defaultValue: '' - isRequired: true - isModifiable: false - valueList: - - 'false' - - 'true' - ffThemes: - dataType: boolean - defaultValue: '' - isRequired: true - isModifiable: false - valueList: - - 'false' - - 'true' ffPublicLink: dataType: boolean defaultValue: '' @@ -191,6 +167,30 @@ cfsParams: valueList: - 'false' - 'true' + ffWatermark: + dataType: boolean + defaultValue: '' + isRequired: true + isModifiable: false + valueList: + - 'false' + - 'true' + ffUserImport: + dataType: boolean + defaultValue: '' + isRequired: true + isModifiable: false + valueList: + - 'false' + - 'true' + ffThemes: + dataType: boolean + defaultValue: '' + isRequired: true + isModifiable: false + valueList: + - 'false' + - 'true' - svcOperationCfsParamId: 660 svcOperationCfsParam: s3Storage dataType: integer > 0 @@ -212,5 +212,5 @@ cfsParamsByOp: stateParams: resourceRealm: valo.ngcloud.ru domain: '' - valoOptions: '{"ffThemes": true, "ffPublicLink": true, "ffLogging": true, "userCount": 10, "requestApproveMaxPeriod": 2, "ffOnlineEditor": true, "ffWatermark": true, "ffUserImport": true}' + valoOptions: '{"requestApproveMaxPeriod": 2, "ffOnlineEditor": true, "ffWatermark": true, "ffUserImport": true, "ffThemes": true, "ffPublicLink": true, "ffLogging": true, "userCount": 10}' s3Storage: '10' diff --git a/site/services/stand3/150_k8s_sthutrval_cluster.yaml b/site/services/prod/150_k8s_sthutrval_cluster.yaml similarity index 94% rename from site/services/stand3/150_k8s_sthutrval_cluster.yaml rename to site/services/prod/150_k8s_sthutrval_cluster.yaml index 3222506..22c0bce 100644 --- a/site/services/stand3/150_k8s_sthutrval_cluster.yaml +++ b/site/services/prod/150_k8s_sthutrval_cluster.yaml @@ -61,7 +61,7 @@ cfsParams: isModifiable: false clusterName: dataType: string - defaultValue: example-imhltbba + defaultValue: example-umab2vgx isRequired: true isModifiable: false - svcOperationCfsParamId: 751 @@ -99,6 +99,11 @@ cfsParams: defaultValue: '[{}]' isModifiable: true dataDescriptor: + groupName: + dataType: string + defaultValue: workers-dum0vgn5 + isRequired: true + isModifiable: false sizingPolicy: dataType: string defaultValue: '' @@ -116,11 +121,6 @@ cfsParams: defaultValue: '2' isRequired: true isModifiable: false - groupName: - dataType: string - defaultValue: workers-0krz2kek - isRequired: true - isModifiable: false - svcOperationCfsParamId: 753 svcOperationCfsParam: accessConfiguration dataType: map-fixed @@ -128,6 +128,11 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: + accessIpListIngress: + dataType: json + defaultValue: '[]' + isRequired: true + isModifiable: false needExternalAddressAPI: dataType: boolean defaultValue: 'true' @@ -147,11 +152,6 @@ cfsParams: isModifiable: false valueList: - 'true' - accessIpListIngress: - dataType: json - defaultValue: '[]' - isRequired: true - isModifiable: false - svcOperationCfsParamId: 755 svcOperationCfsParam: clusterConfiguration dataType: map-fixed @@ -243,9 +243,14 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: + count: + dataType: integer > 0 + defaultValue: '' + isRequired: true + isModifiable: false groupName: dataType: string - defaultValue: workers-apak4rks + defaultValue: workers-tr9wauz1 isRequired: true isModifiable: false sizingPolicy: @@ -260,11 +265,6 @@ cfsParams: defaultValue: '' isRequired: true isModifiable: false - count: - dataType: integer >= 0 - defaultValue: '' - isRequired: true - isModifiable: false - svcOperationCfsParamId: 759 svcOperationCfsParam: accessConfiguration dataType: map-fixed @@ -317,8 +317,8 @@ cfsParamsByOp: 174: [] 173: [] stateParams: - startupConfiguration: '{"vdcUid": "", "nsxtUid": "", "clusterName": "example-imhltbba"}' + startupConfiguration: '{"vdcUid": "", "nsxtUid": "", "clusterName": "example-umab2vgx"}' controlPlaneConfiguration: '{"sizingPolicy": "[]", "sizingDisk": 50, "count": 1}' - workerConfiguration: '{"sizingPolicy": "", "sizingDisk": 50, "count": 2, "groupName": "workers-0krz2kek"}' - accessConfiguration: '{"needExternalAddressAPI": true, "accessIpListAPI": "[]", "needExternalAddressIngress": true, "accessIpListIngress": "[]"}' + workerConfiguration: '{"groupName": "workers-dum0vgn5", "sizingPolicy": "", "sizingDisk": 50, "count": 2}' + accessConfiguration: '{"accessIpListIngress": "[]", "needExternalAddressAPI": true, "accessIpListAPI": "[]", "needExternalAddressIngress": true}' clusterConfiguration: '{"appVersion": "2.13.1"}' diff --git a/site/services/stand3/19_vc_org.yaml b/site/services/prod/19_vc_org.yaml similarity index 98% rename from site/services/stand3/19_vc_org.yaml rename to site/services/prod/19_vc_org.yaml index 95fea45..76fc6e2 100644 --- a/site/services/stand3/19_vc_org.yaml +++ b/site/services/prod/19_vc_org.yaml @@ -60,10 +60,10 @@ cfsParams: svcOperationCfsParam: resourceRealm dataType: string isRequired: true - defaultValue: sandbox.nubes.ru + defaultValue: ngcloud.ru isModifiable: false valueList: - - sandbox.nubes.ru + - ngcloud.ru - svcOperationCfsParamId: 556 svcOperationCfsParam: organizationType dataType: string @@ -129,5 +129,5 @@ cfsParamsByOp: 144: [] 143: [] stateParams: - resourceRealm: sandbox.nubes.ru + resourceRealm: ngcloud.ru organizationType: iaas diff --git a/site/services/stand3/1_dummy.yaml b/site/services/prod/1_dummy.yaml similarity index 95% rename from site/services/stand3/1_dummy.yaml rename to site/services/prod/1_dummy.yaml index ea33cc8..7fbf991 100644 --- a/site/services/stand3/1_dummy.yaml +++ b/site/services/prod/1_dummy.yaml @@ -78,10 +78,8 @@ cfsParams: svcOperationCfsParam: resourceRealm dataType: string isRequired: true - defaultValue: dummy + defaultValue: '' isModifiable: false - valueList: - - dummy - svcOperationCfsParamId: 286 svcOperationCfsParam: bodymessage dataType: string @@ -95,11 +93,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - subparam2: - dataType: string - defaultValue: '' - isRequired: false - isModifiable: false subparam1: dataType: string defaultValue: '' @@ -110,6 +103,11 @@ cfsParams: defaultValue: '' isRequired: false isModifiable: false + subparam2: + dataType: string + defaultValue: '' + isRequired: false + isModifiable: false - svcOperationCfsParamId: 322 svcOperationCfsParam: jsonExample dataType: json @@ -129,6 +127,13 @@ cfsParams: defaultValue: '' isModifiable: false dataDescriptor: + minStr1: + dataType: string + defaultValue: abracadabra + isRequired: true + isModifiable: false + valueList: + - abracadabra param1: dataType: integer > 0 defaultValue: '1' @@ -156,13 +161,6 @@ cfsParams: valueList: - 'false' - 'true' - minStr1: - dataType: string - defaultValue: abracadabra - isRequired: true - isModifiable: false - valueList: - - abracadabra - svcOperationCfsParamId: 654 svcOperationCfsParam: arrayMapFixedExample dataType: array-map-fixed @@ -170,6 +168,11 @@ cfsParams: defaultValue: '' isModifiable: false dataDescriptor: + param3: + dataType: integer > 0 + defaultValue: '1' + isRequired: true + isModifiable: false bol1: dataType: boolean defaultValue: '' @@ -199,11 +202,6 @@ cfsParams: - '["1"' - '"2"' - '"3"]' - param3: - dataType: integer > 0 - defaultValue: '1' - isRequired: true - isModifiable: false - svcOperationCfsParamId: 863 svcOperationCfsParam: arr dataType: array @@ -304,11 +302,11 @@ stateParams: failAtStart: 'false' failInProgress: 'false' whereFail: '1' - resourceRealm: dummy + resourceRealm: '' bodymessage: '' - mapExample: '{"subparam2": "", "subparam1": "", "secret": ""}' + mapExample: '{"subparam1": "", "secret": "", "subparam2": ""}' jsonExample: '' nestedRefExample: '' - mapFixed: '{"param1": 1, "param2": "1", "param3": 1, "bol1": false, "minStr1": "abracadabra"}' - arrayMapFixedExample: '{"bol1": false, "minStr1": "", "param1": 0, "param2": "", "param3": 1}' + mapFixed: '{"minStr1": "abracadabra", "param1": 1, "param2": "1", "param3": 1, "bol1": false}' + arrayMapFixedExample: '{"param3": 1, "bol1": false, "minStr1": "", "param1": 0, "param2": ""}' arr: '' diff --git a/site/services/stand3/21_vc_vdc.yaml b/site/services/prod/21_vc_vdc.yaml similarity index 98% rename from site/services/stand3/21_vc_vdc.yaml rename to site/services/prod/21_vc_vdc.yaml index 662531f..e573655 100644 --- a/site/services/stand3/21_vc_vdc.yaml +++ b/site/services/prod/21_vc_vdc.yaml @@ -79,7 +79,7 @@ cfsParams: isModifiable: false size: dataType: integer > 0 - defaultValue: '2000' + defaultValue: '100' isRequired: true isModifiable: false - svcOperationCfsParamId: 397 @@ -96,13 +96,13 @@ cfsParams: svcOperationCfsParam: cpuAllocated dataType: integer > 0 isRequired: true - defaultValue: '80' + defaultValue: '10' isModifiable: true - svcOperationCfsParamId: 558 svcOperationCfsParam: memAllocated dataType: integer > 0 isRequired: true - defaultValue: '200' + defaultValue: '20' isModifiable: true - svcOperationCfsParamId: 746 svcOperationCfsParam: networkProvider @@ -159,8 +159,8 @@ cfsParamsByOp: stateParams: organizationUid: '' providerVdc: '' - storageConfig: '{"name": "", "size": 2000}' + storageConfig: '{"name": "", "size": 100}' cpuGuaranteed: '20' - cpuAllocated: '80' - memAllocated: '200' + cpuAllocated: '10' + memAllocated: '20' networkProvider: '' diff --git a/site/services/stand2/22_vc_nsxt.yaml b/site/services/prod/22_vc_nsxt.yaml similarity index 100% rename from site/services/stand2/22_vc_nsxt.yaml rename to site/services/prod/22_vc_nsxt.yaml diff --git a/site/services/stand3/25_vcexternalip.yaml b/site/services/prod/25_vcexternalip.yaml similarity index 98% rename from site/services/stand3/25_vcexternalip.yaml rename to site/services/prod/25_vcexternalip.yaml index bbc2bde..981fb24 100644 --- a/site/services/stand3/25_vcexternalip.yaml +++ b/site/services/prod/25_vcexternalip.yaml @@ -93,10 +93,10 @@ cfsParams: svcOperationCfsParam: resourceRealm dataType: string isRequired: true - defaultValue: sandbox.nubes.ru + defaultValue: ngcloud.ru isModifiable: false valueList: - - sandbox.nubes.ru + - ngcloud.ru - svcOperationCfsParamId: 624 svcOperationCfsParam: fromServiceCloudEdgeScope dataType: string @@ -181,6 +181,6 @@ stateParams: fromServiceCloudOrgName: '' fromServiceCloudVmwareUrl: '' ipSpaceName: '' - resourceRealm: sandbox.nubes.ru + resourceRealm: ngcloud.ru fromServiceCloudEdgeScope: '' fromServiceVdcGroupName: '' diff --git a/site/services/stand3/26_vapp.yaml b/site/services/prod/26_vapp.yaml similarity index 97% rename from site/services/stand3/26_vapp.yaml rename to site/services/prod/26_vapp.yaml index 2eb0a76..aa2d8ca 100644 --- a/site/services/stand3/26_vapp.yaml +++ b/site/services/prod/26_vapp.yaml @@ -28,10 +28,6 @@ operations: operation: delete kind: instance action: delete -- svcOperationId: 285 - operation: reconcile - kind: action - action: reconcile - svcOperationId: 209 operation: resume kind: instance @@ -52,7 +48,7 @@ cfsParams: svcOperationCfsParam: vappName dataType: string isRequired: true - defaultValue: fgpdul5a + defaultValue: es1fsp9q isModifiable: false - svcOperationCfsParamId: 623 svcOperationCfsParam: vdcUid @@ -66,10 +62,9 @@ cfsParamsByOp: - 191 - 623 70: [] - 285: [] 209: [] 208: [] stateParams: nsxtUid: '' - vappName: fgpdul5a + vappName: es1fsp9q vdcUid: '' diff --git a/site/services/stand2/27_vc_vm_v2.yaml b/site/services/prod/27_vc_vm_v2.yaml similarity index 100% rename from site/services/stand2/27_vc_vm_v2.yaml rename to site/services/prod/27_vc_vm_v2.yaml diff --git a/site/services/stand2/28_vc_vm_v3.yaml b/site/services/prod/28_vc_vm_v3.yaml similarity index 100% rename from site/services/stand2/28_vc_vm_v3.yaml rename to site/services/prod/28_vc_vm_v3.yaml diff --git a/site/services/stand2/29_vc_vdc_group.yaml b/site/services/prod/29_vc_vdc_group.yaml similarity index 100% rename from site/services/stand2/29_vc_vdc_group.yaml rename to site/services/prod/29_vc_vdc_group.yaml diff --git a/site/services/stand3/2_template.yaml b/site/services/prod/2_template.yaml similarity index 92% rename from site/services/stand3/2_template.yaml rename to site/services/prod/2_template.yaml index 1045c98..31ee93e 100644 --- a/site/services/stand3/2_template.yaml +++ b/site/services/prod/2_template.yaml @@ -39,16 +39,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - memory: - dataType: integer > 0 - defaultValue: '128' - isRequired: true - isModifiable: false - replicas: - dataType: integer > 0 - defaultValue: '1' - isRequired: true - isModifiable: false cpu: dataType: integer > 0 defaultValue: '100' @@ -59,6 +49,16 @@ cfsParams: defaultValue: '5' isRequired: true isModifiable: false + memory: + dataType: integer > 0 + defaultValue: '128' + isRequired: true + isModifiable: false + replicas: + dataType: integer > 0 + defaultValue: '1' + isRequired: true + isModifiable: false - svcOperationCfsParamId: 814 svcOperationCfsParam: startupConfiguration dataType: map-fixed @@ -68,12 +68,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 815 svcOperationCfsParam: accessConfiguration dataType: map-fixed @@ -91,7 +90,7 @@ cfsParams: - service domain: dataType: string - defaultValue: abracadabra-l9gtqv1m + defaultValue: abracadabra-g2byllee isRequired: true isModifiable: false masterIpSpace: @@ -121,16 +120,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - memory: - dataType: integer > 0 - defaultValue: '' - isRequired: true - isModifiable: false - replicas: - dataType: integer > 0 - defaultValue: '' - isRequired: true - isModifiable: false cpu: dataType: integer > 0 defaultValue: '' @@ -141,6 +130,16 @@ cfsParams: defaultValue: '' isRequired: true isModifiable: false + memory: + dataType: integer > 0 + defaultValue: '' + isRequired: true + isModifiable: false + replicas: + dataType: integer > 0 + defaultValue: '' + isRequired: true + isModifiable: false - svcOperationCfsParamId: 817 svcOperationCfsParam: accessConfiguration dataType: map-fixed @@ -148,16 +147,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - slaveIpSpace: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false - slaveAccessList: - dataType: json - defaultValue: '' - isRequired: true - isModifiable: false type: dataType: string defaultValue: '' @@ -181,6 +170,16 @@ cfsParams: defaultValue: '' isRequired: true isModifiable: false + slaveIpSpace: + dataType: string + defaultValue: '' + isRequired: true + isModifiable: false + slaveAccessList: + dataType: json + defaultValue: '' + isRequired: true + isModifiable: false cfsParamsByOp: 74: - 813 @@ -194,6 +193,6 @@ cfsParamsByOp: 98: [] 97: [] stateParams: - clusterConfiguration: '{"memory": 128, "replicas": 1, "cpu": 100, "disk": 5}' - startupConfiguration: '{"resourceRealm": ""}' - accessConfiguration: '{"type": "ingress", "domain": "abracadabra-l9gtqv1m", "masterIpSpace": "", "masterAccessList": "[]", "slaveIpSpace": "", "slaveAccessList": "[]"}' + clusterConfiguration: '{"cpu": 100, "disk": 5, "memory": 128, "replicas": 1}' + startupConfiguration: '{"resourceRealm": "k8s-4-ext-nubes-ru"}' + accessConfiguration: '{"type": "ingress", "domain": "abracadabra-g2byllee", "masterIpSpace": "", "masterAccessList": "[]", "slaveIpSpace": "", "slaveAccessList": "[]"}' diff --git a/site/services/stand3/50_nextcloud.yaml b/site/services/prod/50_nextcloud.yaml similarity index 94% rename from site/services/stand3/50_nextcloud.yaml rename to site/services/prod/50_nextcloud.yaml index a6f58ee..d6d44d7 100644 --- a/site/services/stand3/50_nextcloud.yaml +++ b/site/services/prod/50_nextcloud.yaml @@ -53,6 +53,20 @@ cfsParams: defaultValue: '' isModifiable: false dataDescriptor: + resourceRealm: + dataType: string + defaultValue: k8s-4-ext-nubes-ru + isRequired: true + isModifiable: false + valueList: + - k8s-4-ext-nubes-ru + psqlEnabled: + dataType: boolean + defaultValue: 'true' + isRequired: true + isModifiable: false + valueList: + - 'true' redisEnabled: dataType: boolean defaultValue: 'true' @@ -70,21 +84,6 @@ cfsParams: defaultValue: '' isRequired: true isModifiable: false - resourceRealm: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false - valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru - psqlEnabled: - dataType: boolean - defaultValue: 'true' - isRequired: true - isModifiable: false - valueList: - - 'true' - svcOperationCfsParamId: 1056 svcOperationCfsParam: clusterConfiguration dataType: map-fixed @@ -138,7 +137,7 @@ cfsParams: dataDescriptor: domain: dataType: string - defaultValue: nextcloud-vbxjicr2 + defaultValue: nextcloud-6afmoouq isRequired: true isModifiable: false - svcOperationCfsParamId: 1058 @@ -148,6 +147,18 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: + logLevel: + dataType: string + defaultValue: INFO + isRequired: true + isModifiable: false + valueList: + - DEBUG + - INFO + - WARN + - ERROR + - FATAL + - NONE version: dataType: string defaultValue: 33.0.4 @@ -162,18 +173,6 @@ cfsParams: isModifiable: false valueList: - collabora - logLevel: - dataType: string - defaultValue: INFO - isRequired: true - isModifiable: false - valueList: - - DEBUG - - INFO - - WARN - - ERROR - - FATAL - - NONE - svcOperationCfsParamId: 1077 svcOperationCfsParam: startupConfiguration dataType: map-fixed @@ -270,14 +269,23 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - resourceRealm: - dataType: string + psqlUid: + dataType: uuid defaultValue: '' isRequired: true isModifiable: false + redisUid: + dataType: uuid + defaultValue: '' + isRequired: true + isModifiable: false + resourceRealm: + dataType: string + defaultValue: k8s-4-ext-nubes-ru + isRequired: true + isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru veleroUid: dataType: string defaultValue: '' @@ -302,16 +310,6 @@ cfsParams: isModifiable: false valueList: - 'true' - psqlUid: - dataType: uuid - defaultValue: '' - isRequired: true - isModifiable: false - redisUid: - dataType: uuid - defaultValue: '' - isRequired: true - isModifiable: false - svcOperationCfsParamId: 1079 svcOperationCfsParam: clusterConfiguration dataType: map-fixed @@ -362,7 +360,7 @@ cfsParams: dataDescriptor: domain: dataType: string - defaultValue: nextcloud-bcdguda1 + defaultValue: nextcloud-ch6fvoz1 isRequired: true isModifiable: false - svcOperationCfsParamId: 1081 @@ -372,6 +370,13 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: + documentServer: + dataType: string + defaultValue: collabora + isRequired: true + isModifiable: false + valueList: + - collabora logLevel: dataType: string defaultValue: NONE @@ -389,13 +394,6 @@ cfsParams: defaultValue: '' isRequired: false isModifiable: false - documentServer: - dataType: string - defaultValue: collabora - isRequired: true - isModifiable: false - valueList: - - collabora cfsParamsByOp: 16: - 1055 @@ -418,7 +416,7 @@ cfsParamsByOp: 129: [] 128: [] stateParams: - startupConfiguration: '{"redisEnabled": true, "psqlUid": "", "redisUid": "", "resourceRealm": "", "psqlEnabled": true}' + startupConfiguration: '{"resourceRealm": "k8s-4-ext-nubes-ru", "psqlEnabled": true, "redisEnabled": true, "psqlUid": "", "redisUid": ""}' clusterConfiguration: '{"cpu": 1000, "memory": 1024, "replicas": 1, "disk": 10}' - accessConfiguration: '{"domain": "nextcloud-vbxjicr2"}' - appConfiguration: '{"version": "33.0.4", "documentServer": "collabora", "logLevel": "INFO"}' + accessConfiguration: '{"domain": "nextcloud-6afmoouq"}' + appConfiguration: '{"logLevel": "INFO", "version": "33.0.4", "documentServer": "collabora"}' diff --git a/site/services/stand3/81_superset.yaml b/site/services/prod/81_superset.yaml similarity index 95% rename from site/services/stand3/81_superset.yaml rename to site/services/prod/81_superset.yaml index 3b025e3..6f46bef 100644 --- a/site/services/stand3/81_superset.yaml +++ b/site/services/prod/81_superset.yaml @@ -51,11 +51,10 @@ cfsParams: svcOperationCfsParam: resourceRealm dataType: string isRequired: true - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 227 svcOperationCfsParam: resourceInstances dataType: integer > 0 @@ -78,5 +77,5 @@ stateParams: resourceCPU: '500' resourceMemory: '512' resourceDisk: '1' - resourceRealm: '' + resourceRealm: k8s-4-ext-nubes-ru resourceInstances: '1' diff --git a/site/services/stand3/82_harbor.yaml b/site/services/prod/82_harbor.yaml similarity index 72% rename from site/services/stand3/82_harbor.yaml rename to site/services/prod/82_harbor.yaml index 4ecbde7..89d1842 100644 --- a/site/services/stand3/82_harbor.yaml +++ b/site/services/prod/82_harbor.yaml @@ -18,14 +18,6 @@ operations: operation: delete kind: instance action: delete -- svcOperationId: 270 - operation: modify - kind: instance - action: modify -- svcOperationId: 405 - operation: reconcile - kind: action - action: reconcile stateOut: {} cfsParams: - svcOperationCfsParamId: 16 @@ -38,53 +30,34 @@ cfsParams: svcOperationCfsParam: resourceRealm dataType: string isRequired: true - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 228 svcOperationCfsParam: resourceCPU dataType: integer > 0 isRequired: true - defaultValue: '1000' - isModifiable: true + defaultValue: '100' + isModifiable: false - svcOperationCfsParamId: 229 svcOperationCfsParam: resourceMemory dataType: integer > 0 isRequired: true - defaultValue: '1024' - isModifiable: true + defaultValue: '200' + isModifiable: false - svcOperationCfsParamId: 230 svcOperationCfsParam: resourceInstances dataType: integer > 0 isRequired: true defaultValue: '1' - isModifiable: true + isModifiable: false - svcOperationCfsParamId: 231 svcOperationCfsParam: s3Uid dataType: uuid isRequired: true defaultValue: '' isModifiable: false -- svcOperationCfsParamId: 822 - svcOperationCfsParam: resourceInstances - dataType: integer > 0 - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 823 - svcOperationCfsParam: resourceCPU - dataType: integer > 0 - isRequired: false - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 824 - svcOperationCfsParam: resourceMemory - dataType: integer > 0 - isRequired: true - defaultValue: '' - isModifiable: true cfsParamsByOp: 14: - 16 @@ -94,15 +67,10 @@ cfsParamsByOp: - 230 - 231 15: [] - 270: - - 822 - - 823 - - 824 - 405: [] stateParams: domain: harbor-1 - resourceRealm: '' - resourceCPU: '1000' - resourceMemory: '1024' + resourceRealm: k8s-4-ext-nubes-ru + resourceCPU: '100' + resourceMemory: '200' resourceInstances: '1' s3Uid: '' diff --git a/site/services/stand3/86_k8s_velero.yaml b/site/services/prod/86_k8s_velero.yaml similarity index 96% rename from site/services/stand3/86_k8s_velero.yaml rename to site/services/prod/86_k8s_velero.yaml index 589298c..b829372 100644 --- a/site/services/stand3/86_k8s_velero.yaml +++ b/site/services/prod/86_k8s_velero.yaml @@ -67,12 +67,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 964 svcOperationCfsParam: nodeAgentConfiguration dataType: map-fixed @@ -118,6 +117,11 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: + cpu: + dataType: integer > 0 + defaultValue: '' + isRequired: true + isModifiable: false memory: dataType: integer > 0 defaultValue: '' @@ -132,11 +136,6 @@ cfsParams: - '1' - '2' - '3' - cpu: - dataType: integer > 0 - defaultValue: '' - isRequired: true - isModifiable: false - svcOperationCfsParamId: 966 svcOperationCfsParam: nodeAgentConfiguration dataType: map-fixed @@ -170,6 +169,6 @@ cfsParamsByOp: 333: [] stateParams: clusterConfiguration: '{"cpu": 1000, "memory": 2048, "replicas": 1}' - startupConfiguration: '{"resourceRealm": ""}' + startupConfiguration: '{"resourceRealm": "k8s-4-ext-nubes-ru"}' nodeAgentConfiguration: '{"cpu": 2000, "memory": 2048}' backupConfiguration: '{"s3BucketUid": ""}' diff --git a/site/services/stand3/89_flask.yaml b/site/services/prod/89_flask.yaml similarity index 95% rename from site/services/stand3/89_flask.yaml rename to site/services/prod/89_flask.yaml index d7dbe59..f465e30 100644 --- a/site/services/stand3/89_flask.yaml +++ b/site/services/prod/89_flask.yaml @@ -62,12 +62,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 1038 svcOperationCfsParam: clusterConfiguration dataType: map-fixed @@ -104,7 +103,7 @@ cfsParams: dataDescriptor: domain: dataType: string - defaultValue: flask-4brtjmwm + defaultValue: flask-raqv2ud7 isRequired: true isModifiable: false - svcOperationCfsParamId: 1040 @@ -114,11 +113,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - healthPath: - dataType: string - defaultValue: '' - isRequired: false - isModifiable: false version: dataType: string defaultValue: '3.12' @@ -131,6 +125,11 @@ cfsParams: defaultValue: https://github.com/Foxyhhd/Baldurs-Gate-test.git isRequired: true isModifiable: false + healthPath: + dataType: string + defaultValue: '' + isRequired: false + isModifiable: false - svcOperationCfsParamId: 1041 svcOperationCfsParam: jsonEnv dataType: map @@ -203,12 +202,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru cfsParamsByOp: 376: - 1037 @@ -227,8 +225,8 @@ cfsParamsByOp: 378: [] 377: [] stateParams: - startupConfiguration: '{"resourceRealm": ""}' + startupConfiguration: '{"resourceRealm": "k8s-4-ext-nubes-ru"}' clusterConfiguration: '{"cpu": 200, "memory": 256, "replicas": 1}' - accessConfiguration: '{"domain": "flask-4brtjmwm"}' - appConfiguration: '{"healthPath": "", "version": "3.12", "gitPath": "https://github.com/Foxyhhd/Baldurs-Gate-test.git"}' + accessConfiguration: '{"domain": "flask-raqv2ud7"}' + appConfiguration: '{"version": "3.12", "gitPath": "https://github.com/Foxyhhd/Baldurs-Gate-test.git", "healthPath": ""}' jsonEnv: '{}' diff --git a/site/services/stand3/90_postgres.yaml b/site/services/prod/90_postgres.yaml similarity index 98% rename from site/services/stand3/90_postgres.yaml rename to site/services/prod/90_postgres.yaml index c85f935..8f018f2 100644 --- a/site/services/stand3/90_postgres.yaml +++ b/site/services/prod/90_postgres.yaml @@ -101,6 +101,16 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: + cpu: + dataType: integer > 0 + defaultValue: '500' + isRequired: true + isModifiable: false + memory: + dataType: integer > 0 + defaultValue: '512' + isRequired: true + isModifiable: false replicas: dataType: integer > 0 defaultValue: '1' @@ -116,16 +126,6 @@ cfsParams: defaultValue: '10' isRequired: true isModifiable: false - cpu: - dataType: integer > 0 - defaultValue: '500' - isRequired: true - isModifiable: false - memory: - dataType: integer > 0 - defaultValue: '512' - isRequired: true - isModifiable: false - svcOperationCfsParamId: 789 svcOperationCfsParam: startupConfiguration dataType: map-fixed @@ -135,12 +135,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 790 svcOperationCfsParam: accessConfiguration dataType: map-fixed @@ -447,6 +446,14 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: + poolerSlave: + dataType: boolean + defaultValue: '' + isRequired: true + isModifiable: false + valueList: + - 'false' + - 'true' version: dataType: string defaultValue: '' @@ -468,14 +475,6 @@ cfsParams: valueList: - 'false' - 'true' - poolerSlave: - dataType: boolean - defaultValue: '' - isRequired: true - isModifiable: false - valueList: - - 'false' - - 'true' - svcOperationCfsParamId: 798 svcOperationCfsParam: postgresConf dataType: array-map-fixed @@ -503,11 +502,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - schedule: - dataType: string - defaultValue: 0 0 * * * - isRequired: true - isModifiable: false s3Uid: dataType: uuid defaultValue: '' @@ -518,6 +512,11 @@ cfsParams: defaultValue: '' isRequired: true isModifiable: false + schedule: + dataType: string + defaultValue: 0 0 * * * + isRequired: true + isModifiable: false - svcOperationCfsParamId: 800 svcOperationCfsParam: autoscaleConfiguration dataType: map-fixed @@ -564,24 +563,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - certCA: - dataType: string - defaultValue: '' - isRequired: false - isModifiable: false - certServer: - dataType: string - defaultValue: '' - isRequired: false - isModifiable: false - refreshCert: - dataType: boolean - defaultValue: 'false' - isRequired: false - isModifiable: false - valueList: - - 'false' - - 'true' type: dataType: string defaultValue: '' @@ -601,6 +582,24 @@ cfsParams: defaultValue: '' isRequired: true isModifiable: false + certCA: + dataType: string + defaultValue: '' + isRequired: false + isModifiable: false + certServer: + dataType: string + defaultValue: '' + isRequired: false + isModifiable: false + refreshCert: + dataType: boolean + defaultValue: 'false' + isRequired: false + isModifiable: false + valueList: + - 'false' + - 'true' - svcOperationCfsParamId: 801 svcOperationCfsParam: startupConfiguration dataType: map-fixed @@ -610,12 +609,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru recoveryPoint: dataType: string defaultValue: '' @@ -628,11 +626,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - disk: - dataType: integer > 0 - defaultValue: '10' - isRequired: true - isModifiable: false cpu: dataType: integer > 0 defaultValue: '500' @@ -653,6 +646,11 @@ cfsParams: - '3' - '5' - '7' + disk: + dataType: integer > 0 + defaultValue: '10' + isRequired: true + isModifiable: false - svcOperationCfsParamId: 803 svcOperationCfsParam: accessConfiguration dataType: map-fixed @@ -768,6 +766,14 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: + enabled: + dataType: boolean + defaultValue: 'false' + isRequired: true + isModifiable: false + valueList: + - 'false' + - 'true' schedule: dataType: integer >= 0 defaultValue: '0' @@ -792,14 +798,6 @@ cfsParams: - '10' - '15' - '20' - enabled: - dataType: boolean - defaultValue: 'false' - isRequired: true - isModifiable: false - valueList: - - 'false' - - 'true' cfsParamsByOp: 19: - 788 @@ -845,8 +843,8 @@ cfsParamsByOp: 114: [] 115: [] stateParams: - clusterConfiguration: '{"replicas": 1, "disk": 10, "cpu": 500, "memory": 512}' - startupConfiguration: '{"resourceRealm": ""}' + clusterConfiguration: '{"cpu": 500, "memory": 512, "replicas": 1, "disk": 10}' + startupConfiguration: '{"resourceRealm": "k8s-4-ext-nubes-ru"}' accessConfiguration: '{"masterIpSpace": "", "masterAccessList": "[]", "slaveIpSpace": "", "slaveAccessList": "[]"}' postgresConfiguration: '{"version": "17", "sslRequired": true, "poolerMaster": false, "poolerSlave": false}' postgresConf: '{"paramName": "", "paramValue": ""}' diff --git a/site/services/stand3/91_redis.yaml b/site/services/prod/91_redis.yaml similarity index 92% rename from site/services/stand3/91_redis.yaml rename to site/services/prod/91_redis.yaml index 799a3cf..f9d93b3 100644 --- a/site/services/stand3/91_redis.yaml +++ b/site/services/prod/91_redis.yaml @@ -42,12 +42,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 1062 svcOperationCfsParam: clusterConfiguration dataType: map-fixed @@ -55,6 +54,11 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: + cpu: + dataType: integer > 0 + defaultValue: '500' + isRequired: true + isModifiable: false memory: dataType: integer > 0 defaultValue: '512' @@ -75,11 +79,6 @@ cfsParams: defaultValue: '10' isRequired: true isModifiable: false - cpu: - dataType: integer > 0 - defaultValue: '500' - isRequired: true - isModifiable: false - svcOperationCfsParamId: 1063 svcOperationCfsParam: accessConfiguration dataType: map-fixed @@ -87,16 +86,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - masterIpSpace: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false - masterAccessList: - dataType: json - defaultValue: '[]' - isRequired: true - isModifiable: false slaveIpSpace: dataType: string defaultValue: '' @@ -107,6 +96,16 @@ cfsParams: defaultValue: '[]' isRequired: true isModifiable: false + masterIpSpace: + dataType: string + defaultValue: '' + isRequired: true + isModifiable: false + masterAccessList: + dataType: json + defaultValue: '[]' + isRequired: true + isModifiable: false - svcOperationCfsParamId: 1064 svcOperationCfsParam: clusterConfiguration dataType: map-fixed @@ -114,11 +113,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - cpu: - dataType: integer > 0 - defaultValue: '' - isRequired: true - isModifiable: false memory: dataType: integer > 0 defaultValue: '' @@ -139,6 +133,11 @@ cfsParams: defaultValue: '' isRequired: true isModifiable: false + cpu: + dataType: integer > 0 + defaultValue: '' + isRequired: true + isModifiable: false - svcOperationCfsParamId: 1065 svcOperationCfsParam: accessConfiguration dataType: map-fixed @@ -146,16 +145,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - masterAccessList: - dataType: json - defaultValue: '' - isRequired: true - isModifiable: false - slaveIpSpace: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false slaveAccessList: dataType: json defaultValue: '' @@ -166,6 +155,16 @@ cfsParams: defaultValue: '' isRequired: true isModifiable: false + masterAccessList: + dataType: json + defaultValue: '' + isRequired: true + isModifiable: false + slaveIpSpace: + dataType: string + defaultValue: '' + isRequired: true + isModifiable: false cfsParamsByOp: 21: - 1061 @@ -179,6 +178,6 @@ cfsParamsByOp: 393: [] 392: [] stateParams: - startupConfiguration: '{"resourceRealm": ""}' - clusterConfiguration: '{"memory": 512, "replicas": 1, "disk": 10, "cpu": 500}' - accessConfiguration: '{"masterIpSpace": "", "masterAccessList": "[]", "slaveIpSpace": "", "slaveAccessList": "[]"}' + startupConfiguration: '{"resourceRealm": "k8s-4-ext-nubes-ru"}' + clusterConfiguration: '{"cpu": 500, "memory": 512, "replicas": 1, "disk": 10}' + accessConfiguration: '{"slaveIpSpace": "", "slaveAccessList": "[]", "masterIpSpace": "", "masterAccessList": "[]"}' diff --git a/site/services/stand3/92_mongodb.yaml b/site/services/prod/92_mongodb.yaml similarity index 98% rename from site/services/stand3/92_mongodb.yaml rename to site/services/prod/92_mongodb.yaml index fd05d67..9fe3df0 100644 --- a/site/services/stand3/92_mongodb.yaml +++ b/site/services/prod/92_mongodb.yaml @@ -83,12 +83,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 1090 svcOperationCfsParam: clusterConfiguration dataType: map-fixed @@ -128,16 +127,16 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - masterAccessList: - dataType: json - defaultValue: '[]' - isRequired: true - isModifiable: false masterIpSpace: dataType: string defaultValue: '' isRequired: true isModifiable: false + masterAccessList: + dataType: json + defaultValue: '[]' + isRequired: true + isModifiable: false - svcOperationCfsParamId: 635 svcOperationCfsParam: username dataType: string @@ -173,11 +172,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - disk: - dataType: integer > 0 - defaultValue: '' - isRequired: true - isModifiable: false cpu: dataType: integer > 0 defaultValue: '' @@ -198,6 +192,11 @@ cfsParams: - '3' - '5' - '7' + disk: + dataType: integer > 0 + defaultValue: '' + isRequired: true + isModifiable: false - svcOperationCfsParamId: 1093 svcOperationCfsParam: accessConfiguration dataType: map-fixed @@ -260,6 +259,6 @@ cfsParamsByOp: 196: [] 194: [] stateParams: - startupConfiguration: '{"resourceRealm": ""}' + startupConfiguration: '{"resourceRealm": "k8s-4-ext-nubes-ru"}' clusterConfiguration: '{"replicas": 1, "disk": 5, "cpu": 1000, "memory": 1024}' - accessConfiguration: '{"masterAccessList": "[]", "masterIpSpace": ""}' + accessConfiguration: '{"masterIpSpace": "", "masterAccessList": "[]"}' diff --git a/site/services/stand3/93_rabbitmq.yaml b/site/services/prod/93_rabbitmq.yaml similarity index 80% rename from site/services/stand3/93_rabbitmq.yaml rename to site/services/prod/93_rabbitmq.yaml index 915b166..394255f 100644 --- a/site/services/stand3/93_rabbitmq.yaml +++ b/site/services/prod/93_rabbitmq.yaml @@ -49,10 +49,6 @@ operations: operation: modify kind: instance action: modify -- svcOperationId: 410 - operation: reconcile - kind: action - action: reconcile - svcOperationId: 117 operation: resume kind: instance @@ -63,132 +59,116 @@ operations: action: suspend stateOut: {} cfsParams: -- svcOperationCfsParamId: 1097 - svcOperationCfsParam: startupConfiguration - dataType: map-fixed +- svcOperationCfsParamId: 116 + svcOperationCfsParam: resourceCPU + dataType: integer > 0 isRequired: true - defaultValue: '' + defaultValue: '1000' + isModifiable: true +- svcOperationCfsParamId: 117 + svcOperationCfsParam: resourceMemory + dataType: integer > 0 + isRequired: true + defaultValue: '1124' + isModifiable: true +- svcOperationCfsParamId: 118 + svcOperationCfsParam: resourceDisk + dataType: integer > 0 + isRequired: true + defaultValue: '30' + isModifiable: true +- svcOperationCfsParamId: 119 + svcOperationCfsParam: resourceRealm + dataType: string + isRequired: true + defaultValue: k8s-4-ext-nubes-ru isModifiable: false - dataDescriptor: - resourceRealm: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false - valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru -- svcOperationCfsParamId: 1098 - svcOperationCfsParam: clusterConfiguration - dataType: map-fixed + valueList: + - k8s-4-ext-nubes-ru +- svcOperationCfsParamId: 224 + svcOperationCfsParam: resourceInstances + dataType: integer > 0 + isRequired: true + defaultValue: '1' + isModifiable: true +- svcOperationCfsParamId: 225 + svcOperationCfsParam: needExternalAddressMaster + dataType: boolean + isRequired: true + defaultValue: 'false' + isModifiable: true + valueList: + - 'false' + - 'true' +- svcOperationCfsParamId: 543 + svcOperationCfsParam: ipSpaceNameMaster + dataType: string + isRequired: false + defaultValue: '' + isModifiable: true +- svcOperationCfsParamId: 304 + svcOperationCfsParam: resourceCPU + dataType: integer > 0 isRequired: true defaultValue: '' isModifiable: true - dataDescriptor: - cpu: - dataType: integer > 0 - defaultValue: '1000' - isRequired: true - isModifiable: false - memory: - dataType: integer > 0 - defaultValue: '1024' - isRequired: true - isModifiable: false - replicas: - dataType: integer > 0 - defaultValue: '1' - isRequired: true - isModifiable: false - valueList: - - '1' - - '3' - - '5' - - '7' - disk: - dataType: integer > 0 - defaultValue: '5' - isRequired: true - isModifiable: false -- svcOperationCfsParamId: 1099 - svcOperationCfsParam: accessConfiguration - dataType: map-fixed +- svcOperationCfsParamId: 305 + svcOperationCfsParam: resourceMemory + dataType: integer > 0 isRequired: true defaultValue: '' isModifiable: true - dataDescriptor: - masterIpSpace: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false - masterAccessList: - dataType: json - defaultValue: '[]' - isRequired: true - isModifiable: false -- svcOperationCfsParamId: 1100 - svcOperationCfsParam: clusterConfiguration - dataType: map-fixed +- svcOperationCfsParamId: 306 + svcOperationCfsParam: resourceDisk + dataType: integer > 0 isRequired: true defaultValue: '' isModifiable: true - dataDescriptor: - disk: - dataType: integer > 0 - defaultValue: '' - isRequired: true - isModifiable: false - cpu: - dataType: integer > 0 - defaultValue: '' - isRequired: true - isModifiable: false - memory: - dataType: integer > 0 - defaultValue: '' - isRequired: true - isModifiable: false - replicas: - dataType: integer > 0 - defaultValue: '' - isRequired: true - isModifiable: false - valueList: - - '1' - - '3' - - '5' - - '7' -- svcOperationCfsParamId: 1101 - svcOperationCfsParam: accessConfiguration - dataType: map-fixed +- svcOperationCfsParamId: 307 + svcOperationCfsParam: resourceInstances + dataType: integer > 0 isRequired: true defaultValue: '' isModifiable: true - dataDescriptor: - masterIpSpace: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false - masterAccessList: - dataType: json - defaultValue: '' - isRequired: true - isModifiable: false +- svcOperationCfsParamId: 308 + svcOperationCfsParam: needExternalAddressMaster + dataType: boolean + isRequired: true + defaultValue: '' + isModifiable: true + valueList: + - 'false' + - 'true' +- svcOperationCfsParamId: 545 + svcOperationCfsParam: ipSpaceNameMaster + dataType: string + isRequired: false + defaultValue: '' + isModifiable: true cfsParamsByOp: 38: - - 1097 - - 1098 - - 1099 + - 116 + - 117 + - 118 + - 119 + - 224 + - 225 + - 543 39: [] 106: - - 1100 - - 1101 - 410: [] + - 304 + - 305 + - 306 + - 307 + - 308 + - 545 117: [] 116: [] stateParams: - startupConfiguration: '{"resourceRealm": ""}' - clusterConfiguration: '{"cpu": 1000, "memory": 1024, "replicas": 1, "disk": 5}' - accessConfiguration: '{"masterIpSpace": "", "masterAccessList": "[]"}' + resourceCPU: '1000' + resourceMemory: '1124' + resourceDisk: '30' + resourceRealm: k8s-4-ext-nubes-ru + resourceInstances: '1' + needExternalAddressMaster: 'false' + ipSpaceNameMaster: '' diff --git a/site/services/stand3/94_lucee.yaml b/site/services/prod/94_lucee.yaml similarity index 89% rename from site/services/stand3/94_lucee.yaml rename to site/services/prod/94_lucee.yaml index db6768a..48d113c 100644 --- a/site/services/stand3/94_lucee.yaml +++ b/site/services/prod/94_lucee.yaml @@ -49,12 +49,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 1020 svcOperationCfsParam: clusterConfiguration dataType: map-fixed @@ -62,16 +61,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - cpu: - dataType: integer > 0 - defaultValue: '200' - isRequired: true - isModifiable: false - memory: - dataType: integer > 0 - defaultValue: '256' - isRequired: true - isModifiable: false replicas: dataType: integer > 0 defaultValue: '1' @@ -82,6 +71,16 @@ cfsParams: - '3' - '5' - '7' + cpu: + dataType: string + defaultValue: '200' + isRequired: true + isModifiable: false + memory: + dataType: integer > 0 + defaultValue: '256' + isRequired: true + isModifiable: false - svcOperationCfsParamId: 1021 svcOperationCfsParam: accessConfiguration dataType: map-fixed @@ -91,7 +90,7 @@ cfsParams: dataDescriptor: domain: dataType: string - defaultValue: lucee-pzpvwkuk + defaultValue: lucee-w8upcmma isRequired: true isModifiable: false - svcOperationCfsParamId: 1022 @@ -101,11 +100,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - healthPath: - dataType: string - defaultValue: '' - isRequired: false - isModifiable: false version: dataType: string defaultValue: '6.0' @@ -119,6 +113,11 @@ cfsParams: defaultValue: https://github.com/xahys/testlucee isRequired: true isModifiable: false + healthPath: + dataType: string + defaultValue: '' + isRequired: false + isModifiable: false - svcOperationCfsParamId: 1023 svcOperationCfsParam: jsonEnv dataType: map @@ -132,16 +131,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - cpu: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false - memory: - dataType: integer > 0 - defaultValue: '' - isRequired: true - isModifiable: false replicas: dataType: integer > 0 defaultValue: '' @@ -152,6 +141,16 @@ cfsParams: - '3' - '5' - '7' + cpu: + dataType: string + defaultValue: '' + isRequired: true + isModifiable: false + memory: + dataType: integer > 0 + defaultValue: '' + isRequired: true + isModifiable: false - svcOperationCfsParamId: 1025 svcOperationCfsParam: appConfiguration dataType: map-fixed @@ -159,6 +158,14 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: + version: + dataType: string + defaultValue: '' + isRequired: true + isModifiable: false + valueList: + - '6.0' + - '5.4' gitPath: dataType: string defaultValue: '' @@ -169,14 +176,6 @@ cfsParams: defaultValue: '' isRequired: false isModifiable: false - version: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false - valueList: - - '6.0' - - '5.4' - svcOperationCfsParamId: 1026 svcOperationCfsParam: jsonEnv dataType: map @@ -192,12 +191,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru cfsParamsByOp: 49: - 1019 @@ -217,8 +215,8 @@ cfsParamsByOp: 95: [] 96: [] stateParams: - startupConfiguration: '{"resourceRealm": ""}' - clusterConfiguration: '{"cpu": 200, "memory": 256, "replicas": 1}' - accessConfiguration: '{"domain": "lucee-pzpvwkuk"}' - appConfiguration: '{"healthPath": "", "version": "6.0", "gitPath": "https://github.com/xahys/testlucee"}' + startupConfiguration: '{"resourceRealm": "k8s-4-ext-nubes-ru"}' + clusterConfiguration: '{"replicas": 1, "cpu": "200", "memory": 256}' + accessConfiguration: '{"domain": "lucee-w8upcmma"}' + appConfiguration: '{"version": "6.0", "gitPath": "https://github.com/xahys/testlucee", "healthPath": ""}' jsonEnv: '{}' diff --git a/site/services/stand3/95_nodejs.yaml b/site/services/prod/95_nodejs.yaml similarity index 92% rename from site/services/stand3/95_nodejs.yaml rename to site/services/prod/95_nodejs.yaml index a351726..f6945c5 100644 --- a/site/services/stand3/95_nodejs.yaml +++ b/site/services/prod/95_nodejs.yaml @@ -47,12 +47,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 1029 svcOperationCfsParam: clusterConfiguration dataType: map-fixed @@ -89,7 +88,7 @@ cfsParams: dataDescriptor: domain: dataType: string - defaultValue: node-ctkmt4iw + defaultValue: node-q0hjstq5 isRequired: true isModifiable: false - svcOperationCfsParamId: 1031 @@ -99,6 +98,11 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: + healthPath: + dataType: string + defaultValue: '' + isRequired: false + isModifiable: false version: dataType: string defaultValue: '23' @@ -114,11 +118,6 @@ cfsParams: defaultValue: https://github.com/xahys/testnode.git isRequired: true isModifiable: false - healthPath: - dataType: string - defaultValue: '1' - isRequired: false - isModifiable: false - svcOperationCfsParamId: 1032 svcOperationCfsParam: jsonEnv dataType: map @@ -132,11 +131,6 @@ cfsParams: defaultValue: '' isModifiable: true dataDescriptor: - cpu: - dataType: integer > 0 - defaultValue: '' - isRequired: true - isModifiable: false memory: dataType: integer > 0 defaultValue: '' @@ -152,6 +146,11 @@ cfsParams: - '3' - '5' - '7' + cpu: + dataType: integer > 0 + defaultValue: '' + isRequired: true + isModifiable: false - svcOperationCfsParamId: 1034 svcOperationCfsParam: appConfiguration dataType: map-fixed @@ -194,12 +193,11 @@ cfsParams: dataDescriptor: resourceRealm: dataType: string - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isRequired: true isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru cfsParamsByOp: 58: - 1028 @@ -218,8 +216,8 @@ cfsParamsByOp: 121: [] 120: [] stateParams: - startupConfiguration: '{"resourceRealm": ""}' + startupConfiguration: '{"resourceRealm": "k8s-4-ext-nubes-ru"}' clusterConfiguration: '{"cpu": 200, "memory": 256, "replicas": 1}' - accessConfiguration: '{"domain": "node-ctkmt4iw"}' - appConfiguration: '{"version": "23", "gitPath": "https://github.com/xahys/testnode.git", "healthPath": "1"}' + accessConfiguration: '{"domain": "node-q0hjstq5"}' + appConfiguration: '{"healthPath": "", "version": "23", "gitPath": "https://github.com/xahys/testnode.git"}' jsonEnv: '{}' diff --git a/site/services/stand3/96_pgadmin.yaml b/site/services/prod/96_pgadmin.yaml similarity index 94% rename from site/services/stand3/96_pgadmin.yaml rename to site/services/prod/96_pgadmin.yaml index 7c09014..29ff27e 100644 --- a/site/services/stand3/96_pgadmin.yaml +++ b/site/services/prod/96_pgadmin.yaml @@ -61,11 +61,10 @@ cfsParams: svcOperationCfsParam: resourceRealm dataType: string isRequired: true - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 170 svcOperationCfsParam: login dataType: string @@ -100,11 +99,10 @@ cfsParams: svcOperationCfsParam: resourceRealm dataType: string isRequired: true - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isModifiable: true valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru cfsParamsByOp: 62: - 164 @@ -128,6 +126,6 @@ stateParams: resourceCPU: '500' resourceMemory: '512' resourceDisk: '1' - resourceRealm: '' + resourceRealm: k8s-4-ext-nubes-ru login: '' password: '' diff --git a/site/services/stand3/98_http.yaml b/site/services/prod/98_http.yaml similarity index 91% rename from site/services/stand3/98_http.yaml rename to site/services/prod/98_http.yaml index fa6348b..440bf8c 100644 --- a/site/services/stand3/98_http.yaml +++ b/site/services/prod/98_http.yaml @@ -18,10 +18,6 @@ operations: operation: modify kind: instance action: modify -- svcOperationId: 403 - operation: reconcile - kind: action - action: reconcile - svcOperationId: 79 operation: redeploy kind: action @@ -64,11 +60,10 @@ cfsParams: svcOperationCfsParam: resourceRealm dataType: string isRequired: true - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isModifiable: false valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru - svcOperationCfsParamId: 217 svcOperationCfsParam: registryPath dataType: string @@ -109,11 +104,10 @@ cfsParams: svcOperationCfsParam: resourceRealm dataType: string isRequired: true - defaultValue: '' + defaultValue: k8s-4-ext-nubes-ru isModifiable: true valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru + - k8s-4-ext-nubes-ru cfsParamsByOp: 77: - 212 @@ -129,7 +123,6 @@ cfsParamsByOp: - 218 - 219 - 220 - 403: [] 79: - 272 130: [] @@ -139,7 +132,7 @@ stateParams: resourceCPU: '100' resourceMemory: '200' resourceInstances: '1' - resourceRealm: '' + resourceRealm: k8s-4-ext-nubes-ru registryPath: nexus-sa.tst.nubes.ru/docker-nubes/jolt jsonEnv: '' ingressAnnotations: '{}' diff --git a/site/services/stand2/99_gitea.yaml b/site/services/prod/99_gitea.yaml similarity index 100% rename from site/services/stand2/99_gitea.yaml rename to site/services/prod/99_gitea.yaml diff --git a/site/services/stand3/151_k8s_openbao.yaml b/site/services/stand3/151_k8s_openbao.yaml deleted file mode 100644 index 7f48128..0000000 --- a/site/services/stand3/151_k8s_openbao.yaml +++ /dev/null @@ -1,372 +0,0 @@ -name: k8s_openbao -service_id: 151 -service_display_name: Vault -service_short_name: k8sOpenbao -service_man: '# Инструкция по развертыванию Хранилища секретов через платформу

## 1. Общая информация
Хранилище секретов — сервис централизованного и защищённого хранения чувствительных данных - (секретов, ключей, конфигураций). Предназначен для использования приложениями и сервисами в Kubernetes с управлением доступом на основе ролей.
В качестве приложения используется открытый проект OpenBao - с поддержкой кластерного режима RAFT.

### Доступные операции
**create** — Создание хранилища секретов и инициализация кластера.
**delete** — Удаление хранилища секретов с полной очисткой - всех связанных сущностей.
**modify** — Изменение параметров развернутого хранилища секретов.
**suspend** — Приостановка работы кластера без удаления Persistent Volume.
**resume** — Возобновление - работы кластера с автоматическим unseal всех нод.
**restart** — Поочередный перезапуск нод с последующим подключением в кластер.
**create_kv** — Создание Key/Value хранилища версии V2.
**delete_kv** - — Удаление Key/Value хранилища со всеми содержащимися секретами.
**create_secrets** — Создание секрета внутри Key/Value хранилища.
**delete_secrets** — Удаление секрета из Key/Value хранилища.
**update_secrets** - — Обновление значения секрета.
**recovery_secrets** — Откат секрета к указанной версии.
**create_role** — Создание роли для управления Key/Value хранилищем или секретами.
**update_role** — - Обновление параметров роли.
**delete_role** — Удаление роли доступа.

---

## 2. Параметры развертывания

Параметры входных данных операции **create**:

### Платформа - для развертывания
Описание: Кластер Kubernetes, в котором будет развернуто приложение.
Формат значения: имя Kubernetes-кластера.

### Имя домена
Описание: Доменное имя сервиса. При - указании полного FQDN выполняется проверка DNS A-записи или добавляется А-запись в техническую зону.
Формат значения: secrets.domain.com / mysecretdomain.

### Кол-во реплик
Описание: - Количество узлов в кластере.
Формат значения: целое число.

### Квота ядра пода
Описание: Лимит CPU для одного узла. Указывается в milicores (1000 milicores = 1 CPU).
Формат значения: - целое число.

### Квота памяти пода
Описание: Лимит оперативной памяти для одного узла. Указывается в megabytes.
Формат значения: целое число.

### Размер диска под хранение секретов
Описание: - Объем диска для хранения данных. Фактический объем равен значению, умноженному на количество реплик. Указывается в Gigabytes
Формат значения: целое число.

### Версия OpenBao
Описание: - Версия OpenBao для развертывания сервиса.
Формат значения: выбор из предоставленного списка версий.

---

## 3. Рекомендованные характеристики

### Тестовое окружение
Кол-во - реплик: 2.
Квота ядра пода: 200.
Квота памяти пода: 256.
Размер диска под хранение секретов: 1.
Версия OpenBao: актуальная стабильная версия.

### Промышленное окружение
Кол-во - реплик: от 3.
Квота ядра пода: от 1000.
Квота памяти пода: от 1024.
Размер диска под хранение секретов: от 10.
Версия OpenBao: актуальная стабильная версия.

---

## 4. - Выходные параметры
Настройки внутри хранилища (kv/secrets/roles) — конфигурации Key/Value, секретов и ролей, созданные соответствующими операциями.
Настройки самого хранилище (сайзинг, объемы) - — параметры ресурсов и хранилища данных, примененные к сервису.
Статус кластера (running / suspended) — текущее состояние работы кластера.
url для подключения к веб — адрес веб-интерфейса сервиса.

---

## - 5. Дополнительная информация
При удалении хранилища все данные и настройки безвозвратно удаляются.
При использовании доменного имени требуется корректная настройка DNS.
Операции управления - секретами и ролями выполняются только после успешного создания хранилища.
Удаление кластера производится через операцию `suspend`, а удаление становится доступно через 14 дней после остановки кластера
Правило - выше не относится к операции `delete_kv` / `delete_secrets` / `delete_role`' -lifecycle: - suspendOnDestroyDefault: true - adoptExistingOnCreateDefault: false -operations: -- svcOperationId: 210 - operation: create - kind: instance - action: create -- svcOperationId: 212 - operation: create_kv - kind: subresource - action: create -- svcOperationId: 237 - operation: create_policy - kind: subresource - action: create -- svcOperationId: 214 - operation: create_secrets - kind: subresource - action: create -- svcOperationId: 231 - operation: delete - kind: instance - action: delete -- svcOperationId: 213 - operation: delete_kv - kind: subresource - action: delete -- svcOperationId: 239 - operation: delete_policy - kind: subresource - action: delete -- svcOperationId: 233 - operation: delete_secrets - kind: subresource - action: delete -- svcOperationId: 211 - operation: modify - kind: instance - action: modify -- svcOperationId: 236 - operation: reconcile - kind: action - action: reconcile -- svcOperationId: 232 - operation: recovery_secrets - kind: subresource - action: recovery -- svcOperationId: 234 - operation: restart - kind: action - action: restart -- svcOperationId: 216 - operation: resume - kind: instance - action: resume -- svcOperationId: 215 - operation: suspend - kind: instance - action: suspend -- svcOperationId: 238 - operation: update_policy - kind: subresource - action: update -- svcOperationId: 230 - operation: update_secrets - kind: subresource - action: update -stateOut: - kvs: {} - policies: {} - secrets: {} -cfsParams: -- svcOperationCfsParamId: 663 - svcOperationCfsParam: resourceRealm - dataType: string - isRequired: true - defaultValue: '' - isModifiable: false - valueList: - - k8s-3-sandbox-nubes-ru - - k8s-4-sandbox-nubes-ru -- svcOperationCfsParamId: 664 - svcOperationCfsParam: resourceCPU - dataType: integer > 0 - isRequired: true - defaultValue: '500' - isModifiable: true -- svcOperationCfsParamId: 665 - svcOperationCfsParam: resourceInstances - dataType: integer > 0 - isRequired: true - defaultValue: '3' - isModifiable: true -- svcOperationCfsParamId: 666 - svcOperationCfsParam: resourceMemory - dataType: integer > 0 - isRequired: true - defaultValue: '512' - isModifiable: true -- svcOperationCfsParamId: 667 - svcOperationCfsParam: resourceDisk - dataType: integer > 0 - isRequired: true - defaultValue: '10' - isModifiable: true -- svcOperationCfsParamId: 668 - svcOperationCfsParam: appVersion - dataType: string - isRequired: true - defaultValue: 2.5.2 - isModifiable: true - valueList: - - 2.5.2 -- svcOperationCfsParamId: 669 - svcOperationCfsParam: domain - dataType: string - isRequired: true - defaultValue: bao-onbcvsgk - isModifiable: false -- svcOperationCfsParamId: 675 - svcOperationCfsParam: kvName - dataType: string - isRequired: true - defaultValue: kvname-9e9wvkt2 - isModifiable: false -- svcOperationCfsParamId: 728 - svcOperationCfsParam: policySettings - dataType: array-map-fixed - isRequired: true - defaultValue: '' - isModifiable: false - dataDescriptor: - capabilities: - dataType: json - defaultValue: '["read", "list"]' - isRequired: true - isModifiable: false - path: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false -- svcOperationCfsParamId: 729 - svcOperationCfsParam: policyName - dataType: string - isRequired: true - defaultValue: policy-s0hfjfmn - isModifiable: false -- svcOperationCfsParamId: 677 - svcOperationCfsParam: kvName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: false -- svcOperationCfsParamId: 678 - svcOperationCfsParam: secretPath - dataType: string - isRequired: true - defaultValue: path/to/mysecret - isModifiable: false -- svcOperationCfsParamId: 679 - svcOperationCfsParam: secretData - dataType: map - isRequired: true - defaultValue: '' - isModifiable: false -- svcOperationCfsParamId: 676 - svcOperationCfsParam: kvName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 732 - svcOperationCfsParam: policyName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 726 - svcOperationCfsParam: kvName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 727 - svcOperationCfsParam: secretPath - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 670 - svcOperationCfsParam: resourceInstances - dataType: integer > 0 - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 671 - svcOperationCfsParam: resourceCPU - dataType: integer > 0 - isRequired: true - defaultValue: '500' - isModifiable: true -- svcOperationCfsParamId: 672 - svcOperationCfsParam: resourceMemory - dataType: integer > 0 - isRequired: true - defaultValue: '512' - isModifiable: true -- svcOperationCfsParamId: 673 - svcOperationCfsParam: resourceDisk - dataType: integer > 0 - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 674 - svcOperationCfsParam: appVersion - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true - valueList: - - 2.5.2 -- svcOperationCfsParamId: 723 - svcOperationCfsParam: kvName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 724 - svcOperationCfsParam: secretPath - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 725 - svcOperationCfsParam: secretVersion - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 730 - svcOperationCfsParam: policyName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 731 - svcOperationCfsParam: policySettings - dataType: array-map-fixed - isRequired: true - defaultValue: '' - isModifiable: true - dataDescriptor: - capabilities: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false - path: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false -- svcOperationCfsParamId: 719 - svcOperationCfsParam: kvName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 720 - svcOperationCfsParam: secretPath - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 721 - svcOperationCfsParam: needFullUpdateSecret - dataType: boolean - isRequired: true - defaultValue: 'false' - isModifiable: true - valueList: - - 'false' - - 'true' -- svcOperationCfsParamId: 722 - svcOperationCfsParam: secretData - dataType: map - isRequired: true - defaultValue: '' - isModifiable: true -cfsParamsByOp: - 210: - - 663 - - 664 - - 665 - - 666 - - 667 - - 668 - - 669 - 212: - - 675 - 237: - - 728 - - 729 - 214: - - 677 - - 678 - - 679 - 231: [] - 213: - - 676 - 239: - - 732 - 233: - - 726 - - 727 - 211: - - 670 - - 671 - - 672 - - 673 - - 674 - 236: [] - 232: - - 723 - - 724 - - 725 - 234: [] - 216: [] - 215: [] - 238: - - 730 - - 731 - 230: - - 719 - - 720 - - 721 - - 722 -stateParams: - resourceRealm: '' - resourceCPU: '500' - resourceInstances: '3' - resourceMemory: '512' - resourceDisk: '10' - appVersion: 2.5.2 - domain: bao-onbcvsgk diff --git a/site/services/stand3/163_llm_ai.yaml b/site/services/stand3/163_llm_ai.yaml deleted file mode 100644 index 10e515c..0000000 --- a/site/services/stand3/163_llm_ai.yaml +++ /dev/null @@ -1,277 +0,0 @@ -name: llm_ai -service_id: 163 -service_display_name: LLM -service_short_name: llmAi -service_man: '## 1. Общая информация

LLMaaS (Large Language Model as a Service) — это сервис для доступа к языковым моделям через OpenAI-совместимое API.
Платформа позволяет создавать организации - (тенанты), команды, выпускать и управлять API-ключами, устанавливать лимиты на использование.

---

## Доступные операции

- **create** — Создание организации в LLMaaS
- - **delete** — Удаление организации

- **create_team** — Создание команды внутри организации
- **modify_team** — Редактирование команды (модели, RPM, TPM)
- **delete_team** — - Удаление команды

- **create_secrets** — Создание API-ключа
- **update_secrets** — Обновление параметров API-ключа
- **delete_secrets** — Удаление API-ключа

---

## - 2. Параметры создания организации

Ниже перечислены параметры, которые необходимо указать при создании организации:

* **Платформа для развертывания**
Выбирается автоматически, изменять - не нужно.

* **Период бюджета**
Срок жизни организации в днях.
Пример: `30`


---

## 3. Параметры создания команды

* **Имя команды**
Уникальное - имя команды в рамках организации.
Пример: `production`

* **Модель**
Название модели, доступной для команды.
Пример: `gpt-oss-120b`

* **Лимит запросов в минуту (RPM)**
Максимальное - количество запросов к API в минуту.
Пример: `60`

* **Лимит токенов в минуту (TPM)**
Максимальное количество токенов (входящих + исходящих) в минуту.
Пример: `100000`

---

## - 4. Параметры редактирования команды

Для существующей команды можно изменить:

* **Модель**
Новая модель для команды.
Пример: `gpt-oss-20b`

* **Лимит запросов в минуту - (RPM)**
Новое значение RPM.
Пример: `120`

* **Лимит токенов в минуту (TPM)**
Новое значение TPM.
Пример: `200000`

---

## 5. Параметры создания API-ключа

Ниже - перечислены параметры, которые необходимо указать при создании API-ключа:

* **Имя ключа**
Уникальное имя ключа в рамках организации.
Пример: `prod-key`

* **Команда**
Имя - команды для привязки ключа. Если не указано — ключ привязывается к команде `main`.
Пример: `production`

* **Модель**
Название модели, доступной для данного ключа.
Пример: `gpt-oss-120b`

* - **Лимит запросов в минуту (RPM)**
Максимальное количество запросов к API в минуту.
Пример: `60`

* **Лимит токенов в минуту (TPM)**
Максимальное количество токенов (входящих - + исходящих) в минуту.
Пример: `100000`

**Важно:** Лимиты API-ключа не могут превышать лимиты команды, к которой он привязан.
При превышении операция будет отклонена с ошибкой.
Перед - созданием ключа убедитесь, что `RPM <= team.RPM` и `TPM <= team.TPM`.


---

## 6. Параметры обновления API-ключа

Для уже существующего ключа можно изменить параметры. Все - параметры являются опциональными:

* **Имя ключа**
Имя обновляемого ключа.
Пример: `prod-key`

* **Модель**
Новое название модели.
Пример: `gpt-oss-20b`

* - **Лимит запросов в минуту (RPM)**
Новое значение RPM.
Пример: `120`

* **Лимит токенов в минуту (TPM)**
Новое значение TPM.
Пример: `200000`

**Важно:** При обновлении - лимитов API-ключа новые значения не могут превышать лимиты команды.
Если указать значения выше командных, операция завершится ошибкой.
Указывайте `RPM <= team.RPM` и `TPM <= team.TPM`.

Команда - определяется автоматически по стейту услуги — изменить привязку к другой команде через эту операцию нельзя.

---

## 7. Параметры удаления API-ключа

* **Команда**
Имя команды, - к которой привязан ключ.
Пример: `production`

* **Имя ключа**
Имя удаляемого ключа.
Пример: `prod-key`

---

## 8. Параметры удаления команды

* **Имя - команды**
Имя удаляемой команды.
Пример: `production`

---

## 9. Параметры удаления организации

Удаление организации не требует дополнительных параметров — удаляется - вся организация со всеми командами и ключами.

---

## 10. Выходные параметры

После успешного создания организации платформа возвращает:

* **connectionUrl**
URL - для доступа к inference API (OpenAI-совместимый).
Пример: `https://api.aillm.ru`

---


## 12. Пример использования API

После получения API-ключа клиент может обращаться - к LLMaaS напрямую:

**Запрос к chat completions:**

```bash
curl https://api.aillm.ru/v1/chat/completions \
-H "Authorization: Bearer sk-..." \
-H "Content-Type: application/json" - \
-d ''{
"model": "gpt-oss-120b",
"messages": [
{"role": "user", "content": "Привет!"}
]
}''
```

**Получение списка доступных моделей:**

```bash
curl - https://api.aillm.ru/v1/models \
-H "Authorization: Bearer sk-..."
```
' -lifecycle: - suspendOnDestroyDefault: false - adoptExistingOnCreateDefault: false -operations: -- svcOperationId: 271 - operation: create - kind: instance - action: create -- svcOperationId: 274 - operation: create_secrets - kind: subresource - action: create -- svcOperationId: 278 - operation: create_team - kind: subresource - action: create -- svcOperationId: 273 - operation: delete - kind: instance - action: delete -- svcOperationId: 275 - operation: delete_secrets - kind: subresource - action: delete -- svcOperationId: 280 - operation: delete_team - kind: subresource - action: delete -- svcOperationId: 279 - operation: modify_team - kind: subresource - action: modify -- svcOperationId: 277 - operation: update_secrets - kind: subresource - action: update -stateOut: - secrets: {} - teams: {} -cfsParams: -- svcOperationCfsParamId: 826 - svcOperationCfsParam: resourceRealm - dataType: string - isRequired: true - defaultValue: llmAi.aillm.ru - isModifiable: false - valueList: - - llmAi.aillm.ru -- svcOperationCfsParamId: 833 - svcOperationCfsParam: models - dataType: array - isRequired: true - defaultValue: '' - isModifiable: false -- svcOperationCfsParamId: 834 - svcOperationCfsParam: rpmLimit - dataType: integer > 0 - isRequired: true - defaultValue: '60' - isModifiable: false -- svcOperationCfsParamId: 835 - svcOperationCfsParam: tpmLimit - dataType: integer > 0 - isRequired: true - defaultValue: '100000' - isModifiable: false -- svcOperationCfsParamId: 857 - svcOperationCfsParam: keyName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: false -- svcOperationCfsParamId: 859 - svcOperationCfsParam: teamName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: false -- svcOperationCfsParamId: 1083 - svcOperationCfsParam: variablesKeys - dataType: array-map-fixed - isRequired: true - defaultValue: '' - isModifiable: false - dataDescriptor: - teamName: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false - keyName: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false - models: - dataType: string - defaultValue: '' - isRequired: true - isModifiable: false - valueList: - - '{}' - tpmLimit: - dataType: integer > 0 - defaultValue: '100000' - isRequired: true - isModifiable: false - rpmLimit: - dataType: integer > 0 - defaultValue: '60' - isRequired: true - isModifiable: false - count: - dataType: integer > 0 - defaultValue: '1' - isRequired: true - isModifiable: false -- svcOperationCfsParamId: 858 - svcOperationCfsParam: teamName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: false -- svcOperationCfsParamId: 860 - svcOperationCfsParam: models - dataType: array - isRequired: true - defaultValue: '' - isModifiable: false -- svcOperationCfsParamId: 861 - svcOperationCfsParam: rpmLimit - dataType: integer > 0 - isRequired: true - defaultValue: '60' - isModifiable: false -- svcOperationCfsParamId: 862 - svcOperationCfsParam: tpmLimit - dataType: integer > 0 - isRequired: true - defaultValue: '100000' - isModifiable: false -- svcOperationCfsParamId: 836 - svcOperationCfsParam: keyName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 876 - svcOperationCfsParam: teamName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 868 - svcOperationCfsParam: teamName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 864 - svcOperationCfsParam: teamName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 865 - svcOperationCfsParam: models - dataType: array - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 873 - svcOperationCfsParam: rpmLimit - dataType: integer > 0 - isRequired: true - defaultValue: '60' - isModifiable: true -- svcOperationCfsParamId: 874 - svcOperationCfsParam: tpmLimit - dataType: integer > 0 - isRequired: true - defaultValue: '100000' - isModifiable: true -- svcOperationCfsParamId: 852 - svcOperationCfsParam: keyName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 853 - svcOperationCfsParam: models - dataType: array - isRequired: true - defaultValue: '' - isModifiable: true -- svcOperationCfsParamId: 854 - svcOperationCfsParam: rpmLimit - dataType: integer > 0 - isRequired: true - defaultValue: '60' - isModifiable: true -- svcOperationCfsParamId: 855 - svcOperationCfsParam: tpmLimit - dataType: integer > 0 - isRequired: true - defaultValue: '100000' - isModifiable: true -- svcOperationCfsParamId: 875 - svcOperationCfsParam: teamName - dataType: string - isRequired: true - defaultValue: '' - isModifiable: true -cfsParamsByOp: - 271: - - 826 - 274: - - 833 - - 834 - - 835 - - 857 - - 859 - - 1083 - 278: - - 858 - - 860 - - 861 - - 862 - 273: [] - 275: - - 836 - - 876 - 280: - - 868 - 279: - - 864 - - 865 - - 873 - - 874 - 277: - - 852 - - 853 - - 854 - - 855 - - 875 -stateParams: - resourceRealm: llmAi.aillm.ru diff --git a/site/services/stand2/109_zones_v2.yaml b/site/services/test/109_zones_v2.yaml similarity index 100% rename from site/services/stand2/109_zones_v2.yaml rename to site/services/test/109_zones_v2.yaml diff --git a/site/services/stand3/111_dnsrecord.yaml b/site/services/test/111_dnsrecord.yaml similarity index 100% rename from site/services/stand3/111_dnsrecord.yaml rename to site/services/test/111_dnsrecord.yaml diff --git a/site/services/stand2/115_mariadb.yaml b/site/services/test/115_mariadb.yaml similarity index 100% rename from site/services/stand2/115_mariadb.yaml rename to site/services/test/115_mariadb.yaml diff --git a/site/services/stand2/116_kafka.yaml b/site/services/test/116_kafka.yaml similarity index 100% rename from site/services/stand2/116_kafka.yaml rename to site/services/test/116_kafka.yaml diff --git a/site/services/stand2/119_akhq.yaml b/site/services/test/119_akhq.yaml similarity index 100% rename from site/services/stand2/119_akhq.yaml rename to site/services/test/119_akhq.yaml diff --git a/site/services/stand2/120_clickhouse.yaml b/site/services/test/120_clickhouse.yaml similarity index 100% rename from site/services/stand2/120_clickhouse.yaml rename to site/services/test/120_clickhouse.yaml diff --git a/site/services/stand2/12_s3.yaml b/site/services/test/12_s3.yaml similarity index 100% rename from site/services/stand2/12_s3.yaml rename to site/services/test/12_s3.yaml diff --git a/site/services/stand3/13_s3bucket.yaml b/site/services/test/13_s3bucket.yaml similarity index 100% rename from site/services/stand3/13_s3bucket.yaml rename to site/services/test/13_s3bucket.yaml diff --git a/site/services/stand2/148_vc_mgmt_sthutrval_cluster.yaml b/site/services/test/148_vc_mgmt_sthutrval_cluster.yaml similarity index 100% rename from site/services/stand2/148_vc_mgmt_sthutrval_cluster.yaml rename to site/services/test/148_vc_mgmt_sthutrval_cluster.yaml diff --git a/site/services/stand2/149_valo_tenant.yaml b/site/services/test/149_valo_tenant.yaml similarity index 100% rename from site/services/stand2/149_valo_tenant.yaml rename to site/services/test/149_valo_tenant.yaml diff --git a/site/services/stand2/150_k8s_sthutrval_cluster.yaml b/site/services/test/150_k8s_sthutrval_cluster.yaml similarity index 100% rename from site/services/stand2/150_k8s_sthutrval_cluster.yaml rename to site/services/test/150_k8s_sthutrval_cluster.yaml diff --git a/site/services/stand2/151_k8s_openbao.yaml b/site/services/test/151_k8s_openbao.yaml similarity index 100% rename from site/services/stand2/151_k8s_openbao.yaml rename to site/services/test/151_k8s_openbao.yaml diff --git a/site/services/stand2/163_llm_ai.yaml b/site/services/test/163_llm_ai.yaml similarity index 100% rename from site/services/stand2/163_llm_ai.yaml rename to site/services/test/163_llm_ai.yaml diff --git a/site/services/stand2/19_vc_org.yaml b/site/services/test/19_vc_org.yaml similarity index 100% rename from site/services/stand2/19_vc_org.yaml rename to site/services/test/19_vc_org.yaml diff --git a/site/services/stand2/1_dummy.yaml b/site/services/test/1_dummy.yaml similarity index 100% rename from site/services/stand2/1_dummy.yaml rename to site/services/test/1_dummy.yaml diff --git a/site/services/stand2/21_vc_vdc.yaml b/site/services/test/21_vc_vdc.yaml similarity index 100% rename from site/services/stand2/21_vc_vdc.yaml rename to site/services/test/21_vc_vdc.yaml diff --git a/site/services/stand3/22_vc_nsxt.yaml b/site/services/test/22_vc_nsxt.yaml similarity index 100% rename from site/services/stand3/22_vc_nsxt.yaml rename to site/services/test/22_vc_nsxt.yaml diff --git a/site/services/stand2/25_vcexternalip.yaml b/site/services/test/25_vcexternalip.yaml similarity index 100% rename from site/services/stand2/25_vcexternalip.yaml rename to site/services/test/25_vcexternalip.yaml diff --git a/site/services/stand2/26_vapp.yaml b/site/services/test/26_vapp.yaml similarity index 100% rename from site/services/stand2/26_vapp.yaml rename to site/services/test/26_vapp.yaml diff --git a/site/services/stand3/27_vc_vm_v2.yaml b/site/services/test/27_vc_vm_v2.yaml similarity index 100% rename from site/services/stand3/27_vc_vm_v2.yaml rename to site/services/test/27_vc_vm_v2.yaml diff --git a/site/services/stand3/28_vc_vm_v3.yaml b/site/services/test/28_vc_vm_v3.yaml similarity index 100% rename from site/services/stand3/28_vc_vm_v3.yaml rename to site/services/test/28_vc_vm_v3.yaml diff --git a/site/services/stand3/29_vc_vdc_group.yaml b/site/services/test/29_vc_vdc_group.yaml similarity index 100% rename from site/services/stand3/29_vc_vdc_group.yaml rename to site/services/test/29_vc_vdc_group.yaml diff --git a/site/services/stand2/2_template.yaml b/site/services/test/2_template.yaml similarity index 100% rename from site/services/stand2/2_template.yaml rename to site/services/test/2_template.yaml diff --git a/site/services/stand2/50_nextcloud.yaml b/site/services/test/50_nextcloud.yaml similarity index 100% rename from site/services/stand2/50_nextcloud.yaml rename to site/services/test/50_nextcloud.yaml diff --git a/site/services/stand2/81_superset.yaml b/site/services/test/81_superset.yaml similarity index 100% rename from site/services/stand2/81_superset.yaml rename to site/services/test/81_superset.yaml diff --git a/site/services/stand2/82_harbor.yaml b/site/services/test/82_harbor.yaml similarity index 100% rename from site/services/stand2/82_harbor.yaml rename to site/services/test/82_harbor.yaml diff --git a/site/services/stand2/86_k8s_velero.yaml b/site/services/test/86_k8s_velero.yaml similarity index 100% rename from site/services/stand2/86_k8s_velero.yaml rename to site/services/test/86_k8s_velero.yaml diff --git a/site/services/stand2/89_flask.yaml b/site/services/test/89_flask.yaml similarity index 100% rename from site/services/stand2/89_flask.yaml rename to site/services/test/89_flask.yaml diff --git a/site/services/stand2/90_postgres.yaml b/site/services/test/90_postgres.yaml similarity index 100% rename from site/services/stand2/90_postgres.yaml rename to site/services/test/90_postgres.yaml diff --git a/site/services/stand2/91_redis.yaml b/site/services/test/91_redis.yaml similarity index 100% rename from site/services/stand2/91_redis.yaml rename to site/services/test/91_redis.yaml diff --git a/site/services/stand2/92_mongodb.yaml b/site/services/test/92_mongodb.yaml similarity index 100% rename from site/services/stand2/92_mongodb.yaml rename to site/services/test/92_mongodb.yaml diff --git a/site/services/stand2/93_rabbitmq.yaml b/site/services/test/93_rabbitmq.yaml similarity index 100% rename from site/services/stand2/93_rabbitmq.yaml rename to site/services/test/93_rabbitmq.yaml diff --git a/site/services/stand2/94_lucee.yaml b/site/services/test/94_lucee.yaml similarity index 100% rename from site/services/stand2/94_lucee.yaml rename to site/services/test/94_lucee.yaml diff --git a/site/services/stand2/95_nodejs.yaml b/site/services/test/95_nodejs.yaml similarity index 100% rename from site/services/stand2/95_nodejs.yaml rename to site/services/test/95_nodejs.yaml diff --git a/site/services/stand2/96_pgadmin.yaml b/site/services/test/96_pgadmin.yaml similarity index 100% rename from site/services/stand2/96_pgadmin.yaml rename to site/services/test/96_pgadmin.yaml diff --git a/site/services/stand2/98_http.yaml b/site/services/test/98_http.yaml similarity index 100% rename from site/services/stand2/98_http.yaml rename to site/services/test/98_http.yaml diff --git a/site/services/stand3/99_gitea.yaml b/site/services/test/99_gitea.yaml similarity index 100% rename from site/services/stand3/99_gitea.yaml rename to site/services/test/99_gitea.yaml