diff --git a/extensions/resource-deployment/images/sql_bdc.svg b/extensions/big-data-cluster/images/sql_bdc.svg similarity index 100% rename from extensions/resource-deployment/images/sql_bdc.svg rename to extensions/big-data-cluster/images/sql_bdc.svg diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb b/extensions/big-data-cluster/notebooks/deployment/2019/deploy-bdc-aks.ipynb similarity index 100% rename from extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-aks.ipynb rename to extensions/big-data-cluster/notebooks/deployment/2019/deploy-bdc-aks.ipynb diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb b/extensions/big-data-cluster/notebooks/deployment/2019/deploy-bdc-existing-aks.ipynb similarity index 100% rename from extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb rename to extensions/big-data-cluster/notebooks/deployment/2019/deploy-bdc-existing-aks.ipynb diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aro.ipynb b/extensions/big-data-cluster/notebooks/deployment/2019/deploy-bdc-existing-aro.ipynb similarity index 100% rename from extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-aro.ipynb rename to extensions/big-data-cluster/notebooks/deployment/2019/deploy-bdc-existing-aro.ipynb diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb b/extensions/big-data-cluster/notebooks/deployment/2019/deploy-bdc-existing-kubeadm.ipynb similarity index 100% rename from extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb rename to extensions/big-data-cluster/notebooks/deployment/2019/deploy-bdc-existing-kubeadm.ipynb diff --git a/extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-openshift.ipynb b/extensions/big-data-cluster/notebooks/deployment/2019/deploy-bdc-existing-openshift.ipynb similarity index 100% rename from extensions/resource-deployment/notebooks/bdc/2019/deploy-bdc-existing-openshift.ipynb rename to extensions/big-data-cluster/notebooks/deployment/2019/deploy-bdc-existing-openshift.ipynb diff --git a/extensions/big-data-cluster/package.json b/extensions/big-data-cluster/package.json index 40aa4c63f2..6a24bb445f 100644 --- a/extensions/big-data-cluster/package.json +++ b/extensions/big-data-cluster/package.json @@ -12,6 +12,7 @@ "azdata": "*" }, "activationEvents": [ + "onCommand:azdata.resource.deploy", "onCommand:bigDataClusters.command.mount", "onCommand:bigDataClusters.command.refreshmount", "onCommand:bigDataClusters.command.deletemount", @@ -178,6 +179,174 @@ "contents": "%bdc.view.welcome.loading%", "when": "!bdc.loaded" } + ], + "resourceDeploymentTypes": [ + { + "name": "sql-bdc", + "displayIndex": 3, + "displayName": "%resource-type-sql-bdc-display-name%", + "description": "%resource-type-sql-bdc-description%", + "platforms": "*", + "icon": "./images/sql_bdc.svg", + "tags": [ + "On-premises", + "SQL Server", + "Cloud" + ], + "options": [ + { + "name": "version", + "displayName": "%version-display-name%", + "values": [ + { + "name": "bdc2019", + "displayName": "%bdc-2019-display-name%" + } + ] + }, + { + "name": "target", + "displayName": "%bdc-deployment-target%", + "values": [ + { + "name": "new-aks", + "displayName": "%bdc-deployment-target-new-aks%" + }, + { + "name": "existing-aks", + "displayName": "%bdc-deployment-target-existing-aks%" + }, + { + "name": "existing-kubeadm", + "displayName": "%bdc-deployment-target-existing-kubeadm%" + }, + { + "name": "existing-aro", + "displayName": "%bdc-deployment-target-existing-aro%" + }, + { + "name": "existing-openshift", + "displayName": "%bdc-deployment-target-existing-openshift%" + } + ] + } + ], + "providers": [ + { + "name": "sql-bdc_new-aks_bdc2019", + "bdcWizard": { + "type": "new-aks", + "notebook": "./notebooks/deployment/2019/deploy-bdc-aks.ipynb" + }, + "requiredTools": [ + { + "name": "kubectl", + "version": "1.13.0" + }, + { + "name": "azure-cli" + }, + { + "name": "azdata-old", + "version": "20.3.1" + } + ], + "when": "target=new-aks&&version=bdc2019" + }, + { + "name": "sql-bdc_existing-aks_bdc2019", + "bdcWizard": { + "type": "existing-aks", + "notebook": "./notebooks/deployment/2019/deploy-bdc-existing-aks.ipynb" + }, + "requiredTools": [ + { + "name": "kubectl", + "version": "1.13.0" + }, + { + "name": "azdata-old", + "version": "20.3.1" + } + ], + "when": "target=existing-aks&&version=bdc2019" + }, + { + "name": "sql-bdc_existing-kubeadm_bdc2019", + "bdcWizard": { + "type": "existing-kubeadm", + "notebook": "./notebooks/deployment/2019/deploy-bdc-existing-kubeadm.ipynb" + }, + "requiredTools": [ + { + "name": "kubectl", + "version": "1.13.0" + }, + { + "name": "azdata-old", + "version": "20.3.1" + } + ], + "when": "target=existing-kubeadm&&version=bdc2019" + }, + { + "name": "sql-bdc_existing-aro_bdc2019", + "bdcWizard": { + "type": "existing-aro", + "notebook": "./notebooks/deployment/2019/deploy-bdc-existing-aro.ipynb" + }, + "requiredTools": [ + { + "name": "kubectl", + "version": "1.13.0" + }, + { + "name": "azdata-old", + "version": "20.3.1" + } + ], + "when": "target=existing-aro&&version=bdc2019" + }, + { + "name": "sql-bdc_existing-openshift_bdc2019", + "bdcWizard": { + "type": "existing-openshift", + "notebook": "./notebooks/deployment/2019/deploy-bdc-existing-openshift.ipynb" + }, + "requiredTools": [ + { + "name": "kubectl", + "version": "1.13.0" + }, + { + "name": "azdata-old", + "version": "20.3.1" + } + ], + "when": "target=existing-openshift&&version=bdc2019" + } + ], + "agreements": [ + { + "template": "%bdc-agreement%", + "links": [ + { + "text": "%microsoft-privacy-statement%", + "url": "https://go.microsoft.com/fwlink/?LinkId=853010" + }, + { + "text": "%bdc-agreement-bdc-eula%", + "url": "https://go.microsoft.com/fwlink/?LinkId=2002534" + }, + { + "text": "%bdc-agreement-azdata-eula%", + "url": "https://aka.ms/eula-azdata-en" + } + ], + "when": "true" + } + ] + } ] }, "dependencies": { diff --git a/extensions/big-data-cluster/package.nls.json b/extensions/big-data-cluster/package.nls.json index c768774192..aee045d3ed 100644 --- a/extensions/big-data-cluster/package.nls.json +++ b/extensions/big-data-cluster/package.nls.json @@ -12,5 +12,35 @@ "bdc.configuration.title": "Big Data Cluster", "bdc.view.welcome.connect": "No SQL Big Data Cluster controllers registered. [Learn More](https://docs.microsoft.com/sql/big-data-cluster/big-data-cluster-overview)\n[Connect Controller](command:bigDataClusters.command.connectController)", "bdc.view.welcome.loading": "Loading controllers...", - "bdc.ignoreSslVerification.desc": "Ignore SSL verification errors against SQL Server Big Data Cluster endpoints such as HDFS, Spark, and Controller if true" + "bdc.ignoreSslVerification.desc": "Ignore SSL verification errors against SQL Server Big Data Cluster endpoints such as HDFS, Spark, and Controller if true", + "resource-type-sql-bdc-display-name": "SQL Server Big Data Cluster", + "resource-type-sql-bdc-description": "SQL Server Big Data Cluster allows you to deploy scalable clusters of SQL Server, Spark, and HDFS containers running on Kubernetes", + "version-display-name": "Version", + "bdc-2019-display-name": "SQL Server 2019", + "bdc-deployment-target": "Deployment target", + "bdc-deployment-target-new-aks": "New Azure Kubernetes Service Cluster", + "bdc-deployment-target-existing-aks": "Existing Azure Kubernetes Service Cluster", + "bdc-deployment-target-existing-kubeadm": "Existing Kubernetes Cluster (kubeadm)", + "bdc-deployment-target-existing-aro": "Existing Azure Red Hat OpenShift cluster", + "bdc-deployment-target-existing-openshift": "Existing OpenShift cluster", + "bdc-cluster-settings-section-title": "SQL Server Big Data Cluster settings", + "bdc-cluster-name-field": "Cluster name", + "bdc-controller-username-field": "Controller username", + "bdc-password-field": "Password", + "bdc-confirm-password-field": "Confirm password", + "bdc-azure-settings-section-title": "Azure settings", + "bdc-azure-subscription-id-field": "Subscription id", + "bdc-azure-subscription-id-placeholder": "Use my default Azure subscription", + "bdc-azure-resource-group-field": "Resource group name", + "bdc-azure-region-field": "Region", + "bdc-azure-aks-name-field": "AKS cluster name", + "bdc-azure-vm-size-field": "VM size", + "bdc-azure-vm-count-field": "VM count", + "bdc-storage-class-field": "Storage class name", + "bdc-data-size-field": "Capacity for data (GB)", + "bdc-log-size-field": "Capacity for logs (GB)", + "bdc-agreement": "I accept {0}, {1} and {2}.", + "microsoft-privacy-statement": "Microsoft Privacy Statement", + "bdc-agreement-azdata-eula": "azdata License Terms", + "bdc-agreement-bdc-eula": "SQL Server License Terms" } diff --git a/extensions/resource-deployment/package.json b/extensions/resource-deployment/package.json index a8d582b9bd..6f258d5ccc 100644 --- a/extensions/resource-deployment/package.json +++ b/extensions/resource-deployment/package.json @@ -198,172 +198,6 @@ } ] }, - { - "name": "sql-bdc", - "displayIndex": 3, - "displayName": "%resource-type-sql-bdc-display-name%", - "description": "%resource-type-sql-bdc-description%", - "platforms": "*", - "icon": "./images/sql_bdc.svg", - "tags": [ - "On-premises", - "SQL Server", - "Cloud" - ], - "options": [ - { - "name": "version", - "displayName": "%version-display-name%", - "values": [ - { - "name": "bdc2019", - "displayName": "%bdc-2019-display-name%" - } - ] - }, - { - "name": "target", - "displayName": "%bdc-deployment-target%", - "values": [ - { - "name": "new-aks", - "displayName": "%bdc-deployment-target-new-aks%" - }, - { - "name": "existing-aks", - "displayName": "%bdc-deployment-target-existing-aks%" - }, - { - "name": "existing-kubeadm", - "displayName": "%bdc-deployment-target-existing-kubeadm%" - }, - { - "name": "existing-aro", - "displayName": "%bdc-deployment-target-existing-aro%" - }, - { - "name": "existing-openshift", - "displayName": "%bdc-deployment-target-existing-openshift%" - } - ] - } - ], - "providers": [ - { - "name": "sql-bdc_new-aks_bdc2019", - "bdcWizard": { - "type": "new-aks", - "notebook": "./notebooks/bdc/2019/deploy-bdc-aks.ipynb" - }, - "requiredTools": [ - { - "name": "kubectl", - "version": "1.13.0" - }, - { - "name": "azure-cli" - }, - { - "name": "azdata-old", - "version": "20.3.1" - } - ], - "when": "target=new-aks&&version=bdc2019" - }, - { - "name": "sql-bdc_existing-aks_bdc2019", - "bdcWizard": { - "type": "existing-aks", - "notebook": "./notebooks/bdc/2019/deploy-bdc-existing-aks.ipynb" - }, - "requiredTools": [ - { - "name": "kubectl", - "version": "1.13.0" - }, - { - "name": "azdata-old", - "version": "20.3.1" - } - ], - "when": "target=existing-aks&&version=bdc2019" - }, - { - "name": "sql-bdc_existing-kubeadm_bdc2019", - "bdcWizard": { - "type": "existing-kubeadm", - "notebook": "./notebooks/bdc/2019/deploy-bdc-existing-kubeadm.ipynb" - }, - "requiredTools": [ - { - "name": "kubectl", - "version": "1.13.0" - }, - { - "name": "azdata-old", - "version": "20.3.1" - } - ], - "when": "target=existing-kubeadm&&version=bdc2019" - }, - { - "name": "sql-bdc_existing-aro_bdc2019", - "bdcWizard": { - "type": "existing-aro", - "notebook": "./notebooks/bdc/2019/deploy-bdc-existing-aro.ipynb" - }, - "requiredTools": [ - { - "name": "kubectl", - "version": "1.13.0" - }, - { - "name": "azdata-old", - "version": "20.3.1" - } - ], - "when": "target=existing-aro&&version=bdc2019" - }, - { - "name": "sql-bdc_existing-openshift_bdc2019", - "bdcWizard": { - "type": "existing-openshift", - "notebook": "./notebooks/bdc/2019/deploy-bdc-existing-openshift.ipynb" - }, - "requiredTools": [ - { - "name": "kubectl", - "version": "1.13.0" - }, - { - "name": "azdata-old", - "version": "20.3.1" - } - ], - "when": "target=existing-openshift&&version=bdc2019" - } - ], - "agreements": [ - { - "template": "%bdc-agreement%", - "links": [ - { - "text": "%microsoft-privacy-statement%", - "url": "https://go.microsoft.com/fwlink/?LinkId=853010" - }, - { - "text": "%bdc-agreement-bdc-eula%", - "url": "https://go.microsoft.com/fwlink/?LinkId=2002534" - }, - { - "text": "%bdc-agreement-azdata-eula%", - "url": "https://aka.ms/eula-azdata-en" - } - ], - "when": "true" - } - ] - }, { "name": "sql-windows-setup", "displayIndex": 1, diff --git a/extensions/resource-deployment/package.nls.json b/extensions/resource-deployment/package.nls.json index 3d0cb5b494..15ba89de14 100644 --- a/extensions/resource-deployment/package.nls.json +++ b/extensions/resource-deployment/package.nls.json @@ -5,46 +5,18 @@ "deploy-resource-command-category": "Deployment", "resource-type-sql-image-display-name": "SQL Server container image", "resource-type-sql-image-description": "Run SQL Server container image with docker", - "resource-type-sql-bdc-display-name": "SQL Server Big Data Cluster", - "resource-type-sql-bdc-description": "SQL Server Big Data Cluster allows you to deploy scalable clusters of SQL Server, Spark, and HDFS containers running on Kubernetes", "version-display-name": "Version", "sql-2017-display-name": "SQL Server 2017", "sql-2019-display-name": "SQL Server 2019", - "bdc-2019-display-name": "SQL Server 2019", - "bdc-deployment-target": "Deployment target", - "bdc-deployment-target-new-aks": "New Azure Kubernetes Service Cluster", - "bdc-deployment-target-existing-aks": "Existing Azure Kubernetes Service Cluster", - "bdc-deployment-target-existing-kubeadm": "Existing Kubernetes Cluster (kubeadm)", - "bdc-deployment-target-existing-aro": "Existing Azure Red Hat OpenShift cluster", - "bdc-deployment-target-existing-openshift": "Existing OpenShift cluster", "docker-sql-2017-title": "Deploy SQL Server 2017 container images", "docker-sql-2019-title": "Deploy SQL Server 2019 container images", "docker-container-name-field": "Container name", "docker-sql-password-field": "SQL Server password", "docker-confirm-sql-password-field": "Confirm password", "docker-sql-port-field": "Port", - "bdc-cluster-settings-section-title": "SQL Server Big Data Cluster settings", - "bdc-cluster-name-field": "Cluster name", - "bdc-controller-username-field": "Controller username", - "bdc-password-field": "Password", - "bdc-confirm-password-field": "Confirm password", - "bdc-azure-settings-section-title": "Azure settings", - "bdc-azure-subscription-id-field": "Subscription id", - "bdc-azure-subscription-id-placeholder": "Use my default Azure subscription", - "bdc-azure-resource-group-field": "Resource group name", - "bdc-azure-region-field": "Region", - "bdc-azure-aks-name-field": "AKS cluster name", - "bdc-azure-vm-size-field": "VM size", - "bdc-azure-vm-count-field": "VM count", - "bdc-storage-class-field": "Storage class name", - "bdc-data-size-field": "Capacity for data (GB)", - "bdc-log-size-field": "Capacity for logs (GB)", "resource-type-sql-windows-setup-display-name": "SQL Server on Windows", "resource-type-sql-windows-setup-description": "Run SQL Server on Windows, select a version to get started.", - "bdc-agreement": "I accept {0}, {1} and {2}.", "microsoft-privacy-statement": "Microsoft Privacy Statement", - "bdc-agreement-azdata-eula": "azdata License Terms", - "bdc-agreement-bdc-eula": "SQL Server License Terms", "deployment.configuration.title": "Deployment configuration", "azdata-install-location-description": "Location of the azdata package used for the install command", "azure-sqlvm-display-name": "SQL Server on Azure Virtual Machine",