Merge pull request #137 from Sitecore/sxp/10.1.3.009558.1487

Update 10.1 SXP Sitecore Container Deployment to 10.1.3 r009558
Sitecore · Sep 6, 2023 · 878e13b · 878e13b
2 parents 38f2dac + 45d7eda
commit 878e13b
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/compose/sxp/10.1/ltsc2019/xm1/.env b/compose/sxp/10.1/ltsc2019/xm1/.env
@@ -11,7 +11,7 @@ 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

diff --git a/compose/sxp/10.1/ltsc2019/xm1/docker-compose.yml b/compose/sxp/10.1/ltsc2019/xm1/docker-compose.yml
@@ -65,7 +65,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=mssql;Initial Catalog=Sitecore.Core;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl: https://${CM_HOST}/sitecore/login?rc=1
@@ -76,7 +76,7 @@ services:
       Sitecore_Sitecore__IdentityServer__CertificateRawDataPassword: ${SITECORE_ID_CERTIFICATE_PASSWORD}
       Sitecore_License: ${SITECORE_LICENSE}
     healthcheck:
-      test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
+      test: ["CMD", "pwsh", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s
     depends_on:
       mssql:

diff --git a/compose/sxp/10.1/ltsc2019/xp0/.env b/compose/sxp/10.1/ltsc2019/xp0/.env
@@ -10,7 +10,7 @@ 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

diff --git a/compose/sxp/10.1/ltsc2019/xp0/docker-compose.yml b/compose/sxp/10.1/ltsc2019/xp0/docker-compose.yml
@@ -61,7 +61,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=mssql;Initial Catalog=Sitecore.Core;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl: https://${CM_HOST}/sitecore/login?rc=1
@@ -72,7 +72,7 @@ services:
       Sitecore_Sitecore__IdentityServer__CertificateRawDataPassword: ${SITECORE_ID_CERTIFICATE_PASSWORD}
       Sitecore_License: ${SITECORE_LICENSE}
     healthcheck:
-      test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
+      test: ["CMD", "pwsh", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s
     depends_on:
       mssql:

diff --git a/compose/sxp/10.1/ltsc2019/xp1/.env b/compose/sxp/10.1/ltsc2019/xp1/.env
@@ -12,7 +12,7 @@ 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

diff --git a/compose/sxp/10.1/ltsc2019/xp1/docker-compose.yml b/compose/sxp/10.1/ltsc2019/xp1/docker-compose.yml
@@ -66,7 +66,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=mssql;Initial Catalog=Sitecore.Core;User ID=sa;Password=${SQL_SA_PASSWORD}
       Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl: https://${CM_HOST}/sitecore/login?rc=1
@@ -77,7 +77,7 @@ services:
       Sitecore_Sitecore__IdentityServer__CertificateRawDataPassword: ${SITECORE_ID_CERTIFICATE_PASSWORD}
       Sitecore_License: ${SITECORE_LICENSE}
     healthcheck:
-      test: ["CMD", "powershell", "-command", "C:/Healthchecks/Healthcheck.ps1"]
+      test: ["CMD", "pwsh", "-command", "C:/Healthchecks/Healthcheck.ps1"]
       timeout: 300s
     depends_on:
       mssql:

diff --git a/k8s/sxp/10.1/ltsc2019/xm1/kustomization.yaml b/k8s/sxp/10.1/ltsc2019/xm1/kustomization.yaml
@@ -8,8 +8,8 @@ images:
   newName: scr.sitecore.com/sxp/sitecore-xm1-cm
   newTag: 10.1-ltsc2019
 - name: sitecore-xm1-id
-  newName: scr.sitecore.com/sxp/sitecore-id6
-  newTag: 10.1-ltsc2019
+  newName: scr.sitecore.com/sxp/sitecore-id7
+  newTag: 10.1.3-ltsc2019
 resources:
 - cm.yaml
 - cd.yaml

diff --git a/k8s/sxp/10.1/ltsc2019/xp1/kustomization.yaml b/k8s/sxp/10.1/ltsc2019/xp1/kustomization.yaml
@@ -8,8 +8,8 @@ images:
   newName: scr.sitecore.com/sxp/sitecore-xp1-cm
   newTag: 10.1-ltsc2019
 - name: sitecore-xp1-id
-  newName: scr.sitecore.com/sxp/sitecore-id6
-  newTag: 10.1-ltsc2019
+  newName: scr.sitecore.com/sxp/sitecore-id7
+  newTag: 10.1.3-ltsc2019
 - name: sitecore-xp1-cortexprocessing
   newName: scr.sitecore.com/sxp/sitecore-xp1-cortexprocessing
   newTag: 10.1-ltsc2019

diff --git a/k8s/sxp/10.1/ltsc2019/xp1/volumes/azurefile/submit-queue.yaml b/k8s/sxp/10.1/ltsc2019/xp1/volumes/azurefile/submit-queue.yaml
@@ -3,7 +3,7 @@ kind: StorageClass
 apiVersion: storage.k8s.io/v1
 metadata:
   name: submit-queue
-provisioner: kubernetes.io/azure-file
+provisioner: file.csi.azure.com
 parameters:
   skuName: Standard_LRS
 ---