From f7e706af69fd2020ec61b61b77ca673207d347c6 Mon Sep 17 00:00:00 2001 From: Ivan Domashchenko Date: Fri, 26 Apr 2024 18:19:23 +0800 Subject: [PATCH 1/2] Add Sitecore Experience Edge Connector Container Deployment 22.0.2.0002.668 --- compose/expedge/22.0/ltsc2019/.env-example | 7 +++ .../ltsc2019/docker-compose.xe.override.yml | 23 ++++++++ compose/expedge/22.0/ltsc2022/.env-example | 7 +++ .../ltsc2022/docker-compose.xe.override.yml | 23 ++++++++ .../ltsc2019/overrides/xm1/kustomization.yaml | 13 +++++ .../ltsc2019/overrides/xm1/patch-cm.xe.yaml | 57 +++++++++++++++++++ .../overrides/xm1/secrets/kustomization.yaml | 14 +++++ .../sitecore-experienceedge-connection.txt | 0 .../ltsc2019/overrides/xp1/kustomization.yaml | 13 +++++ .../ltsc2019/overrides/xp1/patch-cm.xe.yaml | 57 +++++++++++++++++++ .../overrides/xp1/secrets/kustomization.yaml | 14 +++++ .../sitecore-experienceedge-connection.txt | 0 .../ltsc2022/overrides/xm1/kustomization.yaml | 13 +++++ .../ltsc2022/overrides/xm1/patch-cm.xe.yaml | 57 +++++++++++++++++++ .../overrides/xm1/secrets/kustomization.yaml | 14 +++++ .../sitecore-experienceedge-connection.txt | 0 .../ltsc2022/overrides/xp1/kustomization.yaml | 13 +++++ .../ltsc2022/overrides/xp1/patch-cm.xe.yaml | 57 +++++++++++++++++++ .../overrides/xp1/secrets/kustomization.yaml | 14 +++++ .../sitecore-experienceedge-connection.txt | 0 20 files changed, 396 insertions(+) create mode 100644 compose/expedge/22.0/ltsc2019/.env-example create mode 100644 compose/expedge/22.0/ltsc2019/docker-compose.xe.override.yml create mode 100644 compose/expedge/22.0/ltsc2022/.env-example create mode 100644 compose/expedge/22.0/ltsc2022/docker-compose.xe.override.yml create mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xm1/kustomization.yaml create mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xm1/patch-cm.xe.yaml create mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xm1/secrets/kustomization.yaml create mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xm1/secrets/sitecore-experienceedge-connection.txt create mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xp1/kustomization.yaml create mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xp1/patch-cm.xe.yaml create mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xp1/secrets/kustomization.yaml create mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xp1/secrets/sitecore-experienceedge-connection.txt create mode 100644 k8s/expedge/22.0/ltsc2022/overrides/xm1/kustomization.yaml create mode 100644 k8s/expedge/22.0/ltsc2022/overrides/xm1/patch-cm.xe.yaml create mode 100644 k8s/expedge/22.0/ltsc2022/overrides/xm1/secrets/kustomization.yaml create mode 100644 k8s/expedge/22.0/ltsc2022/overrides/xm1/secrets/sitecore-experienceedge-connection.txt create mode 100644 k8s/expedge/22.0/ltsc2022/overrides/xp1/kustomization.yaml create mode 100644 k8s/expedge/22.0/ltsc2022/overrides/xp1/patch-cm.xe.yaml create mode 100644 k8s/expedge/22.0/ltsc2022/overrides/xp1/secrets/kustomization.yaml create mode 100644 k8s/expedge/22.0/ltsc2022/overrides/xp1/secrets/sitecore-experienceedge-connection.txt diff --git a/compose/expedge/22.0/ltsc2019/.env-example b/compose/expedge/22.0/ltsc2019/.env-example new file mode 100644 index 00000000..1187df71 --- /dev/null +++ b/compose/expedge/22.0/ltsc2019/.env-example @@ -0,0 +1,7 @@ +# Add the following environment variables to the Sitecore Platform .env file + +VERSION= + +TOPOLOGY= + +XE_CONNECTION= diff --git a/compose/expedge/22.0/ltsc2019/docker-compose.xe.override.yml b/compose/expedge/22.0/ltsc2019/docker-compose.xe.override.yml new file mode 100644 index 00000000..25a06f29 --- /dev/null +++ b/compose/expedge/22.0/ltsc2019/docker-compose.xe.override.yml @@ -0,0 +1,23 @@ +version: "2.4" +services: + cm: + image: sitecore-experience-edge-connector-${TOPOLOGY}-cm:${VERSION} + environment: + Sitecore_ConnectionStrings_ExperienceEdge: "${XE_CONNECTION}" + Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerAttemptsBeforeBreak: "12" + Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerDurationOfBreak: "00:15:00" + Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureRetryCount: "3" + Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureSleepTime: "00:00:10" + Sitecore_ExperienceEdge_EnableItemLanguageFallback: "false" + Sitecore_ExperienceEdge_EnableFieldLanguageFallback: "false" + Sitecore_ExperienceEdge_MaxExportEntitiesThreadCount: "20" + Sitecore_ExperienceEdge_MaxPublishThreadCount: "2" + Sitecore_ExperienceEdge_ExportEntitiesBufferSize: "500" + Sitecore_ExperienceEdge_ExportPublishEventsBatchSize: "150" + Sitecore_ExperienceEdge_LayoutService_ConfigName: "default" + Sitecore_ExperienceEdge_MaxMetadataCacheSize: "30MB" + Sitecore_ExperienceEdge_CheckDeltaStatusBatchSize: "250" + Sitecore_ExperienceEdge_AckCleanupTimeoutSeconds: "5" + Sitecore_ExperienceEdge_AckBatchWaitTimeoutSeconds: "120" + Sitecore_ExperienceEdge_AckWaitTimeoutSeconds: "600" + Sitecore_ExperienceEdge_MaxDependencyResolutionThreadCount: "5" diff --git a/compose/expedge/22.0/ltsc2022/.env-example b/compose/expedge/22.0/ltsc2022/.env-example new file mode 100644 index 00000000..1187df71 --- /dev/null +++ b/compose/expedge/22.0/ltsc2022/.env-example @@ -0,0 +1,7 @@ +# Add the following environment variables to the Sitecore Platform .env file + +VERSION= + +TOPOLOGY= + +XE_CONNECTION= diff --git a/compose/expedge/22.0/ltsc2022/docker-compose.xe.override.yml b/compose/expedge/22.0/ltsc2022/docker-compose.xe.override.yml new file mode 100644 index 00000000..25a06f29 --- /dev/null +++ b/compose/expedge/22.0/ltsc2022/docker-compose.xe.override.yml @@ -0,0 +1,23 @@ +version: "2.4" +services: + cm: + image: sitecore-experience-edge-connector-${TOPOLOGY}-cm:${VERSION} + environment: + Sitecore_ConnectionStrings_ExperienceEdge: "${XE_CONNECTION}" + Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerAttemptsBeforeBreak: "12" + Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerDurationOfBreak: "00:15:00" + Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureRetryCount: "3" + Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureSleepTime: "00:00:10" + Sitecore_ExperienceEdge_EnableItemLanguageFallback: "false" + Sitecore_ExperienceEdge_EnableFieldLanguageFallback: "false" + Sitecore_ExperienceEdge_MaxExportEntitiesThreadCount: "20" + Sitecore_ExperienceEdge_MaxPublishThreadCount: "2" + Sitecore_ExperienceEdge_ExportEntitiesBufferSize: "500" + Sitecore_ExperienceEdge_ExportPublishEventsBatchSize: "150" + Sitecore_ExperienceEdge_LayoutService_ConfigName: "default" + Sitecore_ExperienceEdge_MaxMetadataCacheSize: "30MB" + Sitecore_ExperienceEdge_CheckDeltaStatusBatchSize: "250" + Sitecore_ExperienceEdge_AckCleanupTimeoutSeconds: "5" + Sitecore_ExperienceEdge_AckBatchWaitTimeoutSeconds: "120" + Sitecore_ExperienceEdge_AckWaitTimeoutSeconds: "600" + Sitecore_ExperienceEdge_MaxDependencyResolutionThreadCount: "5" diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xm1/kustomization.yaml b/k8s/expedge/22.0/ltsc2019/overrides/xm1/kustomization.yaml new file mode 100644 index 00000000..3f9a680a --- /dev/null +++ b/k8s/expedge/22.0/ltsc2019/overrides/xm1/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +bases: +- ../../xm1 + +images: +- name: scr.sitecore.com/sxp/sitecore-xm1-cm + newName: "{registry}/sitecore-experience-edge-connector-xm1-cm" + newTag: tag + +patchesStrategicMerge: +- patch-cm.xe.yaml diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xm1/patch-cm.xe.yaml b/k8s/expedge/22.0/ltsc2019/overrides/xm1/patch-cm.xe.yaml new file mode 100644 index 00000000..bea6fd4a --- /dev/null +++ b/k8s/expedge/22.0/ltsc2019/overrides/xm1/patch-cm.xe.yaml @@ -0,0 +1,57 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cm +spec: + selector: + matchLabels: + app: cm + template: + metadata: + labels: + app: cm + spec: + nodeSelector: + kubernetes.io/os: windows + containers: + - name: sitecore-xm1-cm + env: + - name: Sitecore_ConnectionStrings_ExperienceEdge + valueFrom: + secretKeyRef: + name: sitecore-experienceedge + key: sitecore-experienceedge-connection.txt + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerAttemptsBeforeBreak + value: "12" + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerDurationOfBreak + value: "00:15:00" + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureRetryCount + value: "3" + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureSleepTime + value: "00:00:10" + - name: Sitecore_ExperienceEdge_EnableItemLanguageFallback + value: "false" + - name: Sitecore_ExperienceEdge_EnableFieldLanguageFallback + value: "false" + - name: Sitecore_ExperienceEdge_MaxExportEntitiesThreadCount + value: "20" + - name: Sitecore_ExperienceEdge_MaxPublishThreadCount + value: "2" + - name: Sitecore_ExperienceEdge_ExportEntitiesBufferSize + value: "500" + - name: Sitecore_ExperienceEdge_ExportPublishEventsBatchSize + value: "150" + - name: Sitecore_ExperienceEdge_LayoutService_ConfigName + value: "default" + - name: Sitecore_ExperienceEdge_MaxMetadataCacheSize + value: "30MB" + - name: Sitecore_ExperienceEdge_CheckDeltaStatusBatchSize + value: "250" + - name: Sitecore_ExperienceEdge_AckCleanupTimeoutSeconds + value: "5" + - name: Sitecore_ExperienceEdge_AckBatchWaitTimeoutSeconds + value: "120" + - name: Sitecore_ExperienceEdge_AckWaitTimeoutSeconds + value: "600" + - name: Sitecore_ExperienceEdge_MaxDependencyResolutionThreadCount + value: "5" diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xm1/secrets/kustomization.yaml b/k8s/expedge/22.0/ltsc2019/overrides/xm1/secrets/kustomization.yaml new file mode 100644 index 00000000..6338d03b --- /dev/null +++ b/k8s/expedge/22.0/ltsc2019/overrides/xm1/secrets/kustomization.yaml @@ -0,0 +1,14 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +bases: +- ../../../xm1/secrets + +generatorOptions: + disableNameSuffixHash: true + +secretGenerator: +- name: sitecore-experienceedge + files: + - sitecore-experienceedge-connection.txt + diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xm1/secrets/sitecore-experienceedge-connection.txt b/k8s/expedge/22.0/ltsc2019/overrides/xm1/secrets/sitecore-experienceedge-connection.txt new file mode 100644 index 00000000..e69de29b diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xp1/kustomization.yaml b/k8s/expedge/22.0/ltsc2019/overrides/xp1/kustomization.yaml new file mode 100644 index 00000000..d33a2d20 --- /dev/null +++ b/k8s/expedge/22.0/ltsc2019/overrides/xp1/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +bases: +- ../../xp1 + +images: +- name: scr.sitecore.com/sxp/sitecore-xp1-cm + newName: "{registry}/sitecore-experience-edge-connector-xp1-cm" + newTag: tag + +patchesStrategicMerge: +- patch-cm.xe.yaml diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xp1/patch-cm.xe.yaml b/k8s/expedge/22.0/ltsc2019/overrides/xp1/patch-cm.xe.yaml new file mode 100644 index 00000000..8461c4e6 --- /dev/null +++ b/k8s/expedge/22.0/ltsc2019/overrides/xp1/patch-cm.xe.yaml @@ -0,0 +1,57 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cm +spec: + selector: + matchLabels: + app: cm + template: + metadata: + labels: + app: cm + spec: + nodeSelector: + kubernetes.io/os: windows + containers: + - name: sitecore-xp1-cm + env: + - name: Sitecore_ConnectionStrings_ExperienceEdge + valueFrom: + secretKeyRef: + name: sitecore-experienceedge + key: sitecore-experienceedge-connection.txt + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerAttemptsBeforeBreak + value: "12" + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerDurationOfBreak + value: "00:15:00" + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureRetryCount + value: "3" + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureSleepTime + value: "00:00:10" + - name: Sitecore_ExperienceEdge_EnableItemLanguageFallback + value: "false" + - name: Sitecore_ExperienceEdge_EnableFieldLanguageFallback + value: "false" + - name: Sitecore_ExperienceEdge_MaxExportEntitiesThreadCount + value: "20" + - name: Sitecore_ExperienceEdge_MaxPublishThreadCount + value: "2" + - name: Sitecore_ExperienceEdge_ExportEntitiesBufferSize + value: "500" + - name: Sitecore_ExperienceEdge_ExportPublishEventsBatchSize + value: "150" + - name: Sitecore_ExperienceEdge_LayoutService_ConfigName + value: "default" + - name: Sitecore_ExperienceEdge_MaxMetadataCacheSize + value: "30MB" + - name: Sitecore_ExperienceEdge_CheckDeltaStatusBatchSize + value: "250" + - name: Sitecore_ExperienceEdge_AckCleanupTimeoutSeconds + value: "5" + - name: Sitecore_ExperienceEdge_AckBatchWaitTimeoutSeconds + value: "120" + - name: Sitecore_ExperienceEdge_AckWaitTimeoutSeconds + value: "600" + - name: Sitecore_ExperienceEdge_MaxDependencyResolutionThreadCount + value: "5" diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xp1/secrets/kustomization.yaml b/k8s/expedge/22.0/ltsc2019/overrides/xp1/secrets/kustomization.yaml new file mode 100644 index 00000000..3a7f5783 --- /dev/null +++ b/k8s/expedge/22.0/ltsc2019/overrides/xp1/secrets/kustomization.yaml @@ -0,0 +1,14 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +bases: +- ../../../xp1/secrets + +generatorOptions: + disableNameSuffixHash: true + +secretGenerator: +- name: sitecore-experienceedge + files: + - sitecore-experienceedge-connection.txt + diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xp1/secrets/sitecore-experienceedge-connection.txt b/k8s/expedge/22.0/ltsc2019/overrides/xp1/secrets/sitecore-experienceedge-connection.txt new file mode 100644 index 00000000..e69de29b diff --git a/k8s/expedge/22.0/ltsc2022/overrides/xm1/kustomization.yaml b/k8s/expedge/22.0/ltsc2022/overrides/xm1/kustomization.yaml new file mode 100644 index 00000000..3f9a680a --- /dev/null +++ b/k8s/expedge/22.0/ltsc2022/overrides/xm1/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +bases: +- ../../xm1 + +images: +- name: scr.sitecore.com/sxp/sitecore-xm1-cm + newName: "{registry}/sitecore-experience-edge-connector-xm1-cm" + newTag: tag + +patchesStrategicMerge: +- patch-cm.xe.yaml diff --git a/k8s/expedge/22.0/ltsc2022/overrides/xm1/patch-cm.xe.yaml b/k8s/expedge/22.0/ltsc2022/overrides/xm1/patch-cm.xe.yaml new file mode 100644 index 00000000..bea6fd4a --- /dev/null +++ b/k8s/expedge/22.0/ltsc2022/overrides/xm1/patch-cm.xe.yaml @@ -0,0 +1,57 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cm +spec: + selector: + matchLabels: + app: cm + template: + metadata: + labels: + app: cm + spec: + nodeSelector: + kubernetes.io/os: windows + containers: + - name: sitecore-xm1-cm + env: + - name: Sitecore_ConnectionStrings_ExperienceEdge + valueFrom: + secretKeyRef: + name: sitecore-experienceedge + key: sitecore-experienceedge-connection.txt + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerAttemptsBeforeBreak + value: "12" + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerDurationOfBreak + value: "00:15:00" + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureRetryCount + value: "3" + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureSleepTime + value: "00:00:10" + - name: Sitecore_ExperienceEdge_EnableItemLanguageFallback + value: "false" + - name: Sitecore_ExperienceEdge_EnableFieldLanguageFallback + value: "false" + - name: Sitecore_ExperienceEdge_MaxExportEntitiesThreadCount + value: "20" + - name: Sitecore_ExperienceEdge_MaxPublishThreadCount + value: "2" + - name: Sitecore_ExperienceEdge_ExportEntitiesBufferSize + value: "500" + - name: Sitecore_ExperienceEdge_ExportPublishEventsBatchSize + value: "150" + - name: Sitecore_ExperienceEdge_LayoutService_ConfigName + value: "default" + - name: Sitecore_ExperienceEdge_MaxMetadataCacheSize + value: "30MB" + - name: Sitecore_ExperienceEdge_CheckDeltaStatusBatchSize + value: "250" + - name: Sitecore_ExperienceEdge_AckCleanupTimeoutSeconds + value: "5" + - name: Sitecore_ExperienceEdge_AckBatchWaitTimeoutSeconds + value: "120" + - name: Sitecore_ExperienceEdge_AckWaitTimeoutSeconds + value: "600" + - name: Sitecore_ExperienceEdge_MaxDependencyResolutionThreadCount + value: "5" diff --git a/k8s/expedge/22.0/ltsc2022/overrides/xm1/secrets/kustomization.yaml b/k8s/expedge/22.0/ltsc2022/overrides/xm1/secrets/kustomization.yaml new file mode 100644 index 00000000..6338d03b --- /dev/null +++ b/k8s/expedge/22.0/ltsc2022/overrides/xm1/secrets/kustomization.yaml @@ -0,0 +1,14 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +bases: +- ../../../xm1/secrets + +generatorOptions: + disableNameSuffixHash: true + +secretGenerator: +- name: sitecore-experienceedge + files: + - sitecore-experienceedge-connection.txt + diff --git a/k8s/expedge/22.0/ltsc2022/overrides/xm1/secrets/sitecore-experienceedge-connection.txt b/k8s/expedge/22.0/ltsc2022/overrides/xm1/secrets/sitecore-experienceedge-connection.txt new file mode 100644 index 00000000..e69de29b diff --git a/k8s/expedge/22.0/ltsc2022/overrides/xp1/kustomization.yaml b/k8s/expedge/22.0/ltsc2022/overrides/xp1/kustomization.yaml new file mode 100644 index 00000000..d33a2d20 --- /dev/null +++ b/k8s/expedge/22.0/ltsc2022/overrides/xp1/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +bases: +- ../../xp1 + +images: +- name: scr.sitecore.com/sxp/sitecore-xp1-cm + newName: "{registry}/sitecore-experience-edge-connector-xp1-cm" + newTag: tag + +patchesStrategicMerge: +- patch-cm.xe.yaml diff --git a/k8s/expedge/22.0/ltsc2022/overrides/xp1/patch-cm.xe.yaml b/k8s/expedge/22.0/ltsc2022/overrides/xp1/patch-cm.xe.yaml new file mode 100644 index 00000000..8461c4e6 --- /dev/null +++ b/k8s/expedge/22.0/ltsc2022/overrides/xp1/patch-cm.xe.yaml @@ -0,0 +1,57 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: cm +spec: + selector: + matchLabels: + app: cm + template: + metadata: + labels: + app: cm + spec: + nodeSelector: + kubernetes.io/os: windows + containers: + - name: sitecore-xp1-cm + env: + - name: Sitecore_ConnectionStrings_ExperienceEdge + valueFrom: + secretKeyRef: + name: sitecore-experienceedge + key: sitecore-experienceedge-connection.txt + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerAttemptsBeforeBreak + value: "12" + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerDurationOfBreak + value: "00:15:00" + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureRetryCount + value: "3" + - name: Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureSleepTime + value: "00:00:10" + - name: Sitecore_ExperienceEdge_EnableItemLanguageFallback + value: "false" + - name: Sitecore_ExperienceEdge_EnableFieldLanguageFallback + value: "false" + - name: Sitecore_ExperienceEdge_MaxExportEntitiesThreadCount + value: "20" + - name: Sitecore_ExperienceEdge_MaxPublishThreadCount + value: "2" + - name: Sitecore_ExperienceEdge_ExportEntitiesBufferSize + value: "500" + - name: Sitecore_ExperienceEdge_ExportPublishEventsBatchSize + value: "150" + - name: Sitecore_ExperienceEdge_LayoutService_ConfigName + value: "default" + - name: Sitecore_ExperienceEdge_MaxMetadataCacheSize + value: "30MB" + - name: Sitecore_ExperienceEdge_CheckDeltaStatusBatchSize + value: "250" + - name: Sitecore_ExperienceEdge_AckCleanupTimeoutSeconds + value: "5" + - name: Sitecore_ExperienceEdge_AckBatchWaitTimeoutSeconds + value: "120" + - name: Sitecore_ExperienceEdge_AckWaitTimeoutSeconds + value: "600" + - name: Sitecore_ExperienceEdge_MaxDependencyResolutionThreadCount + value: "5" diff --git a/k8s/expedge/22.0/ltsc2022/overrides/xp1/secrets/kustomization.yaml b/k8s/expedge/22.0/ltsc2022/overrides/xp1/secrets/kustomization.yaml new file mode 100644 index 00000000..3a7f5783 --- /dev/null +++ b/k8s/expedge/22.0/ltsc2022/overrides/xp1/secrets/kustomization.yaml @@ -0,0 +1,14 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +bases: +- ../../../xp1/secrets + +generatorOptions: + disableNameSuffixHash: true + +secretGenerator: +- name: sitecore-experienceedge + files: + - sitecore-experienceedge-connection.txt + diff --git a/k8s/expedge/22.0/ltsc2022/overrides/xp1/secrets/sitecore-experienceedge-connection.txt b/k8s/expedge/22.0/ltsc2022/overrides/xp1/secrets/sitecore-experienceedge-connection.txt new file mode 100644 index 00000000..e69de29b From 8340973f30725d8f050427d4b0a58497d6e945b0 Mon Sep 17 00:00:00 2001 From: sc-garvsudhirnair Date: Mon, 29 Apr 2024 12:26:03 +0800 Subject: [PATCH 2/2] Removed ltsc2019 images --- compose/expedge/22.0/ltsc2019/.env-example | 7 --- .../ltsc2019/docker-compose.xe.override.yml | 23 -------- .../ltsc2019/overrides/xm1/kustomization.yaml | 13 ----- .../ltsc2019/overrides/xm1/patch-cm.xe.yaml | 57 ------------------- .../overrides/xm1/secrets/kustomization.yaml | 14 ----- .../sitecore-experienceedge-connection.txt | 0 .../ltsc2019/overrides/xp1/kustomization.yaml | 13 ----- .../ltsc2019/overrides/xp1/patch-cm.xe.yaml | 57 ------------------- .../overrides/xp1/secrets/kustomization.yaml | 14 ----- .../sitecore-experienceedge-connection.txt | 0 10 files changed, 198 deletions(-) delete mode 100644 compose/expedge/22.0/ltsc2019/.env-example delete mode 100644 compose/expedge/22.0/ltsc2019/docker-compose.xe.override.yml delete mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xm1/kustomization.yaml delete mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xm1/patch-cm.xe.yaml delete mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xm1/secrets/kustomization.yaml delete mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xm1/secrets/sitecore-experienceedge-connection.txt delete mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xp1/kustomization.yaml delete mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xp1/patch-cm.xe.yaml delete mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xp1/secrets/kustomization.yaml delete mode 100644 k8s/expedge/22.0/ltsc2019/overrides/xp1/secrets/sitecore-experienceedge-connection.txt diff --git a/compose/expedge/22.0/ltsc2019/.env-example b/compose/expedge/22.0/ltsc2019/.env-example deleted file mode 100644 index 1187df71..00000000 --- a/compose/expedge/22.0/ltsc2019/.env-example +++ /dev/null @@ -1,7 +0,0 @@ -# Add the following environment variables to the Sitecore Platform .env file - -VERSION= - -TOPOLOGY= - -XE_CONNECTION= diff --git a/compose/expedge/22.0/ltsc2019/docker-compose.xe.override.yml b/compose/expedge/22.0/ltsc2019/docker-compose.xe.override.yml deleted file mode 100644 index 25a06f29..00000000 --- a/compose/expedge/22.0/ltsc2019/docker-compose.xe.override.yml +++ /dev/null @@ -1,23 +0,0 @@ -version: "2.4" -services: - cm: - image: sitecore-experience-edge-connector-${TOPOLOGY}-cm:${VERSION} - environment: - Sitecore_ConnectionStrings_ExperienceEdge: "${XE_CONNECTION}" - Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerAttemptsBeforeBreak: "12" - Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerDurationOfBreak: "00:15:00" - Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureRetryCount: "3" - Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureSleepTime: "00:00:10" - Sitecore_ExperienceEdge_EnableItemLanguageFallback: "false" - Sitecore_ExperienceEdge_EnableFieldLanguageFallback: "false" - Sitecore_ExperienceEdge_MaxExportEntitiesThreadCount: "20" - Sitecore_ExperienceEdge_MaxPublishThreadCount: "2" - Sitecore_ExperienceEdge_ExportEntitiesBufferSize: "500" - Sitecore_ExperienceEdge_ExportPublishEventsBatchSize: "150" - Sitecore_ExperienceEdge_LayoutService_ConfigName: "default" - Sitecore_ExperienceEdge_MaxMetadataCacheSize: "30MB" - Sitecore_ExperienceEdge_CheckDeltaStatusBatchSize: "250" - Sitecore_ExperienceEdge_AckCleanupTimeoutSeconds: "5" - Sitecore_ExperienceEdge_AckBatchWaitTimeoutSeconds: "120" - Sitecore_ExperienceEdge_AckWaitTimeoutSeconds: "600" - Sitecore_ExperienceEdge_MaxDependencyResolutionThreadCount: "5" diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xm1/kustomization.yaml b/k8s/expedge/22.0/ltsc2019/overrides/xm1/kustomization.yaml deleted file mode 100644 index 3f9a680a..00000000 --- a/k8s/expedge/22.0/ltsc2019/overrides/xm1/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -bases: -- ../../xm1 - -images: -- name: scr.sitecore.com/sxp/sitecore-xm1-cm - newName: "{registry}/sitecore-experience-edge-connector-xm1-cm" - newTag: tag - -patchesStrategicMerge: -- patch-cm.xe.yaml diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xm1/patch-cm.xe.yaml b/k8s/expedge/22.0/ltsc2019/overrides/xm1/patch-cm.xe.yaml deleted file mode 100644 index bea6fd4a..00000000 --- a/k8s/expedge/22.0/ltsc2019/overrides/xm1/patch-cm.xe.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cm -spec: - selector: - matchLabels: - app: cm - template: - metadata: - labels: - app: cm - spec: - nodeSelector: - kubernetes.io/os: windows - containers: - - name: sitecore-xm1-cm - env: - - name: Sitecore_ConnectionStrings_ExperienceEdge - valueFrom: - secretKeyRef: - name: sitecore-experienceedge - key: sitecore-experienceedge-connection.txt - - name: Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerAttemptsBeforeBreak - value: "12" - - name: Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerDurationOfBreak - value: "00:15:00" - - name: Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureRetryCount - value: "3" - - name: Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureSleepTime - value: "00:00:10" - - name: Sitecore_ExperienceEdge_EnableItemLanguageFallback - value: "false" - - name: Sitecore_ExperienceEdge_EnableFieldLanguageFallback - value: "false" - - name: Sitecore_ExperienceEdge_MaxExportEntitiesThreadCount - value: "20" - - name: Sitecore_ExperienceEdge_MaxPublishThreadCount - value: "2" - - name: Sitecore_ExperienceEdge_ExportEntitiesBufferSize - value: "500" - - name: Sitecore_ExperienceEdge_ExportPublishEventsBatchSize - value: "150" - - name: Sitecore_ExperienceEdge_LayoutService_ConfigName - value: "default" - - name: Sitecore_ExperienceEdge_MaxMetadataCacheSize - value: "30MB" - - name: Sitecore_ExperienceEdge_CheckDeltaStatusBatchSize - value: "250" - - name: Sitecore_ExperienceEdge_AckCleanupTimeoutSeconds - value: "5" - - name: Sitecore_ExperienceEdge_AckBatchWaitTimeoutSeconds - value: "120" - - name: Sitecore_ExperienceEdge_AckWaitTimeoutSeconds - value: "600" - - name: Sitecore_ExperienceEdge_MaxDependencyResolutionThreadCount - value: "5" diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xm1/secrets/kustomization.yaml b/k8s/expedge/22.0/ltsc2019/overrides/xm1/secrets/kustomization.yaml deleted file mode 100644 index 6338d03b..00000000 --- a/k8s/expedge/22.0/ltsc2019/overrides/xm1/secrets/kustomization.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -bases: -- ../../../xm1/secrets - -generatorOptions: - disableNameSuffixHash: true - -secretGenerator: -- name: sitecore-experienceedge - files: - - sitecore-experienceedge-connection.txt - diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xm1/secrets/sitecore-experienceedge-connection.txt b/k8s/expedge/22.0/ltsc2019/overrides/xm1/secrets/sitecore-experienceedge-connection.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xp1/kustomization.yaml b/k8s/expedge/22.0/ltsc2019/overrides/xp1/kustomization.yaml deleted file mode 100644 index d33a2d20..00000000 --- a/k8s/expedge/22.0/ltsc2019/overrides/xp1/kustomization.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -bases: -- ../../xp1 - -images: -- name: scr.sitecore.com/sxp/sitecore-xp1-cm - newName: "{registry}/sitecore-experience-edge-connector-xp1-cm" - newTag: tag - -patchesStrategicMerge: -- patch-cm.xe.yaml diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xp1/patch-cm.xe.yaml b/k8s/expedge/22.0/ltsc2019/overrides/xp1/patch-cm.xe.yaml deleted file mode 100644 index 8461c4e6..00000000 --- a/k8s/expedge/22.0/ltsc2019/overrides/xp1/patch-cm.xe.yaml +++ /dev/null @@ -1,57 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: cm -spec: - selector: - matchLabels: - app: cm - template: - metadata: - labels: - app: cm - spec: - nodeSelector: - kubernetes.io/os: windows - containers: - - name: sitecore-xp1-cm - env: - - name: Sitecore_ConnectionStrings_ExperienceEdge - valueFrom: - secretKeyRef: - name: sitecore-experienceedge - key: sitecore-experienceedge-connection.txt - - name: Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerAttemptsBeforeBreak - value: "12" - - name: Sitecore_ExperienceEdge_DeliveryEndpoint_CircuitBreakerDurationOfBreak - value: "00:15:00" - - name: Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureRetryCount - value: "3" - - name: Sitecore_ExperienceEdge_DeliveryEndpoint_TransientFailureSleepTime - value: "00:00:10" - - name: Sitecore_ExperienceEdge_EnableItemLanguageFallback - value: "false" - - name: Sitecore_ExperienceEdge_EnableFieldLanguageFallback - value: "false" - - name: Sitecore_ExperienceEdge_MaxExportEntitiesThreadCount - value: "20" - - name: Sitecore_ExperienceEdge_MaxPublishThreadCount - value: "2" - - name: Sitecore_ExperienceEdge_ExportEntitiesBufferSize - value: "500" - - name: Sitecore_ExperienceEdge_ExportPublishEventsBatchSize - value: "150" - - name: Sitecore_ExperienceEdge_LayoutService_ConfigName - value: "default" - - name: Sitecore_ExperienceEdge_MaxMetadataCacheSize - value: "30MB" - - name: Sitecore_ExperienceEdge_CheckDeltaStatusBatchSize - value: "250" - - name: Sitecore_ExperienceEdge_AckCleanupTimeoutSeconds - value: "5" - - name: Sitecore_ExperienceEdge_AckBatchWaitTimeoutSeconds - value: "120" - - name: Sitecore_ExperienceEdge_AckWaitTimeoutSeconds - value: "600" - - name: Sitecore_ExperienceEdge_MaxDependencyResolutionThreadCount - value: "5" diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xp1/secrets/kustomization.yaml b/k8s/expedge/22.0/ltsc2019/overrides/xp1/secrets/kustomization.yaml deleted file mode 100644 index 3a7f5783..00000000 --- a/k8s/expedge/22.0/ltsc2019/overrides/xp1/secrets/kustomization.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -bases: -- ../../../xp1/secrets - -generatorOptions: - disableNameSuffixHash: true - -secretGenerator: -- name: sitecore-experienceedge - files: - - sitecore-experienceedge-connection.txt - diff --git a/k8s/expedge/22.0/ltsc2019/overrides/xp1/secrets/sitecore-experienceedge-connection.txt b/k8s/expedge/22.0/ltsc2019/overrides/xp1/secrets/sitecore-experienceedge-connection.txt deleted file mode 100644 index e69de29b..00000000