From 3a1d150c6fbaa0a755aae1a1bba0a474998cd48d Mon Sep 17 00:00:00 2001 From: jkleinschnitz-msft <112512530+jkleinschnitz-msft@users.noreply.github.com> Date: Tue, 12 Sep 2023 12:05:01 -0600 Subject: [PATCH 1/5] changes for 1.22.0 --- .../azure/sqlmanagedinstances/azure.liquid | 9 +++++++++ arc_data_services/charts/arcdataservices/values.yaml | 2 +- ...-push-arc-data-services-images-to-private-registry.py | 4 ++-- arc_data_services/deploy/yaml/bootstrapper-unified.yaml | 4 ++-- arc_data_services/deploy/yaml/bootstrapper.yaml | 4 ++-- arc_data_services/deploy/yaml/data-controller.yaml | 2 +- arc_data_services/deploy/yaml/uninstall.yaml | 2 +- arc_data_services/test/launcher/base/kustomization.yaml | 2 +- .../upgrade/yaml/bootstrapper-upgrade-job.yaml | 4 ++-- .../upgrade/yaml/data-controller-upgrade.yaml | 2 +- .../upgrade/yaml/request_body/request-body-after.yaml | 2 +- .../upgrade/yaml/request_body/request-body-before.yaml | 2 +- .../aks/ARM/artifacts/DataServicesLogonScript.ps1 | 2 +- .../aks/DR/ARM/artifacts/DataServicesLogonScript.ps1 | 4 ++-- .../Migration/ARM/artifacts/DataServicesLogonScript.ps1 | 2 +- .../capi_azure/ARM/artifacts/DataServicesLogonScript.ps1 | 2 +- .../eks/terraform/artifacts/DataServicesLogonScript.ps1 | 2 +- .../gke/terraform/artifacts/DataServicesLogonScript.ps1 | 2 +- .../azure/ARM/artifacts/DataServicesLogonScript.ps1 | 2 +- .../arm_template/artifacts/DataServicesLogonScript.ps1 | 2 +- azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1 | 2 +- .../artifacts/DataServicesLogonScript.ps1 | 2 +- azure_jumpstart_hcibox/artifacts/Deploy-SQLMI.ps1 | 2 +- 23 files changed, 36 insertions(+), 27 deletions(-) diff --git a/arc_data_services/charts/arcdataservices/azure/sqlmanagedinstances/azure.liquid b/arc_data_services/charts/arcdataservices/azure/sqlmanagedinstances/azure.liquid index 1b6e2a4d44..c3ba687531 100644 --- a/arc_data_services/charts/arcdataservices/azure/sqlmanagedinstances/azure.liquid +++ b/arc_data_services/charts/arcdataservices/azure/sqlmanagedinstances/azure.liquid @@ -24,8 +24,10 @@ However, Liquid template does not support merging objects. In order for it to wo {%- assign preferredPrimaryReplicaSpec = resource.k8sRaw.spec.preferredPrimaryReplicaSpec -%} {%- assign backup = resource.k8sRaw.spec.backup -%} {%- assign settings = resource.k8sRaw.spec.settings -%} +{%- assign fileOverrideConfigMap = resource.k8sRaw.spec.fileOverrideConfigMap -%} {%- assign securityActiveDirectory = resource.k8sRaw.spec.security.activeDirectory -%} +{%- assign securityTransparentDataEncryption = resource.k8sRaw.spec.security.transparentDataEncryption -%} {%- assign serviceCertificateSecret = resource.k8sRaw.spec.security.serviceCertificateSecret -%} {%- assign update = resource.k8sRaw.spec.update -%} @@ -35,6 +37,7 @@ However, Liquid template does not support merging objects. In order for it to wo "spec": { {% if docker != nil %} "docker": {{ docker }}, {% endif %} {% if services != nil %} "services": {{ services }}, {% endif %} + {% if fileOverrideConfigMap != nil %} "fileOverrideConfigMap": {{ fileOverrideConfigMap | json }}, {% endif %} "security": { {% if securityActiveDirectory != nil %} "activeDirectory": { @@ -48,6 +51,12 @@ However, Liquid template does not support merging objects. In order for it to wo {% if securityActiveDirectory.encryptionTypes != nil %} "encryptionTypes": {{ securityActiveDirectory.encryptionTypes | json }}, {% endif %} }, {% endif %} + {% if securityTransparentDataEncryption != nil %} + "transparentDataEncryption": { + {% if securityTransparentDataEncryption.mode != nil %} "mode": {{ securityTransparentDataEncryption.mode | json }}, {% endif %} + {% if securityTransparentDataEncryption.protectorSecret != nil %} "protectorSecret": {{ securityTransparentDataEncryption.protectorSecret | json }}, {% endif %} + }, + {% endif %} {% if serviceCertificateSecret != nil %} "serviceCertificateSecret": {{ serviceCertificateSecret | json }}, {% endif %} {% if resource.k8sRaw.spec.security.adminLoginSecret != nil %} "adminLoginSecret": {{ resource.k8sRaw.spec.security.adminLoginSecret | json }} diff --git a/arc_data_services/charts/arcdataservices/values.yaml b/arc_data_services/charts/arcdataservices/values.yaml index 5a0d44e4d6..ed7d121d1c 100644 --- a/arc_data_services/charts/arcdataservices/values.yaml +++ b/arc_data_services/charts/arcdataservices/values.yaml @@ -38,7 +38,7 @@ Azure: InstallerServiceAccount: "" RuntimeServiceAccount: "" systemDefaultValues: - image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.22.0_2023-08-08 + image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.23.0_2023-09-12 imagePullPolicy: Always imagePullSecret: arc-private-registry installerServiceAccount: "" diff --git a/arc_data_services/deploy/scripts/pull-and-push-arc-data-services-images-to-private-registry.py b/arc_data_services/deploy/scripts/pull-and-push-arc-data-services-images-to-private-registry.py index fe3496a834..5ce2ade78c 100644 --- a/arc_data_services/deploy/scripts/pull-and-push-arc-data-services-images-to-private-registry.py +++ b/arc_data_services/deploy/scripts/pull-and-push-arc-data-services-images-to-private-registry.py @@ -54,9 +54,9 @@ def execute_cmd(cmd): if os.getenv("SOURCE_DOCKER_TAG") is None: SOURCE_DOCKER_TAG = ( input( - "Provide container image tag for the images at the source - press ENTER for using 'v1.22.0_2023-08-08': " + "Provide container image tag for the images at the source - press ENTER for using 'v1.23.0_2023-09-12': " ) - or "v1.22.0_2023-08-08" + or "v1.23.0_2023-09-12" ) else: SOURCE_DOCKER_TAG = os.environ["SOURCE_DOCKER_TAG"] diff --git a/arc_data_services/deploy/yaml/bootstrapper-unified.yaml b/arc_data_services/deploy/yaml/bootstrapper-unified.yaml index df3053fe3a..62e06eb22b 100644 --- a/arc_data_services/deploy/yaml/bootstrapper-unified.yaml +++ b/arc_data_services/deploy/yaml/bootstrapper-unified.yaml @@ -331,11 +331,11 @@ spec: kubernetes.io/os: linux containers: - name: bootstrapper - image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.22.0_2023-08-08 + image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.23.0_2023-09-12 imagePullPolicy: Always args: - -image - - mcr.microsoft.com/arcdata/arc-bootstrapper:v1.22.0_2023-08-08 + - mcr.microsoft.com/arcdata/arc-bootstrapper:v1.23.0_2023-09-12 - -policy - Always - -chart diff --git a/arc_data_services/deploy/yaml/bootstrapper.yaml b/arc_data_services/deploy/yaml/bootstrapper.yaml index 9c8fe2232c..20d50e7a08 100644 --- a/arc_data_services/deploy/yaml/bootstrapper.yaml +++ b/arc_data_services/deploy/yaml/bootstrapper.yaml @@ -9,11 +9,11 @@ spec: kubernetes.io/os: linux containers: - name: bootstrapper - image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.22.0_2023-08-08 + image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.23.0_2023-09-12 imagePullPolicy: Always args: - -image - - mcr.microsoft.com/arcdata/arc-bootstrapper:v1.22.0_2023-08-08 + - mcr.microsoft.com/arcdata/arc-bootstrapper:v1.23.0_2023-09-12 - -policy - Always - -chart diff --git a/arc_data_services/deploy/yaml/data-controller.yaml b/arc_data_services/deploy/yaml/data-controller.yaml index 98b2ee23cd..ac98191369 100644 --- a/arc_data_services/deploy/yaml/data-controller.yaml +++ b/arc_data_services/deploy/yaml/data-controller.yaml @@ -30,7 +30,7 @@ spec: serviceAccount: sa-arc-controller docker: imagePullPolicy: Always - imageTag: v1.22.0_2023-08-08 + imageTag: v1.23.0_2023-09-12 registry: mcr.microsoft.com repository: arcdata infrastructure: other # Must be a value in the array [alibaba, aws, azure, gcp, onpremises, other] diff --git a/arc_data_services/deploy/yaml/uninstall.yaml b/arc_data_services/deploy/yaml/uninstall.yaml index 3e6d693590..03307c7dc8 100644 --- a/arc_data_services/deploy/yaml/uninstall.yaml +++ b/arc_data_services/deploy/yaml/uninstall.yaml @@ -9,7 +9,7 @@ spec: kubernetes.io/os: linux containers: - name: bootstrapper - image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.22.0_2023-08-08 + image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.23.0_2023-09-12 imagePullPolicy: IfNotPresent args: ["-uninstall"] command: ["/opt/bootstrapper/bin/bootstrapper"] diff --git a/arc_data_services/test/launcher/base/kustomization.yaml b/arc_data_services/test/launcher/base/kustomization.yaml index aa38139c31..814411be6a 100644 --- a/arc_data_services/test/launcher/base/kustomization.yaml +++ b/arc_data_services/test/launcher/base/kustomization.yaml @@ -10,4 +10,4 @@ secretGenerator: images: - name: arc-ci-launcher newName: mcr.microsoft.com/arcdata/arc-ci-launcher - newTag: v1.22.0_2023-08-08 \ No newline at end of file + newTag: vv1.23.0_2023-09-12 \ No newline at end of file diff --git a/arc_data_services/upgrade/yaml/bootstrapper-upgrade-job.yaml b/arc_data_services/upgrade/yaml/bootstrapper-upgrade-job.yaml index 3d416aaf9b..3c58f41788 100644 --- a/arc_data_services/upgrade/yaml/bootstrapper-upgrade-job.yaml +++ b/arc_data_services/upgrade/yaml/bootstrapper-upgrade-job.yaml @@ -11,10 +11,10 @@ spec: - name: your-private-registry containers: - name: bootstrapper - image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.22.0_2023-08-08 + image: mcr.microsoft.com/arcdata/arc-bootstrapper:v1.23.0_2023-09-12 imagePullPolicy: Always command: ["/opt/bootstrapper/bin/bootstrapper"] - args: ["-image", "mcr.microsoft.com/arcdata/arc-bootstrapper:v1.22.0_2023-08-08", "-policy", "Always", "-chart", "/opt/helm/arcdataservices", "-bootstrap"] + args: ["-image", "mcr.microsoft.com/arcdata/arc-bootstrapper:v1.23.0_2023-09-12", "-policy", "Always", "-chart", "/opt/helm/arcdataservices", "-bootstrap"] resources: limits: cpu: 200m diff --git a/arc_data_services/upgrade/yaml/data-controller-upgrade.yaml b/arc_data_services/upgrade/yaml/data-controller-upgrade.yaml index e7f9ec5abd..6fe5b48721 100644 --- a/arc_data_services/upgrade/yaml/data-controller-upgrade.yaml +++ b/arc_data_services/upgrade/yaml/data-controller-upgrade.yaml @@ -4,4 +4,4 @@ metadata: name: arc spec: docker: - imageTag: v1.22.0_2023-08-08 + imageTag: v1.23.0_2023-09-12 diff --git a/arc_data_services/upgrade/yaml/request_body/request-body-after.yaml b/arc_data_services/upgrade/yaml/request_body/request-body-after.yaml index 1087a65721..b9af4d8156 100644 --- a/arc_data_services/upgrade/yaml/request_body/request-body-after.yaml +++ b/arc_data_services/upgrade/yaml/request_body/request-body-after.yaml @@ -27,7 +27,7 @@ }, "docker": { "imagePullPolicy": "Always", - "imageTag": "v1.22.0_2023-08-08", + "imageTag": "v1.23.0_2023-09-12", "registry": "", "repository": "" }, diff --git a/arc_data_services/upgrade/yaml/request_body/request-body-before.yaml b/arc_data_services/upgrade/yaml/request_body/request-body-before.yaml index 979d91e612..7b8954bc41 100644 --- a/arc_data_services/upgrade/yaml/request_body/request-body-before.yaml +++ b/arc_data_services/upgrade/yaml/request_body/request-body-before.yaml @@ -25,7 +25,7 @@ }, "docker": { "imagePullPolicy": "Always", - "imageTag": "v1.22.0_2023-08-08", + "imageTag": "v1.23.0_2023-09-12", "registry": "", "repository": "" }, diff --git a/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1 index 51c95d119d..bbda441b81 100644 --- a/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/aks/ARM/artifacts/DataServicesLogonScript.ps1 @@ -116,7 +116,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.22.0 ` + --version 1.23.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper diff --git a/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/DataServicesLogonScript.ps1 index c648ff518b..3dc678cbf4 100644 --- a/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/aks/DR/ARM/artifacts/DataServicesLogonScript.ps1 @@ -135,7 +135,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.22.0 ` + --version 1.23.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper ` @@ -229,7 +229,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.22.0 ` + --version 1.23.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper ` diff --git a/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1 index 236d1d7f4d..41f42ef4f7 100644 --- a/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/aks/Migration/ARM/artifacts/DataServicesLogonScript.ps1 @@ -224,7 +224,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.22.0 ` + --version 1.23.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper ` diff --git a/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1 index 6fc1fe5afa..033b5147d6 100644 --- a/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/cluster_api/capi_azure/ARM/artifacts/DataServicesLogonScript.ps1 @@ -110,7 +110,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.22.0 ` + --version 1.23.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper ` diff --git a/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1 index 0a8f4de8a6..4b0b746bd0 100644 --- a/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/eks/terraform/artifacts/DataServicesLogonScript.ps1 @@ -134,7 +134,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.22.0 ` + --version 1.23.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper diff --git a/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1 index 3bd4f2d6df..0c470c8881 100644 --- a/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/gke/terraform/artifacts/DataServicesLogonScript.ps1 @@ -123,7 +123,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.22.0 ` + --version 1.23.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper ` diff --git a/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1 index dc457171df..03a50d43c6 100644 --- a/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/kubeadm/azure/ARM/artifacts/DataServicesLogonScript.ps1 @@ -146,7 +146,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.22.0 ` + --version 1.23.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper diff --git a/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1 b/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1 index 6bdf93e92e..d3114e2f8d 100644 --- a/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1 +++ b/azure_arc_data_jumpstart/microk8s/azure/arm_template/artifacts/DataServicesLogonScript.ps1 @@ -112,7 +112,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.22.0 ` + --version 1.23.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-arc-bootstrapper ` diff --git a/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1 b/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1 index 48a3b04c3f..b2ba7a48c6 100644 --- a/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1 +++ b/azure_jumpstart_arcbox/artifacts/DataOpsLogonScript.ps1 @@ -192,7 +192,7 @@ foreach ($cluster in $clusters) { --auto-upgrade false ` --scope cluster ` --release-namespace arc ` - --version 1.22.0 ` + --version 1.23.0 ` --config Microsoft.CustomLocation.ServiceAccount=sa-bootstrapper Write-Host "`n" diff --git a/azure_jumpstart_arcbox/artifacts/DataServicesLogonScript.ps1 b/azure_jumpstart_arcbox/artifacts/DataServicesLogonScript.ps1 index 5c20fedd71..af2745e76d 100644 --- a/azure_jumpstart_arcbox/artifacts/DataServicesLogonScript.ps1 +++ b/azure_jumpstart_arcbox/artifacts/DataServicesLogonScript.ps1 @@ -99,7 +99,7 @@ az k8s-extension create --name arc-data-services ` --resource-group $Env:resourceGroup ` --auto-upgrade false ` --scope cluster ` - --version 1.22.0 ` + --version 1.23.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-bootstrapper diff --git a/azure_jumpstart_hcibox/artifacts/Deploy-SQLMI.ps1 b/azure_jumpstart_hcibox/artifacts/Deploy-SQLMI.ps1 index 0732ed071a..8c898749df 100644 --- a/azure_jumpstart_hcibox/artifacts/Deploy-SQLMI.ps1 +++ b/azure_jumpstart_hcibox/artifacts/Deploy-SQLMI.ps1 @@ -139,7 +139,7 @@ Invoke-Command -VMName $SDNConfig.HostList[0] -Credential $adcred -ScriptBlock { --resource-group $using:rg ` --auto-upgrade false ` --scope cluster ` - --version 1.22.0 ` + --version 1.23.0 ` --release-namespace arc ` --config Microsoft.CustomLocation.ServiceAccount=sa-bootstrapper ` --only-show-errors From 8e213cd353857100b703a91d91b27c55c1276286 Mon Sep 17 00:00:00 2001 From: Venkata Chintala <29983008+chintalavr@users.noreply.github.com> Date: Sat, 30 Sep 2023 08:25:28 -0400 Subject: [PATCH 2/5] Update clientVm.json Modified default SQL MI admin password to comply with new password policies. --- azure_jumpstart_arcbox/ARM/clientVm/clientVm.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json b/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json index a21a66fadd..7573638087 100644 --- a/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json +++ b/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json @@ -27,7 +27,7 @@ "type": "securestring", "minLength": 12, "maxLength": 123, - "defaultValue": "ArcPassword123!!", + "defaultValue": "aRkcQleMi$925!", "metadata": { "description": "Password for Windows account. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long" } @@ -355,4 +355,4 @@ "value": "[concat(reference(variables('publicIPAddressName')).IpAddress)]" } } -} \ No newline at end of file +} From 7f5ca47798df35676bcba5c1d1915bf4c5a8f06e Mon Sep 17 00:00:00 2001 From: Venkata Chintala <29983008+chintalavr@users.noreply.github.com> Date: Sat, 30 Sep 2023 12:25:49 -0400 Subject: [PATCH 3/5] Update clientVm.json Fixed arcdata password --- azure_jumpstart_arcbox/ARM/clientVm/clientVm.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json b/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json index 7573638087..b620d2beca 100644 --- a/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json +++ b/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json @@ -27,7 +27,7 @@ "type": "securestring", "minLength": 12, "maxLength": 123, - "defaultValue": "aRkcQleMi$925!", + "defaultValue": "ArcDemo123!!", "metadata": { "description": "Password for Windows account. Password must have 3 of the following: 1 lower case character, 1 upper case character, 1 number, and 1 special character. The value must be between 12 and 123 characters long" } @@ -94,7 +94,7 @@ }, "azdataPassword": { "type": "securestring", - "defaultValue": "ArcDemo123!!" + "defaultValue": "aRkcQleMi$925!" }, "acceptEula": { "type": "string", From 1404a2fde7f6c559e8ae484584664fa3c2aaf26a Mon Sep 17 00:00:00 2001 From: Venkata Chintala <29983008+chintalavr@users.noreply.github.com> Date: Sat, 30 Sep 2023 16:10:25 -0400 Subject: [PATCH 4/5] Update clientVm.json Modified arcdata default password --- azure_jumpstart_arcbox/ARM/clientVm/clientVm.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json b/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json index b620d2beca..28a3f36077 100644 --- a/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json +++ b/azure_jumpstart_arcbox/ARM/clientVm/clientVm.json @@ -94,7 +94,7 @@ }, "azdataPassword": { "type": "securestring", - "defaultValue": "aRkcQleMi$925!" + "defaultValue": "fMQch2T58L9H3v$7" }, "acceptEula": { "type": "string", From 517ec39a427ff395801e3d6ed90e179a611e13d4 Mon Sep 17 00:00:00 2001 From: Venkata Chintala <29983008+chintalavr@users.noreply.github.com> Date: Sat, 30 Sep 2023 18:10:10 -0400 Subject: [PATCH 5/5] Update DeploySQLMIADAuth.ps1 Updated ArcBox-SQL database server password --- azure_jumpstart_arcbox/artifacts/DeploySQLMIADAuth.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure_jumpstart_arcbox/artifacts/DeploySQLMIADAuth.ps1 b/azure_jumpstart_arcbox/artifacts/DeploySQLMIADAuth.ps1 index 34dd23583a..74dce0edaf 100644 --- a/azure_jumpstart_arcbox/artifacts/DeploySQLMIADAuth.ps1 +++ b/azure_jumpstart_arcbox/artifacts/DeploySQLMIADAuth.ps1 @@ -434,7 +434,7 @@ $sqlServerConnection = @" "database": "", "authenticationType": "SqlLogin", "user": "sa", - "password": "$sa_password", + "password": "ArcDemo123!!", "applicationName": "azdata", "groupId": "C777F06B-202E-4480-B475-FA416154D458", "databaseDisplayName": ""