From 1a4b427afcecc6ef8f03496bcd74ea7398f5c0d2 Mon Sep 17 00:00:00 2001 From: Jonathan Chang Date: Wed, 4 Dec 2024 14:41:17 -0800 Subject: [PATCH] fix istio schema --- config/config.msft.yaml | 10 +- config/config.schema.json | 1199 +++++++++++++++++++------------------ 2 files changed, 618 insertions(+), 591 deletions(-) diff --git a/config/config.msft.yaml b/config/config.msft.yaml index 161a5e355..176d69705 100644 --- a/config/config.msft.yaml +++ b/config/config.msft.yaml @@ -28,12 +28,12 @@ defaults: kvName: arohcp-etcd-{{ .ctx.regionShort }} kvSoftDelete: true istio: - old: "asm-1-22" - new: "" + currentVersion: "asm-1-22" + newVersion: "" tag: "prod-stable" - istioctl: - version: "1.23.1" - url: "https://istio.io/downloadIstio" + istioctl: + version: "1.23.1" + url: "https://istio.io/downloadIstio" # MGMT cluster specifics mgmt: diff --git a/config/config.schema.json b/config/config.schema.json index f5b6c6345..75cb1ffca 100644 --- a/config/config.schema.json +++ b/config/config.schema.json @@ -1,617 +1,644 @@ { - "$schema": "http://json-schema.org/draft-07/schema#", - "title": "Generated schema for Root", - "type": "object", - "properties": { - "acrName": { - "type": "string" - }, - "aksName": { - "type": "string" - }, - "aroDevopsMsiId": { - "type": "string" - }, - "baseDnsZoneName": { - "type": "string" - }, - "baseDnsZoneRG": { - "type": "string" - }, - "clusterService": { - "type": "object", - "properties": { - "acrRG": { - "type": "string" - }, - "imageRepo": { - "type": "string" - }, - "imageTag": { - "type": "string" - }, - "postgres": { - "type": "object", - "properties": { - "deploy": { - "type": "boolean" - }, - "name": { - "type": "string" - }, - "private": { - "type": "boolean" - }, - "minTLSVersion": { - "type": "string", - "enum": ["TLSV1.2", "TLSV1.3"] - } + "$schema": "http://json-schema.org/draft-07/schema#", + "title": "Generated schema for Root", + "type": "object", + "properties": { + "acrName": { + "type": "string" + }, + "aksName": { + "type": "string" + }, + "aroDevopsMsiId": { + "type": "string" + }, + "baseDnsZoneName": { + "type": "string" + }, + "baseDnsZoneRG": { + "type": "string" + }, + "clusterService": { + "type": "object", + "properties": { + "acrRG": { + "type": "string" + }, + "imageRepo": { + "type": "string" + }, + "imageTag": { + "type": "string" + }, + "postgres": { + "type": "object", + "properties": { + "deploy": { + "type": "boolean" }, - "required": [ - "deploy", - "name", - "private", - "minTLSVersion" - ] - } + "name": { + "type": "string" + }, + "private": { + "type": "boolean" + }, + "minTLSVersion": { + "type": "string", + "enum": [ + "TLSV1.2", + "TLSV1.3" + ] + } + }, + "required": [ + "deploy", + "name", + "private", + "minTLSVersion" + ] + } + }, + "additionalProperties": false, + "required": [ + "acrRG", + "imageRepo", + "imageTag", + "postgres" + ] + }, + "cxKeyVault": { + "type": "object", + "properties": { + "name": { + "type": "string" }, - "additionalProperties": false, - "required": [ - "acrRG", - "imageRepo", - "imageTag", - "postgres" - ] - }, - "cxKeyVault": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "private": { - "type": "boolean" - }, - "softDelete": { - "type": "boolean" - } + "private": { + "type": "boolean" }, - "additionalProperties": false, - "required": [ - "name", - "private", - "softDelete" - ] - }, - "extraVars": { - "type": "object", - "properties": {}, - "required": [] - }, - "firstPartyAppClientId": { - "type": "string" - }, - "miMockClientId": { - "type": "string" - }, - "miMockPrincipalId": { - "type": "string" - }, - "frontend": { - "type": "object", - "properties": { - "cosmosDB": { - "type": "object", - "properties": { - "deploy": { - "type": "boolean" - }, - "disableLocalAuth": { - "type": "boolean" - }, - "name": { - "type": "string" - }, - "private": { - "type": "boolean" - } + "softDelete": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "name", + "private", + "softDelete" + ] + }, + "extraVars": { + "type": "object", + "properties": {}, + "required": [] + }, + "firstPartyAppClientId": { + "type": "string" + }, + "miMockClientId": { + "type": "string" + }, + "miMockPrincipalId": { + "type": "string" + }, + "frontend": { + "type": "object", + "properties": { + "cosmosDB": { + "type": "object", + "properties": { + "deploy": { + "type": "boolean" }, - "additionalProperties": false, - "required": [ - "deploy", - "disableLocalAuth", - "name", - "private" - ] - } + "disableLocalAuth": { + "type": "boolean" + }, + "name": { + "type": "string" + }, + "private": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "deploy", + "disableLocalAuth", + "name", + "private" + ] + } + }, + "additionalProperties": false, + "required": [ + "cosmosDB" + ] + }, + "globalRG": { + "type": "string" + }, + "hypershift": { + "type": "object", + "properties": { + "additionalInstallArg": { + "type": "string" }, - "additionalProperties": false, - "required": [ - "cosmosDB" - ] - }, - "globalRG": { - "type": "string" - }, - "hypershift": { - "type": "object", - "properties": { - "additionalInstallArg": { - "type": "string" - }, - "namespace": { - "type": "string" - } + "namespace": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "additionalInstallArg", + "namespace" + ] + }, + "hypershiftOperator": { + "type": "object", + "properties": { + "imageTag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "imageTag" + ] + }, + "imageSync": { + "type": "object", + "properties": { + "acrRG": { + "type": "string" }, - "additionalProperties": false, - "required": [ - "additionalInstallArg", - "namespace" - ] - }, - "hypershiftOperator": { - "type": "object", - "properties": { - "imageTag": { - "type": "string" - } + "environmentName": { + "type": "string" }, - "additionalProperties": false, - "required": [ - "imageTag" - ] - }, - "imageSync": { - "type": "object", - "properties": { - "acrRG": { - "type": "string" - }, - "environmentName": { - "type": "string" - }, - "imageRepo": { - "type": "string" - }, - "imageTag": { - "type": "string" - }, - "repositories": { - "type": "string" - }, - "rg": { - "type": "string" - } + "imageRepo": { + "type": "string" }, - "additionalProperties": false, - "required": [ - "acrRG", - "environmentName", - "imageRepo", - "imageTag", - "repositories", - "rg" - ] - }, - "istioVersion": { - "type": "string" - }, - "kubernetesVersion": { - "type": "string" - }, - "maestro": { - "type": "object", - "properties": { - "certDomain": { - "type": "string" - }, - "consumerName": { - "type": "string" - }, - "serverMqttClientName": { - "type": "string" - }, - "eventGrid": { - "type": "object", - "properties": { - "maxClientSessionsPerAuthName": { - "type": "integer" - }, - "name": { - "type": "string" - }, - "private": { - "type": "boolean" - } + "imageTag": { + "type": "string" + }, + "repositories": { + "type": "string" + }, + "rg": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "acrRG", + "environmentName", + "imageRepo", + "imageTag", + "repositories", + "rg" + ] + }, + "istioVersion": { + "type": "string" + }, + "kubernetesVersion": { + "type": "string" + }, + "maestro": { + "type": "object", + "properties": { + "certDomain": { + "type": "string" + }, + "consumerName": { + "type": "string" + }, + "serverMqttClientName": { + "type": "string" + }, + "eventGrid": { + "type": "object", + "properties": { + "maxClientSessionsPerAuthName": { + "type": "integer" }, - "additionalProperties": false, - "required": [ - "maxClientSessionsPerAuthName", - "name", - "private" - ] - }, - "imageBase": { - "type": "string" - }, - "imageTag": { - "type": "string" - }, - "postgres": { - "type": "object", - "properties": { - "deploy": { - "type": "boolean" - }, - "name": { - "type": "string" - }, - "private": { - "type": "boolean" - }, - "serverStorageSizeGB": { - "type": "integer" - }, - "serverVersion": { - "type": "string" - }, - "minTLSVersion": { - "type": "string", - "enum": ["TLSV1.2", "TLSV1.3"] - } + "name": { + "type": "string" }, - "additionalProperties": false, - "required": [ - "deploy", - "name", - "private", - "serverStorageSizeGB", - "serverVersion", - "minTLSVersion" - ] - }, - "restrictIstioIngress": { - "type": "boolean" - } + "private": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "maxClientSessionsPerAuthName", + "name", + "private" + ] }, - "additionalProperties": false, - "required": [ - "certDomain", - "consumerName", - "serverMqttClientName", - "eventGrid", - "imageBase", - "imageTag", - "postgres", - "restrictIstioIngress" - ] - }, - "mgmt": { - "type": "object", - "properties": { - "etcd": { - "type": "object", - "properties": { - "kvName": { - "type": "string" - }, - "kvSoftDelete": { - "type": "boolean" - } + "imageBase": { + "type": "string" + }, + "imageTag": { + "type": "string" + }, + "postgres": { + "type": "object", + "properties": { + "deploy": { + "type": "boolean" }, - "additionalProperties": false, - "required": [ - "kvName", - "kvSoftDelete" - ] - }, - "rg": { - "type": "string" - }, - "subscription": { - "type": "string" - }, - "clusterServiceResourceId": { - "type": "string" - }, - "systemAgentPool": { - "type": "object", - "properties": { - "maxCount": { - "type": "number" - }, - "minCount": { - "type": "number" - }, - "osDiskSizeGB": { - "type": "number" - }, - "vmSize": { - "type": "string" - } + "name": { + "type": "string" }, - "additionalProperties": false, - "required": [ - "maxCount", - "minCount", - "osDiskSizeGB", - "vmSize" - ] - }, - "userAgentPool": { - "type": "object", - "properties": { - "azCount": { - "type": "number" - }, - "maxCount": { - "type": "number" - }, - "minCount": { - "type": "number" - }, - "osDiskSizeGB": { - "type": "number" - }, - "vmSize": { - "type": "string" - } + "private": { + "type": "boolean" }, - "additionalProperties": false, - "required": [ - "azCount", - "maxCount", - "minCount", - "osDiskSizeGB", - "vmSize" - ] - } + "serverStorageSizeGB": { + "type": "integer" + }, + "serverVersion": { + "type": "string" + }, + "minTLSVersion": { + "type": "string", + "enum": [ + "TLSV1.2", + "TLSV1.3" + ] + } + }, + "additionalProperties": false, + "required": [ + "deploy", + "name", + "private", + "serverStorageSizeGB", + "serverVersion", + "minTLSVersion" + ] }, - "additionalProperties": false, - "required": [ - "clusterServiceResourceId", - "etcd", - "rg", - "systemAgentPool", - "subscription", - "userAgentPool" - ] - }, - "mgmtKeyVault": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "private": { - "type": "boolean" - }, - "softDelete": { - "type": "boolean" - } + "restrictIstioIngress": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "certDomain", + "consumerName", + "serverMqttClientName", + "eventGrid", + "imageBase", + "imageTag", + "postgres", + "restrictIstioIngress" + ] + }, + "mgmt": { + "type": "object", + "properties": { + "etcd": { + "type": "object", + "properties": { + "kvName": { + "type": "string" + }, + "kvSoftDelete": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "kvName", + "kvSoftDelete" + ] }, - "additionalProperties": false, - "required": [ - "name", - "private", - "softDelete" - ] - }, - "monitoring": { - "type": "object", - "properties": { - "grafanaAdminGroupPrincipalId": { - "type": "string" - }, - "grafanaName": { - "type": "string" - }, - "msiName": { - "type": "string" - }, - "workspaceName": { - "type": "string" - } + "rg": { + "type": "string" }, - "additionalProperties": false, - "required": [ - "grafanaAdminGroupPrincipalId", - "grafanaName", - "msiName", - "workspaceName" - ] - }, - "msiKeyVault": { - "type": "object", - "properties": { - "name": { - "type": "string" - }, - "private": { - "type": "boolean" - }, - "softDelete": { - "type": "boolean" - } + "subscription": { + "type": "string" }, - "additionalProperties": false, - "required": [ - "name", - "private", - "softDelete" - ] - }, - "ocMirror": { - "type": "object", - "properties": { - "imageRepo": { - "type": "string" - }, - "imageTag": { - "type": "string" - } + "clusterServiceResourceId": { + "type": "string" }, - "additionalProperties": false, - "required": [ - "imageRepo", - "imageTag" - ] - }, - "ocpAcrName": { - "type": "string" - }, - "oidcStorageAccountName": { - "type": "string" - }, - "podSubnetPrefix": { - "type": "string" - }, - "region": { - "type": "string" - }, - "regionRG": { - "type": "string" - }, - "regionalDNSSubdomain": { - "type": "string" - }, - "serviceComponentAcrResourceGroups": { - "type": "string" - }, - "serviceKeyVault": { - "type": "object", - "properties": { - "name": { + "systemAgentPool": { + "type": "object", + "properties": { + "maxCount": { + "type": "number" + }, + "minCount": { + "type": "number" + }, + "osDiskSizeGB": { + "type": "number" + }, + "vmSize": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "maxCount", + "minCount", + "osDiskSizeGB", + "vmSize" + ] + }, + "userAgentPool": { + "type": "object", + "properties": { + "azCount": { + "type": "number" + }, + "maxCount": { + "type": "number" + }, + "minCount": { + "type": "number" + }, + "osDiskSizeGB": { + "type": "number" + }, + "vmSize": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "azCount", + "maxCount", + "minCount", + "osDiskSizeGB", + "vmSize" + ] + } + }, + "additionalProperties": false, + "required": [ + "clusterServiceResourceId", + "etcd", + "rg", + "systemAgentPool", + "subscription", + "userAgentPool" + ] + }, + "mgmtKeyVault": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "private": { + "type": "boolean" + }, + "softDelete": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "name", + "private", + "softDelete" + ] + }, + "monitoring": { + "type": "object", + "properties": { + "grafanaAdminGroupPrincipalId": { + "type": "string" + }, + "grafanaName": { + "type": "string" + }, + "msiName": { + "type": "string" + }, + "workspaceName": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "grafanaAdminGroupPrincipalId", + "grafanaName", + "msiName", + "workspaceName" + ] + }, + "msiKeyVault": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "private": { + "type": "boolean" + }, + "softDelete": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "name", + "private", + "softDelete" + ] + }, + "ocMirror": { + "type": "object", + "properties": { + "imageRepo": { + "type": "string" + }, + "imageTag": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "imageRepo", + "imageTag" + ] + }, + "ocpAcrName": { + "type": "string" + }, + "oidcStorageAccountName": { + "type": "string" + }, + "podSubnetPrefix": { + "type": "string" + }, + "region": { + "type": "string" + }, + "regionRG": { + "type": "string" + }, + "regionalDNSSubdomain": { + "type": "string" + }, + "serviceComponentAcrResourceGroups": { + "type": "string" + }, + "serviceKeyVault": { + "type": "object", + "properties": { + "name": { + "type": "string" + }, + "private": { + "type": "boolean" + }, + "region": { + "type": "string" + }, + "rg": { + "type": "string" + }, + "softDelete": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "name", + "private", + "region", + "rg", + "softDelete" + ] + }, + "subnetPrefix": { + "type": "string" + }, + "svc": { + "type": "object", + "properties": { + "etcd": { + "type": "object", + "properties": { + "kvName": { + "type": "string" + }, + "kvSoftDelete": { + "type": "boolean" + } + }, + "additionalProperties": false, + "required": [ + "kvName", + "kvSoftDelete" + ] + }, + "istio": { + "type": "object", + "currentVersion": { "type": "string" }, - "private": { - "type": "boolean" - }, - "region": { + "newVersion": { "type": "string" }, - "rg": { + "tag": { "type": "string" }, - "softDelete": { - "type": "boolean" + "istioctl": { + "type": "object", + "version": { + "type": "string" + }, + "url": { + "type": "string" + } } }, - "additionalProperties": false, - "required": [ - "name", - "private", - "region", - "rg", - "softDelete" - ] - }, - "subnetPrefix": { - "type": "string" - }, - "svc": { - "type": "object", - "properties": { - "etcd": { - "type": "object", - "properties": { - "kvName": { - "type": "string" - }, - "kvSoftDelete": { - "type": "boolean" - } + "userAgentPool": { + "type": "object", + "properties": { + "azCount": { + "type": "number" }, - "additionalProperties": false, - "required": [ - "kvName", - "kvSoftDelete" - ] - }, - "userAgentPool": { - "type": "object", - "properties": { - "azCount": { - "type": "number" - }, - "maxCount": { - "type": "number" - }, - "minCount": { - "type": "number" - }, - "osDiskSizeGB": { - "type": "number" - }, - "vmSize": { - "type": "string" - } + "maxCount": { + "type": "number" }, - "additionalProperties": false, - "required": [ - "azCount", - "maxCount", - "minCount", - "osDiskSizeGB", - "vmSize" - ] - }, - "rg": { - "type": "string" - }, - "subscription": { - "type": "string" - } + "minCount": { + "type": "number" + }, + "osDiskSizeGB": { + "type": "number" + }, + "vmSize": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "azCount", + "maxCount", + "minCount", + "osDiskSizeGB", + "vmSize" + ] }, - "additionalProperties": false, - "required": [ - "etcd", - "rg", - "subscription", - "userAgentPool" - ] - }, - "svcAcrName": { - "type": "string" - }, - "vnetAddressPrefix": { - "type": "string" - } - }, - "additionalProperties": false, - "required": [ - "acrName", - "aksName", - "aroDevopsMsiId", - "baseDnsZoneName", - "baseDnsZoneRG", - "clusterService", - "cxKeyVault", - "firstPartyAppClientId", - "frontend", - "globalRG", - "hypershift", - "hypershiftOperator", - "imageSync", - "istioVersion", - "kubernetesVersion", - "maestro", - "mgmt", - "mgmtKeyVault", - "monitoring", - "msiKeyVault", - "ocMirror", - "ocpAcrName", - "oidcStorageAccountName", - "podSubnetPrefix", - "region", - "regionRG", - "regionalDNSSubdomain", - "serviceComponentAcrResourceGroups", - "serviceKeyVault", - "subnetPrefix", - "svc", - "svcAcrName", - "vnetAddressPrefix" - ] - } + "rg": { + "type": "string" + }, + "subscription": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "etcd", + "rg", + "subscription", + "userAgentPool" + ] + }, + "svcAcrName": { + "type": "string" + }, + "vnetAddressPrefix": { + "type": "string" + } + }, + "additionalProperties": false, + "required": [ + "acrName", + "aksName", + "aroDevopsMsiId", + "baseDnsZoneName", + "baseDnsZoneRG", + "clusterService", + "cxKeyVault", + "firstPartyAppClientId", + "frontend", + "globalRG", + "hypershift", + "hypershiftOperator", + "imageSync", + "istioVersion", + "kubernetesVersion", + "maestro", + "mgmt", + "mgmtKeyVault", + "monitoring", + "msiKeyVault", + "ocMirror", + "ocpAcrName", + "oidcStorageAccountName", + "podSubnetPrefix", + "region", + "regionRG", + "regionalDNSSubdomain", + "serviceComponentAcrResourceGroups", + "serviceKeyVault", + "subnetPrefix", + "svc", + "svcAcrName", + "vnetAddressPrefix" + ] +} \ No newline at end of file