From cf8359a787c050158f7e8e069b127bf19c22f841 Mon Sep 17 00:00:00 2001 From: Eugenia Bilynska Date: Thu, 31 Aug 2023 15:56:21 +0300 Subject: [PATCH] Update SXP Sitecore Container Deployment to 10.2.1 r009559 SXP 10.2.1 Update release Compose updated to 10.2.1 r009559 K8s updated to 10.2.1 r009559 --- .../ltsc2019/upgrade/xm1/compose-init.ps1 | 2 +- .../sxp/10.2/ltsc2019/upgrade/xm1/upgrade.env | 4 +-- .../ltsc2019/upgrade/xp1/compose-init.ps1 | 2 +- .../sxp/10.2/ltsc2019/upgrade/xp1/upgrade.env | 4 +-- compose/sxp/10.2/ltsc2019/xm1/.env | 4 +-- .../sxp/10.2/ltsc2019/xm1/compose-init.ps1 | 2 +- .../sxp/10.2/ltsc2019/xm1/docker-compose.yml | 4 +-- compose/sxp/10.2/ltsc2019/xp0/.env | 4 +-- .../sxp/10.2/ltsc2019/xp0/compose-init.ps1 | 2 +- .../sxp/10.2/ltsc2019/xp0/docker-compose.yml | 2 +- compose/sxp/10.2/ltsc2019/xp1/.env | 4 +-- .../sxp/10.2/ltsc2019/xp1/compose-init.ps1 | 2 +- .../sxp/10.2/ltsc2019/xp1/docker-compose.yml | 2 +- .../ltsc2022/upgrade/xm1/compose-init.ps1 | 2 +- .../sxp/10.2/ltsc2022/upgrade/xm1/upgrade.env | 4 +-- .../ltsc2022/upgrade/xp1/compose-init.ps1 | 2 +- .../sxp/10.2/ltsc2022/upgrade/xp1/upgrade.env | 4 +-- compose/sxp/10.2/ltsc2022/xm1/.env | 4 +-- .../sxp/10.2/ltsc2022/xm1/compose-init.ps1 | 2 +- .../sxp/10.2/ltsc2022/xm1/docker-compose.yml | 4 +-- compose/sxp/10.2/ltsc2022/xp0/.env | 4 +-- .../sxp/10.2/ltsc2022/xp0/compose-init.ps1 | 2 +- .../sxp/10.2/ltsc2022/xp0/docker-compose.yml | 2 +- compose/sxp/10.2/ltsc2022/xp1/.env | 4 +-- .../sxp/10.2/ltsc2022/xp1/compose-init.ps1 | 2 +- .../sxp/10.2/ltsc2022/xp1/docker-compose.yml | 2 +- .../database-upgrade-to-version.txt | 2 +- .../ltsc2019/upgrade/xm1/kustomization.yaml | 2 +- .../ltsc2019/upgrade/xm1/mssql-upgrade.yaml | 2 +- .../database-upgrade-to-version.txt | 2 +- .../ltsc2019/upgrade/xp1/kustomization.yaml | 2 +- k8s/sxp/10.2/ltsc2019/xm1/external/solr.yaml | 2 +- k8s/sxp/10.2/ltsc2019/xm1/id.yaml | 2 +- .../xm1/ingress-nginx/kustomization.yaml | 2 +- .../10.2/ltsc2019/xm1/init/kustomization.yaml | 6 ++-- .../10.2/ltsc2019/xm1/init/mssql-init.yaml | 2 +- k8s/sxp/10.2/ltsc2019/xm1/init/solr-init.yaml | 2 +- k8s/sxp/10.2/ltsc2019/xm1/kustomization.yaml | 11 +++---- .../init/SearchStax/kustomization.yaml | 8 ++--- .../ltsc2019/xm1/secrets/kustomization.yaml | 2 +- .../ltsc2019/xm1/volumes/azurefile/logs.yaml | 2 +- .../ltsc2019/xp1/cortexprocessingworker.yaml | 2 +- k8s/sxp/10.2/ltsc2019/xp1/external/solr.yaml | 2 +- k8s/sxp/10.2/ltsc2019/xp1/id.yaml | 2 +- .../10.2/ltsc2019/xp1/init/kustomization.yaml | 6 ++-- k8s/sxp/10.2/ltsc2019/xp1/init/solr-init.yaml | 2 +- k8s/sxp/10.2/ltsc2019/xp1/kustomization.yaml | 33 +++++++++---------- .../init/SearchStax/kustomization.yaml | 8 ++--- .../ltsc2019/xp1/volumes/azurefile/logs.yaml | 2 +- .../xp1/volumes/azurefile/submit-queue.yaml | 2 +- .../database-upgrade-to-version.txt | 2 +- .../ltsc2022/upgrade/xm1/mssql-upgrade.yaml | 2 +- .../database-upgrade-to-version.txt | 2 +- k8s/sxp/10.2/ltsc2022/xm1/external/solr.yaml | 2 +- k8s/sxp/10.2/ltsc2022/xm1/id.yaml | 2 +- .../xm1/ingress-nginx/kustomization.yaml | 2 +- .../10.2/ltsc2022/xm1/init/mssql-init.yaml | 2 +- k8s/sxp/10.2/ltsc2022/xm1/init/solr-init.yaml | 2 +- k8s/sxp/10.2/ltsc2022/xm1/kustomization.yaml | 2 +- .../ltsc2022/xm1/secrets/kustomization.yaml | 2 +- .../ltsc2022/xm1/volumes/azurefile/logs.yaml | 2 +- .../ltsc2022/xp1/cortexprocessingworker.yaml | 2 +- k8s/sxp/10.2/ltsc2022/xp1/external/solr.yaml | 2 +- k8s/sxp/10.2/ltsc2022/xp1/id.yaml | 2 +- k8s/sxp/10.2/ltsc2022/xp1/init/solr-init.yaml | 2 +- k8s/sxp/10.2/ltsc2022/xp1/kustomization.yaml | 2 +- .../ltsc2022/xp1/volumes/azurefile/logs.yaml | 2 +- .../xp1/volumes/azurefile/submit-queue.yaml | 2 +- 68 files changed, 101 insertions(+), 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 index b56e8e25..cc9699c7 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2019/upgrade/xm1/upgrade.env b/compose/sxp/10.2/ltsc2019/upgrade/xm1/upgrade.env index 05e6cb07..e3805dae 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2019/upgrade/xp1/compose-init.ps1 b/compose/sxp/10.2/ltsc2019/upgrade/xp1/compose-init.ps1 index 6276f58d..fc7a8b53 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2019/upgrade/xp1/upgrade.env b/compose/sxp/10.2/ltsc2019/upgrade/xp1/upgrade.env index 14d5be0b..add2eead 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2019/xm1/.env b/compose/sxp/10.2/ltsc2019/xm1/.env index 0e76350a..b0ea599f 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2019/xm1/compose-init.ps1 b/compose/sxp/10.2/ltsc2019/xm1/compose-init.ps1 index b56e8e25..cc9699c7 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2019/xm1/docker-compose.yml b/compose/sxp/10.2/ltsc2019/xm1/docker-compose.yml index 6dee3015..d5ea176b 100644 --- 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" \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2019/xp0/.env b/compose/sxp/10.2/ltsc2019/xp0/.env index f06af7b9..5d517835 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2019/xp0/compose-init.ps1 b/compose/sxp/10.2/ltsc2019/xp0/compose-init.ps1 index 1c6ad804..2d728612 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2019/xp0/docker-compose.yml b/compose/sxp/10.2/ltsc2019/xp0/docker-compose.yml index 88a1eadb..b41a894e 100644 --- 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 index aaf7b674..b45835e1 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2019/xp1/compose-init.ps1 b/compose/sxp/10.2/ltsc2019/xp1/compose-init.ps1 index 6276f58d..fc7a8b53 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2019/xp1/docker-compose.yml b/compose/sxp/10.2/ltsc2019/xp1/docker-compose.yml index 4da13281..01a64368 100644 --- 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 index b56e8e25..cc9699c7 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2022/upgrade/xm1/upgrade.env b/compose/sxp/10.2/ltsc2022/upgrade/xm1/upgrade.env index 76686999..6c15a5ac 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2022/upgrade/xp1/compose-init.ps1 b/compose/sxp/10.2/ltsc2022/upgrade/xp1/compose-init.ps1 index 6276f58d..fc7a8b53 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2022/upgrade/xp1/upgrade.env b/compose/sxp/10.2/ltsc2022/upgrade/xp1/upgrade.env index 3e88a684..caf53bd7 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2022/xm1/.env b/compose/sxp/10.2/ltsc2022/xm1/.env index 1d2326a3..740791be 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2022/xm1/compose-init.ps1 b/compose/sxp/10.2/ltsc2022/xm1/compose-init.ps1 index b56e8e25..cc9699c7 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2022/xm1/docker-compose.yml b/compose/sxp/10.2/ltsc2022/xm1/docker-compose.yml index 6dee3015..d5ea176b 100644 --- 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" \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2022/xp0/.env b/compose/sxp/10.2/ltsc2022/xp0/.env index 64fb9171..70a7fb7d 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2022/xp0/compose-init.ps1 b/compose/sxp/10.2/ltsc2022/xp0/compose-init.ps1 index 1c6ad804..2d728612 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2022/xp0/docker-compose.yml b/compose/sxp/10.2/ltsc2022/xp0/docker-compose.yml index 88a1eadb..b41a894e 100644 --- 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 index c1b5171b..396fe13a 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2022/xp1/compose-init.ps1 b/compose/sxp/10.2/ltsc2022/xp1/compose-init.ps1 index 6276f58d..fc7a8b53 100644 --- 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 \ No newline at end of file diff --git a/compose/sxp/10.2/ltsc2022/xp1/docker-compose.yml b/compose/sxp/10.2/ltsc2022/xp1/docker-compose.yml index 4da13281..01a64368 100644 --- 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 index fe46e0dd..85651cb5 100644 --- 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 \ No newline at end of file +10.2.1 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2019/upgrade/xm1/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/upgrade/xm1/kustomization.yaml index 99153259..65c8171a 100644 --- 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 \ No newline at end of file + 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 index 0724cf4e..a9eff564 100644 --- 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 \ No newline at end of file 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 index fe46e0dd..85651cb5 100644 --- 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 \ No newline at end of file +10.2.1 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2019/upgrade/xp1/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/upgrade/xp1/kustomization.yaml index 7a607047..0482e89d 100644 --- 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 \ No newline at end of file + 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 index fa2ef381..0e3f533f 100644 --- 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 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2019/xm1/id.yaml b/k8s/sxp/10.2/ltsc2019/xm1/id.yaml index 259a8601..ad6ae230 100644 --- 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 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2019/xm1/ingress-nginx/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/xm1/ingress-nginx/kustomization.yaml index 55e63084..5774fcd6 100644 --- 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 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2019/xm1/init/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/xm1/init/kustomization.yaml index ca5cfac9..38f9b0fa 100644 --- a/k8s/sxp/10.2/ltsc2019/xm1/init/kustomization.yaml +++ b/k8s/sxp/10.2/ltsc2019/xm1/init/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - images: - name: sitecore-xm1-mssql-init newName: scr.sitecore.com/sxp/sitecore-xm1-mssql-init @@ -8,7 +7,6 @@ images: - 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 \ No newline at end of file +- 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 index d3b0bd97..e52e4ec9 100644 --- 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 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2019/xm1/init/solr-init.yaml b/k8s/sxp/10.2/ltsc2019/xm1/init/solr-init.yaml index 82e32ef2..6e4f1700 100644 --- 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 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2019/xm1/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/xm1/kustomization.yaml index ed826ca9..2cd0d694 100644 --- 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 \ No newline at end of file +- 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 index 06d54aab..1a37dd9b 100644 --- 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,17 +1,13 @@ 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: @@ -19,4 +15,4 @@ secretGenerator: files: - sitecore-searchstax-apikey.txt - sitecore-searchstax-account-name.txt - - sitecore-searchstax-deployment-uid.txt \ No newline at end of file + - 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 index 6b9f20c3..29ef5b40 100644 --- 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 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2019/xm1/volumes/azurefile/logs.yaml b/k8s/sxp/10.2/ltsc2019/xm1/volumes/azurefile/logs.yaml index 2f53307d..290c5e6d 100644 --- a/k8s/sxp/10.2/ltsc2019/xm1/volumes/azurefile/logs.yaml +++ b/k8s/sxp/10.2/ltsc2019/xm1/volumes/azurefile/logs.yaml @@ -3,7 +3,7 @@ kind: StorageClass apiVersion: storage.k8s.io/v1 metadata: name: logs -provisioner: kubernetes.io/azure-file +provisioner: file.csi.azure.com parameters: skuName: Standard_LRS --- diff --git a/k8s/sxp/10.2/ltsc2019/xp1/cortexprocessingworker.yaml b/k8s/sxp/10.2/ltsc2019/xp1/cortexprocessingworker.yaml index 8831cb10..8785162d 100644 --- a/k8s/sxp/10.2/ltsc2019/xp1/cortexprocessingworker.yaml +++ b/k8s/sxp/10.2/ltsc2019/xp1/cortexprocessingworker.yaml @@ -122,4 +122,4 @@ spec: persistentVolumeClaim: claimName: logs imagePullSecrets: - - name: sitecore-docker-registry + - name: sitecore-docker-registry \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2019/xp1/external/solr.yaml b/k8s/sxp/10.2/ltsc2019/xp1/external/solr.yaml index f1c52f48..a62ad43d 100644 --- a/k8s/sxp/10.2/ltsc2019/xp1/external/solr.yaml +++ b/k8s/sxp/10.2/ltsc2019/xp1/external/solr.yaml @@ -62,4 +62,4 @@ spec: cpu: 1500m volumes: - emptyDir: {} - name: tmp + name: tmp \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2019/xp1/id.yaml b/k8s/sxp/10.2/ltsc2019/xp1/id.yaml index c39eff05..92d8a8b4 100644 --- a/k8s/sxp/10.2/ltsc2019/xp1/id.yaml +++ b/k8s/sxp/10.2/ltsc2019/xp1/id.yaml @@ -112,4 +112,4 @@ spec: persistentVolumeClaim: claimName: logs imagePullSecrets: - - name: sitecore-docker-registry + - name: sitecore-docker-registry \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2019/xp1/init/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/xp1/init/kustomization.yaml index 5dea30e8..7b50f47d 100644 --- a/k8s/sxp/10.2/ltsc2019/xp1/init/kustomization.yaml +++ b/k8s/sxp/10.2/ltsc2019/xp1/init/kustomization.yaml @@ -1,6 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - images: - name: sitecore-xp1-mssql-init newName: scr.sitecore.com/sxp/sitecore-xp1-mssql-init @@ -8,7 +7,6 @@ images: - name: sitecore-xp1-solr-init newName: scr.sitecore.com/sxp/sitecore-xp1-solr-init newTag: 10.2-ltsc2019 - resources: - - mssql-init.yaml - - solr-init.yaml \ No newline at end of file +- mssql-init.yaml +- solr-init.yaml diff --git a/k8s/sxp/10.2/ltsc2019/xp1/init/solr-init.yaml b/k8s/sxp/10.2/ltsc2019/xp1/init/solr-init.yaml index a85a95d0..1efdb3c1 100644 --- a/k8s/sxp/10.2/ltsc2019/xp1/init/solr-init.yaml +++ b/k8s/sxp/10.2/ltsc2019/xp1/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 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2019/xp1/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/xp1/kustomization.yaml index 1cbc94c0..e8cd0e7f 100644 --- a/k8s/sxp/10.2/ltsc2019/xp1/kustomization.yaml +++ b/k8s/sxp/10.2/ltsc2019/xp1/kustomization.yaml @@ -1,9 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - bases: - configmaps - images: - name: sitecore-xp1-cd newName: scr.sitecore.com/sxp/sitecore-xp1-cd @@ -12,7 +10,7 @@ images: newName: scr.sitecore.com/sxp/sitecore-xp1-cm newTag: 10.2-ltsc2019 - name: sitecore-xp1-id - newName: scr.sitecore.com/sxp/sitecore-id6 + newName: scr.sitecore.com/sxp/sitecore-id7 newTag: 10.2-ltsc2019 - name: sitecore-xp1-cortexprocessing newName: scr.sitecore.com/sxp/sitecore-xp1-cortexprocessing @@ -49,19 +47,18 @@ images: newTag: 10.2-ltsc2019 - name: pwsh-initContainer newName: mcr.microsoft.com/powershell:lts-nanoserver-1809 - resources: - - cm.yaml - - cd.yaml - - id.yaml - - cortexprocessing.yaml - - cortexprocessingworker.yaml - - cortexreporting.yaml - - prc.yaml - - xdbautomation.yaml - - xdbautomationrpt.yaml - - xdbautomationworker.yaml - - xdbcollection.yaml - - xdbrefdata.yaml - - xdbsearch.yaml - - xdbsearchworker.yaml \ No newline at end of file +- cm.yaml +- cd.yaml +- id.yaml +- cortexprocessing.yaml +- cortexprocessingworker.yaml +- cortexreporting.yaml +- prc.yaml +- xdbautomation.yaml +- xdbautomationrpt.yaml +- xdbautomationworker.yaml +- xdbcollection.yaml +- xdbrefdata.yaml +- xdbsearch.yaml +- xdbsearchworker.yaml diff --git a/k8s/sxp/10.2/ltsc2019/xp1/overlays/init/SearchStax/kustomization.yaml b/k8s/sxp/10.2/ltsc2019/xp1/overlays/init/SearchStax/kustomization.yaml index a24f3aa5..2dcd8450 100644 --- a/k8s/sxp/10.2/ltsc2019/xp1/overlays/init/SearchStax/kustomization.yaml +++ b/k8s/sxp/10.2/ltsc2019/xp1/overlays/init/SearchStax/kustomization.yaml @@ -1,17 +1,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - bases: - ..\..\..\init - patchesStrategicMerge: - - solr-init.yaml - +- solr-init.yaml images: - name: sitecore-xp1-solr-init-searchstax newName: scr.sitecore.com/sxp/sitecore-xp1-solr-init-searchstax newTag: 10.2-ltsc2019 - generatorOptions: disableNameSuffixHash: true secretGenerator: @@ -19,4 +15,4 @@ secretGenerator: files: - sitecore-searchstax-apikey.txt - sitecore-searchstax-account-name.txt - - sitecore-searchstax-deployment-uid.txt \ No newline at end of file + - sitecore-searchstax-deployment-uid.txt diff --git a/k8s/sxp/10.2/ltsc2019/xp1/volumes/azurefile/logs.yaml b/k8s/sxp/10.2/ltsc2019/xp1/volumes/azurefile/logs.yaml index 2f53307d..290c5e6d 100644 --- a/k8s/sxp/10.2/ltsc2019/xp1/volumes/azurefile/logs.yaml +++ b/k8s/sxp/10.2/ltsc2019/xp1/volumes/azurefile/logs.yaml @@ -3,7 +3,7 @@ kind: StorageClass apiVersion: storage.k8s.io/v1 metadata: name: logs -provisioner: kubernetes.io/azure-file +provisioner: file.csi.azure.com parameters: skuName: Standard_LRS --- diff --git a/k8s/sxp/10.2/ltsc2019/xp1/volumes/azurefile/submit-queue.yaml b/k8s/sxp/10.2/ltsc2019/xp1/volumes/azurefile/submit-queue.yaml index 07b9bd3e..d88bb2b0 100644 --- a/k8s/sxp/10.2/ltsc2019/xp1/volumes/azurefile/submit-queue.yaml +++ b/k8s/sxp/10.2/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 --- diff --git a/k8s/sxp/10.2/ltsc2022/upgrade/xm1/configuration/database-upgrade-to-version.txt b/k8s/sxp/10.2/ltsc2022/upgrade/xm1/configuration/database-upgrade-to-version.txt index fe46e0dd..85651cb5 100644 --- a/k8s/sxp/10.2/ltsc2022/upgrade/xm1/configuration/database-upgrade-to-version.txt +++ b/k8s/sxp/10.2/ltsc2022/upgrade/xm1/configuration/database-upgrade-to-version.txt @@ -1 +1 @@ -10.2.0 \ No newline at end of file +10.2.1 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2022/upgrade/xm1/mssql-upgrade.yaml b/k8s/sxp/10.2/ltsc2022/upgrade/xm1/mssql-upgrade.yaml index 0724cf4e..a9eff564 100644 --- a/k8s/sxp/10.2/ltsc2022/upgrade/xm1/mssql-upgrade.yaml +++ b/k8s/sxp/10.2/ltsc2022/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 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2022/upgrade/xp1/configuration/database-upgrade-to-version.txt b/k8s/sxp/10.2/ltsc2022/upgrade/xp1/configuration/database-upgrade-to-version.txt index fe46e0dd..85651cb5 100644 --- a/k8s/sxp/10.2/ltsc2022/upgrade/xp1/configuration/database-upgrade-to-version.txt +++ b/k8s/sxp/10.2/ltsc2022/upgrade/xp1/configuration/database-upgrade-to-version.txt @@ -1 +1 @@ -10.2.0 \ No newline at end of file +10.2.1 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2022/xm1/external/solr.yaml b/k8s/sxp/10.2/ltsc2022/xm1/external/solr.yaml index fa2ef381..0e3f533f 100644 --- a/k8s/sxp/10.2/ltsc2022/xm1/external/solr.yaml +++ b/k8s/sxp/10.2/ltsc2022/xm1/external/solr.yaml @@ -62,4 +62,4 @@ spec: cpu: 1500m volumes: - emptyDir: {} - name: tmp + name: tmp \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2022/xm1/id.yaml b/k8s/sxp/10.2/ltsc2022/xm1/id.yaml index 259a8601..ad6ae230 100644 --- a/k8s/sxp/10.2/ltsc2022/xm1/id.yaml +++ b/k8s/sxp/10.2/ltsc2022/xm1/id.yaml @@ -112,4 +112,4 @@ spec: persistentVolumeClaim: claimName: logs imagePullSecrets: - - name: sitecore-docker-registry + - name: sitecore-docker-registry \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2022/xm1/ingress-nginx/kustomization.yaml b/k8s/sxp/10.2/ltsc2022/xm1/ingress-nginx/kustomization.yaml index 55e63084..5774fcd6 100644 --- a/k8s/sxp/10.2/ltsc2022/xm1/ingress-nginx/kustomization.yaml +++ b/k8s/sxp/10.2/ltsc2022/xm1/ingress-nginx/kustomization.yaml @@ -15,4 +15,4 @@ vars: name: sitecore-hostnames apiVersion: v1 fieldref: - fieldpath: data.cd-hostname + fieldpath: data.cd-hostname \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2022/xm1/init/mssql-init.yaml b/k8s/sxp/10.2/ltsc2022/xm1/init/mssql-init.yaml index d3b0bd97..e52e4ec9 100644 --- a/k8s/sxp/10.2/ltsc2022/xm1/init/mssql-init.yaml +++ b/k8s/sxp/10.2/ltsc2022/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 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2022/xm1/init/solr-init.yaml b/k8s/sxp/10.2/ltsc2022/xm1/init/solr-init.yaml index 82e32ef2..6e4f1700 100644 --- a/k8s/sxp/10.2/ltsc2022/xm1/init/solr-init.yaml +++ b/k8s/sxp/10.2/ltsc2022/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 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2022/xm1/kustomization.yaml b/k8s/sxp/10.2/ltsc2022/xm1/kustomization.yaml index 8654329e..522f4e0d 100644 --- a/k8s/sxp/10.2/ltsc2022/xm1/kustomization.yaml +++ b/k8s/sxp/10.2/ltsc2022/xm1/kustomization.yaml @@ -12,7 +12,7 @@ images: newName: scr.sitecore.com/sxp/sitecore-xm1-cm newTag: 10.2-ltsc2022 - name: sitecore-xm1-id - newName: scr.sitecore.com/sxp/sitecore-id6 + newName: scr.sitecore.com/sxp/sitecore-id7 newTag: 10.2-ltsc2022 resources: diff --git a/k8s/sxp/10.2/ltsc2022/xm1/secrets/kustomization.yaml b/k8s/sxp/10.2/ltsc2022/xm1/secrets/kustomization.yaml index 6b9f20c3..29ef5b40 100644 --- a/k8s/sxp/10.2/ltsc2022/xm1/secrets/kustomization.yaml +++ b/k8s/sxp/10.2/ltsc2022/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 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2022/xm1/volumes/azurefile/logs.yaml b/k8s/sxp/10.2/ltsc2022/xm1/volumes/azurefile/logs.yaml index 2f53307d..290c5e6d 100644 --- a/k8s/sxp/10.2/ltsc2022/xm1/volumes/azurefile/logs.yaml +++ b/k8s/sxp/10.2/ltsc2022/xm1/volumes/azurefile/logs.yaml @@ -3,7 +3,7 @@ kind: StorageClass apiVersion: storage.k8s.io/v1 metadata: name: logs -provisioner: kubernetes.io/azure-file +provisioner: file.csi.azure.com parameters: skuName: Standard_LRS --- diff --git a/k8s/sxp/10.2/ltsc2022/xp1/cortexprocessingworker.yaml b/k8s/sxp/10.2/ltsc2022/xp1/cortexprocessingworker.yaml index 8831cb10..8785162d 100644 --- a/k8s/sxp/10.2/ltsc2022/xp1/cortexprocessingworker.yaml +++ b/k8s/sxp/10.2/ltsc2022/xp1/cortexprocessingworker.yaml @@ -122,4 +122,4 @@ spec: persistentVolumeClaim: claimName: logs imagePullSecrets: - - name: sitecore-docker-registry + - name: sitecore-docker-registry \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2022/xp1/external/solr.yaml b/k8s/sxp/10.2/ltsc2022/xp1/external/solr.yaml index f1c52f48..a62ad43d 100644 --- a/k8s/sxp/10.2/ltsc2022/xp1/external/solr.yaml +++ b/k8s/sxp/10.2/ltsc2022/xp1/external/solr.yaml @@ -62,4 +62,4 @@ spec: cpu: 1500m volumes: - emptyDir: {} - name: tmp + name: tmp \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2022/xp1/id.yaml b/k8s/sxp/10.2/ltsc2022/xp1/id.yaml index c39eff05..92d8a8b4 100644 --- a/k8s/sxp/10.2/ltsc2022/xp1/id.yaml +++ b/k8s/sxp/10.2/ltsc2022/xp1/id.yaml @@ -112,4 +112,4 @@ spec: persistentVolumeClaim: claimName: logs imagePullSecrets: - - name: sitecore-docker-registry + - name: sitecore-docker-registry \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2022/xp1/init/solr-init.yaml b/k8s/sxp/10.2/ltsc2022/xp1/init/solr-init.yaml index a85a95d0..1efdb3c1 100644 --- a/k8s/sxp/10.2/ltsc2022/xp1/init/solr-init.yaml +++ b/k8s/sxp/10.2/ltsc2022/xp1/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 \ No newline at end of file diff --git a/k8s/sxp/10.2/ltsc2022/xp1/kustomization.yaml b/k8s/sxp/10.2/ltsc2022/xp1/kustomization.yaml index b45da42d..b69232db 100644 --- a/k8s/sxp/10.2/ltsc2022/xp1/kustomization.yaml +++ b/k8s/sxp/10.2/ltsc2022/xp1/kustomization.yaml @@ -12,7 +12,7 @@ images: newName: scr.sitecore.com/sxp/sitecore-xp1-cm newTag: 10.2-ltsc2022 - name: sitecore-xp1-id - newName: scr.sitecore.com/sxp/sitecore-id6 + newName: scr.sitecore.com/sxp/sitecore-id7 newTag: 10.2-ltsc2022 - name: sitecore-xp1-cortexprocessing newName: scr.sitecore.com/sxp/sitecore-xp1-cortexprocessing diff --git a/k8s/sxp/10.2/ltsc2022/xp1/volumes/azurefile/logs.yaml b/k8s/sxp/10.2/ltsc2022/xp1/volumes/azurefile/logs.yaml index 2f53307d..290c5e6d 100644 --- a/k8s/sxp/10.2/ltsc2022/xp1/volumes/azurefile/logs.yaml +++ b/k8s/sxp/10.2/ltsc2022/xp1/volumes/azurefile/logs.yaml @@ -3,7 +3,7 @@ kind: StorageClass apiVersion: storage.k8s.io/v1 metadata: name: logs -provisioner: kubernetes.io/azure-file +provisioner: file.csi.azure.com parameters: skuName: Standard_LRS --- diff --git a/k8s/sxp/10.2/ltsc2022/xp1/volumes/azurefile/submit-queue.yaml b/k8s/sxp/10.2/ltsc2022/xp1/volumes/azurefile/submit-queue.yaml index 07b9bd3e..d88bb2b0 100644 --- a/k8s/sxp/10.2/ltsc2022/xp1/volumes/azurefile/submit-queue.yaml +++ b/k8s/sxp/10.2/ltsc2022/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 ---