Merge pull request #2110 from microsoft/2099-azure-arc-enabled-data-s…

…ervices-sept-release 2099 azure arc enabled data services sept release
microsoft · Oct 2, 2023 · e7d5a30 · e7d5a30
2 parents b1c1e90 + 517ec39
commit e7d5a30
Show file tree

Hide file tree

Showing 25 changed files with 40 additions and 31 deletions.
diff --git 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
@@ -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/...ata_services/deploy/scripts/pull-and-push-arc-data-services-images-to-private-registry.py b/...ata_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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+  newTag: vv1.23.0_2023-09-12
diff --git 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
@@ -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
@@ -27,7 +27,7 @@
         },
         "docker": {
           "imagePullPolicy": "Always",
-          "imageTag": "v1.22.0_2023-08-08",
+          "imageTag": "v1.23.0_2023-09-12",
           "registry": "<registry>",
           "repository": "<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
@@ -25,7 +25,7 @@
         },
         "docker": {
           "imagePullPolicy": "Always",
-          "imageTag": "v1.22.0_2023-08-08",
+          "imageTag": "v1.23.0_2023-09-12",
           "registry": "<registry>",
           "repository": "<repository>"
         },

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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": "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": "fMQch2T58L9H3v$7"
         },
         "acceptEula": {
             "type": "string",
@@ -355,4 +355,4 @@
             "value": "[concat(reference(variables('publicIPAddressName')).IpAddress)]"
         }
     }
-}
+}
diff --git 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
@@ -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_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": ""

diff --git 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