Merge pull request #136 from Sitecore/sxp/10.2.1.009559.1460

Update SXP Sitecore Container Deployment to 10.2.1 r009559
Sitecore · Aug 31, 2023 · 38f2dac · 38f2dac
2 parents cc10632 + cf8359a
commit 38f2dac
Show file tree

Hide file tree

Showing 68 changed files with 101 additions and 119 deletions.
diff --git a/compose/sxp/10.2/ltsc2019/upgrade/xm1/compose-init.ps1 b/compose/sxp/10.2/ltsc2019/upgrade/xm1/compose-init.ps1
@@ -298,4 +298,4 @@ function Invoke-ComposeInit {
 }
 
 $logFilePath = Join-Path -path (Split-Path -Parent $MyInvocation.MyCommand.Path) -ChildPath "compose-init-$(Get-date -f 'yyyyMMddHHmmss').log";
-Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
+Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
diff --git a/compose/sxp/10.2/ltsc2019/upgrade/xm1/upgrade.env b/compose/sxp/10.2/ltsc2019/upgrade/xm1/upgrade.env
@@ -6,6 +6,6 @@ SQL_SERVER=
 SQL_USERNAME=
 SQL_PASSWORD=
 DATABASE_UPGRADE_FROM_VERSION=10.1.0
-DATABASE_UPGRADE_TO_VERSION=10.2.0
+DATABASE_UPGRADE_TO_VERSION=10.2.1
 SITECORE_LICENSE=
-ISOLATION=default
+ISOLATION=default
diff --git a/compose/sxp/10.2/ltsc2019/upgrade/xp1/compose-init.ps1 b/compose/sxp/10.2/ltsc2019/upgrade/xp1/compose-init.ps1
@@ -298,4 +298,4 @@ function Invoke-ComposeInit {
 }
 
 $logFilePath = Join-Path -path (Split-Path -Parent $MyInvocation.MyCommand.Path) -ChildPath "compose-init-$(Get-date -f 'yyyyMMddHHmmss').log";
-Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
+Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
diff --git a/compose/sxp/10.2/ltsc2019/upgrade/xp1/upgrade.env b/compose/sxp/10.2/ltsc2019/upgrade/xp1/upgrade.env
@@ -8,6 +8,6 @@ SQL_PASSWORD=
 IS_ALWAYS_ENCRYPTED=
 PROCESSING_ENGINE_TASKS_DATABASE_USERNAME=
 DATABASE_UPGRADE_FROM_VERSION=10.1.0
-DATABASE_UPGRADE_TO_VERSION=10.2.0
+DATABASE_UPGRADE_TO_VERSION=10.2.1
 SITECORE_LICENSE=
-ISOLATION=default
+ISOLATION=default
diff --git a/compose/sxp/10.2/ltsc2019/xm1/.env b/compose/sxp/10.2/ltsc2019/xm1/.env
@@ -13,9 +13,9 @@ SITECORE_LICENSE=
 CD_HOST=xm1cd.localhost
 CM_HOST=xm1cm.localhost
 ID_HOST=xm1id.localhost
-TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
+TRAEFIK_IMAGE=traefik:v2.9.8-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 ISOLATION=default
 SOLR_CORE_PREFIX_NAME=sitecore
 # You should change the shared secret to a random string and not use the default value
-MEDIA_REQUEST_PROTECTION_SHARED_SECRET=HQ(NjM(u6_5koVla-cTf4ta8x1h6Sb+ZcUQrULUz-0Afpx0cx-NuMtIoQkpDFmX5
+MEDIA_REQUEST_PROTECTION_SHARED_SECRET=HQ(NjM(u6_5koVla-cTf4ta8x1h6Sb+ZcUQrULUz-0Afpx0cx-NuMtIoQkpDFmX5
diff --git a/compose/sxp/10.2/ltsc2019/xm1/compose-init.ps1 b/compose/sxp/10.2/ltsc2019/xm1/compose-init.ps1
@@ -298,4 +298,4 @@ function Invoke-ComposeInit {
 }
 
 $logFilePath = Join-Path -path (Split-Path -Parent $MyInvocation.MyCommand.Path) -ChildPath "compose-init-$(Get-date -f 'yyyyMMddHHmmss').log";
-Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
+Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
diff --git a/compose/sxp/10.2/ltsc2019/xm1/docker-compose.yml b/compose/sxp/10.2/ltsc2019/xm1/docker-compose.yml
@@ -82,7 +82,7 @@ services:
         condition: service_healthy
   id:
     isolation: ${ISOLATION}
-    image: ${SITECORE_DOCKER_REGISTRY}sitecore-id6:${SITECORE_VERSION}
+    image: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
     environment:
       Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString: Data Source=${SQL_SERVER};Initial Catalog=Sitecore.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD}
       Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl: https://${CM_HOST}/sitecore/login?rc=1
@@ -170,4 +170,4 @@ services:
       - "traefik.http.routers.cm-secure.entrypoints=websecure"
       - "traefik.http.routers.cm-secure.rule=Host(`${CM_HOST}`)"
       - "traefik.http.routers.cm-secure.tls=true"
-      - "traefik.http.routers.cm-secure.middlewares=force-STS-Header"
+      - "traefik.http.routers.cm-secure.middlewares=force-STS-Header"
diff --git a/compose/sxp/10.2/ltsc2019/xp0/.env b/compose/sxp/10.2/ltsc2019/xp0/.env
@@ -12,9 +12,9 @@ SITECORE_ID_CERTIFICATE_PASSWORD=
 SITECORE_LICENSE=
 CM_HOST=xp0cm.localhost
 ID_HOST=xp0id.localhost
-TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
+TRAEFIK_IMAGE=traefik:v2.9.8-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 ISOLATION=default
 SOLR_CORE_PREFIX_NAME=sitecore
 # You should change the shared secret to a random string and not use the default value
-MEDIA_REQUEST_PROTECTION_SHARED_SECRET=HQ(NjM(u6_5koVla-cTf4ta8x1h6Sb+ZcUQrULUz-0Afpx0cx-NuMtIoQkpDFmX5
+MEDIA_REQUEST_PROTECTION_SHARED_SECRET=HQ(NjM(u6_5koVla-cTf4ta8x1h6Sb+ZcUQrULUz-0Afpx0cx-NuMtIoQkpDFmX5
diff --git a/compose/sxp/10.2/ltsc2019/xp0/compose-init.ps1 b/compose/sxp/10.2/ltsc2019/xp0/compose-init.ps1
@@ -298,4 +298,4 @@ function Invoke-ComposeInit {
 }
 
 $logFilePath = Join-Path -path (Split-Path -Parent $MyInvocation.MyCommand.Path) -ChildPath "compose-init-$(Get-date -f 'yyyyMMddHHmmss').log";
-Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
+Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
diff --git a/compose/sxp/10.2/ltsc2019/xp0/docker-compose.yml b/compose/sxp/10.2/ltsc2019/xp0/docker-compose.yml
@@ -77,7 +77,7 @@ services:
         condition: service_healthy
   id:
     isolation: ${ISOLATION}
-    image: ${SITECORE_DOCKER_REGISTRY}sitecore-id6:${SITECORE_VERSION}
+    image: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
     environment:
       Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString: Data Source=${SQL_SERVER};Initial Catalog=Sitecore.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD}
       Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl: https://${CM_HOST}/sitecore/login?rc=1

diff --git a/compose/sxp/10.2/ltsc2019/xp1/.env b/compose/sxp/10.2/ltsc2019/xp1/.env
@@ -14,9 +14,9 @@ SITECORE_LICENSE=
 CD_HOST=xp1cd.localhost
 CM_HOST=xp1cm.localhost
 ID_HOST=xp1id.localhost
-TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
+TRAEFIK_IMAGE=traefik:v2.9.8-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 ISOLATION=default
 SOLR_CORE_PREFIX_NAME=sitecore
 # You should change the shared secret to a random string and not use the default value
-MEDIA_REQUEST_PROTECTION_SHARED_SECRET=HQ(NjM(u6_5koVla-cTf4ta8x1h6Sb+ZcUQrULUz-0Afpx0cx-NuMtIoQkpDFmX5
+MEDIA_REQUEST_PROTECTION_SHARED_SECRET=HQ(NjM(u6_5koVla-cTf4ta8x1h6Sb+ZcUQrULUz-0Afpx0cx-NuMtIoQkpDFmX5
diff --git a/compose/sxp/10.2/ltsc2019/xp1/compose-init.ps1 b/compose/sxp/10.2/ltsc2019/xp1/compose-init.ps1
@@ -298,4 +298,4 @@ function Invoke-ComposeInit {
 }
 
 $logFilePath = Join-Path -path (Split-Path -Parent $MyInvocation.MyCommand.Path) -ChildPath "compose-init-$(Get-date -f 'yyyyMMddHHmmss').log";
-Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
+Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
diff --git a/compose/sxp/10.2/ltsc2019/xp1/docker-compose.yml b/compose/sxp/10.2/ltsc2019/xp1/docker-compose.yml
@@ -82,7 +82,7 @@ services:
         condition: service_healthy
   id:
     isolation: ${ISOLATION}
-    image: ${SITECORE_DOCKER_REGISTRY}sitecore-id6:${SITECORE_VERSION}
+    image: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
     environment:
       Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString: Data Source=${SQL_SERVER};Initial Catalog=Sitecore.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD}
       Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl: https://${CM_HOST}/sitecore/login?rc=1

diff --git a/compose/sxp/10.2/ltsc2022/upgrade/xm1/compose-init.ps1 b/compose/sxp/10.2/ltsc2022/upgrade/xm1/compose-init.ps1
@@ -298,4 +298,4 @@ function Invoke-ComposeInit {
 }
 
 $logFilePath = Join-Path -path (Split-Path -Parent $MyInvocation.MyCommand.Path) -ChildPath "compose-init-$(Get-date -f 'yyyyMMddHHmmss').log";
-Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
+Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
diff --git a/compose/sxp/10.2/ltsc2022/upgrade/xm1/upgrade.env b/compose/sxp/10.2/ltsc2022/upgrade/xm1/upgrade.env
@@ -6,6 +6,6 @@ SQL_SERVER=
 SQL_USERNAME=
 SQL_PASSWORD=
 DATABASE_UPGRADE_FROM_VERSION=10.1.0
-DATABASE_UPGRADE_TO_VERSION=10.2.0
+DATABASE_UPGRADE_TO_VERSION=10.2.1
 SITECORE_LICENSE=
-ISOLATION=default
+ISOLATION=default
diff --git a/compose/sxp/10.2/ltsc2022/upgrade/xp1/compose-init.ps1 b/compose/sxp/10.2/ltsc2022/upgrade/xp1/compose-init.ps1
@@ -298,4 +298,4 @@ function Invoke-ComposeInit {
 }
 
 $logFilePath = Join-Path -path (Split-Path -Parent $MyInvocation.MyCommand.Path) -ChildPath "compose-init-$(Get-date -f 'yyyyMMddHHmmss').log";
-Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
+Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
diff --git a/compose/sxp/10.2/ltsc2022/upgrade/xp1/upgrade.env b/compose/sxp/10.2/ltsc2022/upgrade/xp1/upgrade.env
@@ -8,6 +8,6 @@ SQL_PASSWORD=
 IS_ALWAYS_ENCRYPTED=
 PROCESSING_ENGINE_TASKS_DATABASE_USERNAME=
 DATABASE_UPGRADE_FROM_VERSION=10.1.0
-DATABASE_UPGRADE_TO_VERSION=10.2.0
+DATABASE_UPGRADE_TO_VERSION=10.2.1
 SITECORE_LICENSE=
-ISOLATION=default
+ISOLATION=default
diff --git a/compose/sxp/10.2/ltsc2022/xm1/.env b/compose/sxp/10.2/ltsc2022/xm1/.env
@@ -13,9 +13,9 @@ SITECORE_LICENSE=
 CD_HOST=xm1cd.localhost
 CM_HOST=xm1cm.localhost
 ID_HOST=xm1id.localhost
-TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
+TRAEFIK_IMAGE=traefik:v2.9.8-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 ISOLATION=default
 SOLR_CORE_PREFIX_NAME=sitecore
 # You should change the shared secret to a random string and not use the default value
-MEDIA_REQUEST_PROTECTION_SHARED_SECRET=HQ(NjM(u6_5koVla-cTf4ta8x1h6Sb+ZcUQrULUz-0Afpx0cx-NuMtIoQkpDFmX5
+MEDIA_REQUEST_PROTECTION_SHARED_SECRET=HQ(NjM(u6_5koVla-cTf4ta8x1h6Sb+ZcUQrULUz-0Afpx0cx-NuMtIoQkpDFmX5
diff --git a/compose/sxp/10.2/ltsc2022/xm1/compose-init.ps1 b/compose/sxp/10.2/ltsc2022/xm1/compose-init.ps1
@@ -298,4 +298,4 @@ function Invoke-ComposeInit {
 }
 
 $logFilePath = Join-Path -path (Split-Path -Parent $MyInvocation.MyCommand.Path) -ChildPath "compose-init-$(Get-date -f 'yyyyMMddHHmmss').log";
-Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
+Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
diff --git a/compose/sxp/10.2/ltsc2022/xm1/docker-compose.yml b/compose/sxp/10.2/ltsc2022/xm1/docker-compose.yml
@@ -82,7 +82,7 @@ services:
         condition: service_healthy
   id:
     isolation: ${ISOLATION}
-    image: ${SITECORE_DOCKER_REGISTRY}sitecore-id6:${SITECORE_VERSION}
+    image: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
     environment:
       Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString: Data Source=${SQL_SERVER};Initial Catalog=Sitecore.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD}
       Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl: https://${CM_HOST}/sitecore/login?rc=1
@@ -170,4 +170,4 @@ services:
       - "traefik.http.routers.cm-secure.entrypoints=websecure"
       - "traefik.http.routers.cm-secure.rule=Host(`${CM_HOST}`)"
       - "traefik.http.routers.cm-secure.tls=true"
-      - "traefik.http.routers.cm-secure.middlewares=force-STS-Header"
+      - "traefik.http.routers.cm-secure.middlewares=force-STS-Header"
diff --git a/compose/sxp/10.2/ltsc2022/xp0/.env b/compose/sxp/10.2/ltsc2022/xp0/.env
@@ -12,9 +12,9 @@ SITECORE_ID_CERTIFICATE_PASSWORD=
 SITECORE_LICENSE=
 CM_HOST=xp0cm.localhost
 ID_HOST=xp0id.localhost
-TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
+TRAEFIK_IMAGE=traefik:v2.9.8-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 ISOLATION=default
 SOLR_CORE_PREFIX_NAME=sitecore
 # You should change the shared secret to a random string and not use the default value
-MEDIA_REQUEST_PROTECTION_SHARED_SECRET=HQ(NjM(u6_5koVla-cTf4ta8x1h6Sb+ZcUQrULUz-0Afpx0cx-NuMtIoQkpDFmX5
+MEDIA_REQUEST_PROTECTION_SHARED_SECRET=HQ(NjM(u6_5koVla-cTf4ta8x1h6Sb+ZcUQrULUz-0Afpx0cx-NuMtIoQkpDFmX5
diff --git a/compose/sxp/10.2/ltsc2022/xp0/compose-init.ps1 b/compose/sxp/10.2/ltsc2022/xp0/compose-init.ps1
@@ -298,4 +298,4 @@ function Invoke-ComposeInit {
 }
 
 $logFilePath = Join-Path -path (Split-Path -Parent $MyInvocation.MyCommand.Path) -ChildPath "compose-init-$(Get-date -f 'yyyyMMddHHmmss').log";
-Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
+Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
diff --git a/compose/sxp/10.2/ltsc2022/xp0/docker-compose.yml b/compose/sxp/10.2/ltsc2022/xp0/docker-compose.yml
@@ -77,7 +77,7 @@ services:
         condition: service_healthy
   id:
     isolation: ${ISOLATION}
-    image: ${SITECORE_DOCKER_REGISTRY}sitecore-id6:${SITECORE_VERSION}
+    image: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
     environment:
       Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString: Data Source=${SQL_SERVER};Initial Catalog=Sitecore.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD}
       Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl: https://${CM_HOST}/sitecore/login?rc=1

diff --git a/compose/sxp/10.2/ltsc2022/xp1/.env b/compose/sxp/10.2/ltsc2022/xp1/.env
@@ -14,9 +14,9 @@ SITECORE_LICENSE=
 CD_HOST=xp1cd.localhost
 CM_HOST=xp1cm.localhost
 ID_HOST=xp1id.localhost
-TRAEFIK_IMAGE=traefik:v2.2.0-windowsservercore-1809
+TRAEFIK_IMAGE=traefik:v2.9.8-windowsservercore-1809
 TRAEFIK_ISOLATION=hyperv
 ISOLATION=default
 SOLR_CORE_PREFIX_NAME=sitecore
 # You should change the shared secret to a random string and not use the default value
-MEDIA_REQUEST_PROTECTION_SHARED_SECRET=HQ(NjM(u6_5koVla-cTf4ta8x1h6Sb+ZcUQrULUz-0Afpx0cx-NuMtIoQkpDFmX5
+MEDIA_REQUEST_PROTECTION_SHARED_SECRET=HQ(NjM(u6_5koVla-cTf4ta8x1h6Sb+ZcUQrULUz-0Afpx0cx-NuMtIoQkpDFmX5
diff --git a/compose/sxp/10.2/ltsc2022/xp1/compose-init.ps1 b/compose/sxp/10.2/ltsc2022/xp1/compose-init.ps1
@@ -298,4 +298,4 @@ function Invoke-ComposeInit {
 }
 
 $logFilePath = Join-Path -path (Split-Path -Parent $MyInvocation.MyCommand.Path) -ChildPath "compose-init-$(Get-date -f 'yyyyMMddHHmmss').log";
-Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
+Invoke-ComposeInit *>&1 | Tee-Object $logFilePath
diff --git a/compose/sxp/10.2/ltsc2022/xp1/docker-compose.yml b/compose/sxp/10.2/ltsc2022/xp1/docker-compose.yml
@@ -82,7 +82,7 @@ services:
         condition: service_healthy
   id:
     isolation: ${ISOLATION}
-    image: ${SITECORE_DOCKER_REGISTRY}sitecore-id6:${SITECORE_VERSION}
+    image: ${SITECORE_DOCKER_REGISTRY}sitecore-id7:${SITECORE_VERSION}
     environment:
       Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString: Data Source=${SQL_SERVER};Initial Catalog=Sitecore.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD}
       Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl: https://${CM_HOST}/sitecore/login?rc=1

diff --git a/k8s/sxp/10.2/ltsc2019/upgrade/xm1/configuration/database-upgrade-to-version.txt b/k8s/sxp/10.2/ltsc2019/upgrade/xm1/configuration/database-upgrade-to-version.txt
@@ -1 +1 @@
-10.2.0
+10.2.1
diff --git a/k8s/sxp/10.2/ltsc2019/upgrade/xm1/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/upgrade/xm1/kustomization.yaml
@@ -18,4 +18,4 @@ resources:
 images:
 - name: sitecore-xm1-mssql-upgrade
   newName: scr.sitecore.com/sxp/sitecore-xm1-mssql-upgrade
-  newTag: 10.2-ltsc2019
+  newTag: 10.2-ltsc2019
diff --git a/k8s/sxp/10.2/ltsc2019/upgrade/xm1/mssql-upgrade.yaml b/k8s/sxp/10.2/ltsc2019/upgrade/xm1/mssql-upgrade.yaml
@@ -57,4 +57,4 @@ spec:
         - name: Sitecore_ConnectionStrings_Experienceforms
           value: Data Source=$(SQL_SERVER);Initial Catalog=$(SQL_DATABASE_PREFIX).Experienceforms;User ID=$(SQL_USER_NAME);Password=$(SQL_PASSWORD);
       restartPolicy: Never
-  backoffLimit: 5
+  backoffLimit: 5
diff --git a/k8s/sxp/10.2/ltsc2019/upgrade/xp1/configuration/database-upgrade-to-version.txt b/k8s/sxp/10.2/ltsc2019/upgrade/xp1/configuration/database-upgrade-to-version.txt
@@ -1 +1 @@
-10.2.0
+10.2.1
diff --git a/k8s/sxp/10.2/ltsc2019/upgrade/xp1/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/upgrade/xp1/kustomization.yaml
@@ -20,4 +20,4 @@ resources:
 images:
 - name: sitecore-xp1-mssql-upgrade
   newName: scr.sitecore.com/sxp/sitecore-xp1-mssql-upgrade
-  newTag: 10.2-ltsc2019
+  newTag: 10.2-ltsc2019
diff --git a/k8s/sxp/10.2/ltsc2019/xm1/external/solr.yaml b/k8s/sxp/10.2/ltsc2019/xm1/external/solr.yaml
@@ -62,4 +62,4 @@ spec:
             cpu: 1500m
       volumes:
         - emptyDir: {}
-          name: tmp     
+          name: tmp     
diff --git a/k8s/sxp/10.2/ltsc2019/xm1/id.yaml b/k8s/sxp/10.2/ltsc2019/xm1/id.yaml
@@ -112,4 +112,4 @@ spec:
         persistentVolumeClaim:
           claimName: logs
       imagePullSecrets:
-      - name: sitecore-docker-registry
+      - name: sitecore-docker-registry
diff --git a/k8s/sxp/10.2/ltsc2019/xm1/ingress-nginx/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/xm1/ingress-nginx/kustomization.yaml
@@ -15,4 +15,4 @@ vars:
     name: sitecore-hostnames
     apiVersion: v1
   fieldref:
-    fieldpath: data.cd-hostname
+    fieldpath: data.cd-hostname
diff --git a/k8s/sxp/10.2/ltsc2019/xm1/init/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/xm1/init/kustomization.yaml
@@ -1,14 +1,12 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-
 images:
 - name: sitecore-xm1-mssql-init
   newName: scr.sitecore.com/sxp/sitecore-xm1-mssql-init
   newTag: 10.2-ltsc2019
 - name: sitecore-xm1-solr-init
   newName: scr.sitecore.com/sxp/sitecore-xm1-solr-init
   newTag: 10.2-ltsc2019
-
 resources:
-  - mssql-init.yaml
-  - solr-init.yaml
+- mssql-init.yaml
+- solr-init.yaml
diff --git a/k8s/sxp/10.2/ltsc2019/xm1/init/mssql-init.yaml b/k8s/sxp/10.2/ltsc2019/xm1/init/mssql-init.yaml
@@ -79,4 +79,4 @@ spec:
               name: sitecore-database
               key: sitecore-forms-database-password.txt
       restartPolicy: Never
-  backoffLimit: 5
+  backoffLimit: 5
diff --git a/k8s/sxp/10.2/ltsc2019/xm1/init/solr-init.yaml b/k8s/sxp/10.2/ltsc2019/xm1/init/solr-init.yaml
@@ -24,4 +24,4 @@ spec:
               name: sitecore-solr
               key: sitecore-solr-core-prefix-name.txt
       restartPolicy: Never
-  backoffLimit: 5
+  backoffLimit: 5
diff --git a/k8s/sxp/10.2/ltsc2019/xm1/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/xm1/kustomization.yaml
@@ -1,9 +1,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-
 bases:
 - configmaps
-
 images:
 - name: sitecore-xm1-cd
   newName: scr.sitecore.com/sxp/sitecore-xm1-cd
@@ -12,10 +10,9 @@ images:
   newName: scr.sitecore.com/sxp/sitecore-xm1-cm
   newTag: 10.2-ltsc2019
 - name: sitecore-xm1-id
-  newName: scr.sitecore.com/sxp/sitecore-id6
+  newName: scr.sitecore.com/sxp/sitecore-id7
   newTag: 10.2-ltsc2019
-
 resources:
-  - cm.yaml
-  - cd.yaml
-  - id.yaml
+- cm.yaml
+- cd.yaml
+- id.yaml
diff --git a/k8s/sxp/10.2/ltsc2019/xm1/overlays/init/SearchStax/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/xm1/overlays/init/SearchStax/kustomization.yaml
@@ -1,22 +1,18 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-
 bases:
 - ..\..\..\init
-
 patchesStrategicMerge:
-  - solr-init.yaml
-
+- solr-init.yaml
 images:
 - name: sitecore-xm1-solr-init-searchstax
   newName: scr.sitecore.com/sxp/sitecore-xm1-solr-init-searchstax
   newTag: 10.2-ltsc2019
-
 generatorOptions:
   disableNameSuffixHash: true
 secretGenerator:
 - name: sitecore-solr-searchstax
   files:
   - sitecore-searchstax-apikey.txt
   - sitecore-searchstax-account-name.txt
-  - sitecore-searchstax-deployment-uid.txt
+  - sitecore-searchstax-deployment-uid.txt
diff --git a/k8s/sxp/10.2/ltsc2019/xm1/secrets/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/xm1/secrets/kustomization.yaml
@@ -52,4 +52,4 @@ secretGenerator:
   files:
     - tls/global-id/tls.key
     - tls/global-id/tls.crt
-  type: kubernetes.io/tls
+  type: kubernetes.io/tls