Merge pull request #151 from Sitecore/publishing/10.4.0.00689.405

Add Sitecore Publishing Service Module 10.4.0.00689.405
Sitecore · Apr 30, 2024 · 122ffdb · 122ffdb
2 parents 1ac33f7 + 5042c09
commit 122ffdb
Show file tree

Hide file tree

Showing 11 changed files with 309 additions and 0 deletions.
diff --git a/compose/publishing/10.4/ltsc2022/.env-example b/compose/publishing/10.4/ltsc2022/.env-example
@@ -0,0 +1,7 @@
+#Add the following environment variables to the Sitecore Platform .env file
+
+#The version tag for the CM and CD patched images
+VERSION=
+
+#Sitecore Platform topology to deploy
+TOPOLOGY=
diff --git a/compose/publishing/10.4/ltsc2022/docker-compose.sps.override.yml b/compose/publishing/10.4/ltsc2022/docker-compose.sps.override.yml
@@ -0,0 +1,39 @@
+services:
+  cm:
+    image: sitecore-sps-integration-${TOPOLOGY}-cm:${VERSION}
+    environment:
+      Sitecore_Publishing_Service_Url: "http://sps/"
+  cd:
+    image: sitecore-sps-integration-${TOPOLOGY}-cd:${VERSION}
+  mssql-init:
+    image: sitecore-sps-integration-${TOPOLOGY}-mssql-init:${VERSION}
+  sps-mssql-init:
+    isolation: ${ISOLATION}
+    image: ${SITECORE_DOCKER_REGISTRY}modules/sitecore-sps:7.0-ltsc2022
+    environment:
+      SITECORE_License: ${SITECORE_LICENSE}
+      SITECORE_Publishing__ConnectionStrings__Core: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
+      SITECORE_Publishing__ConnectionStrings__Master: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
+      SITECORE_Publishing__ConnectionStrings__Service: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
+      SITECORE_Publishing__ConnectionStrings__Web: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Web;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
+    command: schema upgrade --force
+    depends_on:
+      mssql-init:
+        condition: service_healthy
+  sps:
+    isolation: ${ISOLATION}
+    image: ${SITECORE_DOCKER_REGISTRY}modules/sitecore-sps:7.1-ltsc2022
+    environment:
+      ASPNETCORE_URLS: "http://*:80"
+      SITECORE_License: ${SITECORE_LICENSE}
+      SITECORE_Publishing__ConnectionStrings__Core: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Core;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
+      SITECORE_Publishing__ConnectionStrings__Master: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
+      SITECORE_Publishing__ConnectionStrings__Service: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Master;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
+      SITECORE_Publishing__ConnectionStrings__Web: Data Source=${SQL_SERVER};Initial Catalog=${SQL_DATABASE_PREFIX}.Web;User ID=${SQL_SA_LOGIN};Password=${SQL_SA_PASSWORD};MultipleActiveResultSets=True
+    ports:
+      - "80"
+    depends_on:
+      - sps-mssql-init 
+    healthcheck:
+      test: ["CMD", "curl", "-f", "http://localhost/healthz/live"]
+      timeout: 300s
diff --git a/k8s/publishing/10.4/ltsc2022/overrides/xm1/init/kustomization.yaml b/k8s/publishing/10.4/ltsc2022/overrides/xm1/init/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+bases:
+- ../../../xm1/init
+
+images:
+- name: scr.sitecore.com/sxp/sitecore-xm1-mssql-init
+  newName: "{registry}/sitecore-sps-integration-xm1-mssql-init"
+  newTag: tag
diff --git a/k8s/publishing/10.4/ltsc2022/overrides/xm1/kustomization.yaml b/k8s/publishing/10.4/ltsc2022/overrides/xm1/kustomization.yaml
@@ -0,0 +1,17 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+bases:
+- ../../xm1
+- ../../sps
+
+images:
+- name: scr.sitecore.com/sxp/sitecore-xm1-cm
+  newName: "{registry}/sitecore-sps-integration-xm1-cm"
+  newTag: tag
+- name: scr.sitecore.com/sxp/sitecore-xm1-cd
+  newName: "{registry}/sitecore-sps-integration-xm1-cd"
+  newTag: tag
+
+patchesStrategicMerge:
+- patch-cm.sps.yaml
diff --git a/k8s/publishing/10.4/ltsc2022/overrides/xm1/patch-cm.sps.yaml b/k8s/publishing/10.4/ltsc2022/overrides/xm1/patch-cm.sps.yaml
@@ -0,0 +1,20 @@
+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_Publishing_Service_Url
+          value: http://sps/
diff --git a/k8s/publishing/10.4/ltsc2022/overrides/xp1/init/kustomization.yaml b/k8s/publishing/10.4/ltsc2022/overrides/xp1/init/kustomization.yaml
@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+bases:
+- ../../../xp1/init
+
+images:
+- name: scr.sitecore.com/sxp/sitecore-xp1-mssql-init
+  newName: "{registry}/sitecore-sps-integration-xp1-mssql-init"
+  newTag: tag
diff --git a/k8s/publishing/10.4/ltsc2022/overrides/xp1/kustomization.yaml b/k8s/publishing/10.4/ltsc2022/overrides/xp1/kustomization.yaml
@@ -0,0 +1,17 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+bases:
+- ../../xp1
+- ../../sps
+
+images:
+- name: scr.sitecore.com/sxp/sitecore-xp1-cm
+  newName: "{registry}/sitecore-sps-integration-xp1-cm"
+  newTag: tag
+- name: scr.sitecore.com/sxp/sitecore-xp1-cd
+  newName: "{registry}/sitecore-sps-integration-xp1-cd"
+  newTag: tag
+
+patchesStrategicMerge:
+- patch-cm.sps.yaml
diff --git a/k8s/publishing/10.4/ltsc2022/overrides/xp1/patch-cm.sps.yaml b/k8s/publishing/10.4/ltsc2022/overrides/xp1/patch-cm.sps.yaml
@@ -0,0 +1,12 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: cm
+spec:
+  template:
+    spec:
+      containers:
+      - name: sitecore-xp1-cm
+        env:
+        - name: Sitecore_Publishing_Service_Url
+          value: http://sps/
diff --git a/k8s/publishing/10.4/ltsc2022/sps/kustomization.yaml b/k8s/publishing/10.4/ltsc2022/sps/kustomization.yaml
@@ -0,0 +1,13 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+images:
+- name: sitecore-sps
+  newName: scr.sitecore.com/sxp/modules/sitecore-sps
+  newTag: 7.0-ltsc2022
+
+resources:
+- sps.yaml
+
+patchesStrategicMerge:
+- patch-sps.yaml
diff --git a/k8s/publishing/10.4/ltsc2022/sps/patch-sps.yaml b/k8s/publishing/10.4/ltsc2022/sps/patch-sps.yaml
@@ -0,0 +1,45 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: sps
+spec:
+  template:
+    spec:
+      initContainers:
+      - name: sitecore-sps-init
+        image: sitecore-sps
+        args: ["schema", "upgrade", "--force"]
+        env:
+        - name: Sitecore_License
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-license
+              key: sitecore-license.txt
+        - name: Database_Server
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-database
+              key: sitecore-databaseservername.txt
+        - name: Database_Prefix
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-database
+              key: sitecore-databaseprefix.txt
+        - name: Database_Admin_Username
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-database
+              key: sitecore-databaseusername.txt
+        - name: Database_Admin_Password
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-database
+              key: sitecore-databasepassword.txt
+        - name: SITECORE_Publishing__ConnectionStrings__Core
+          value: Data Source=$(Database_Server);Initial Catalog=$(Database_Prefix).Core;User ID=$(Database_Admin_Username);Password=$(Database_Admin_Password);MultipleActiveResultSets=True
+        - name: SITECORE_Publishing__ConnectionStrings__Master
+          value: Data Source=$(Database_Server);Initial Catalog=$(Database_Prefix).Master;User ID=$(Database_Admin_Username);Password=$(Database_Admin_Password);MultipleActiveResultSets=True
+        - name: SITECORE_Publishing__ConnectionStrings__Service
+          value: Data Source=$(Database_Server);Initial Catalog=$(Database_Prefix).Master;User ID=$(Database_Admin_Username);Password=$(Database_Admin_Password);MultipleActiveResultSets=True
+        - name: SITECORE_Publishing__ConnectionStrings__Web
+          value: Data Source=$(Database_Server);Initial Catalog=$(Database_Prefix).Web;User ID=$(Database_Admin_Username);Password=$(Database_Admin_Password);MultipleActiveResultSets=True
diff --git a/k8s/publishing/10.4/ltsc2022/sps/sps.yaml b/k8s/publishing/10.4/ltsc2022/sps/sps.yaml
@@ -0,0 +1,119 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: sps
+spec:
+  selector:
+    app: sps
+  ports:
+  - protocol: TCP
+    port: 80
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: sps
+  labels:
+    app: sps
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: sps
+  template:
+    metadata:
+      labels:
+        app: sps
+    spec:
+      nodeSelector:
+        kubernetes.io/os: windows
+      containers:
+      - name: sitecore-sps
+        image: sitecore-sps
+        ports:
+        - containerPort: 80
+        env:
+        - name: Sitecore_License
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-license
+              key: sitecore-license.txt
+        - name: Database_Server
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-database
+              key: sitecore-databaseservername.txt
+        - name: Database_Prefix
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-database
+              key: sitecore-databaseprefix.txt
+        - name: Master_Database_Username
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-database
+              key: sitecore-master-database-username.txt
+        - name: Master_Database_Password
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-database
+              key: sitecore-master-database-password.txt
+        - name: Core_Database_Username
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-database
+              key: sitecore-core-database-username.txt
+        - name: Core_Database_Password
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-database
+              key: sitecore-core-database-password.txt
+        - name: Web_Database_Username
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-database
+              key: sitecore-web-database-username.txt
+        - name: Web_Database_Password
+          valueFrom:
+            secretKeyRef:
+              name: sitecore-database
+              key: sitecore-web-database-password.txt
+        - name: ASPNETCORE_URLS
+          value: "http://*:80"
+        - name: SITECORE_Publishing__ConnectionStrings__Core
+          value: Data Source=$(Database_Server);Initial Catalog=$(Database_Prefix).Core;User ID=$(Core_Database_Username);Password=$(Core_Database_Password);MultipleActiveResultSets=True
+        - name: SITECORE_Publishing__ConnectionStrings__Master
+          value: Data Source=$(Database_Server);Initial Catalog=$(Database_Prefix).Master;User ID=$(Master_Database_Username);Password=$(Master_Database_Password);MultipleActiveResultSets=True
+        - name: SITECORE_Publishing__ConnectionStrings__Service
+          value: Data Source=$(Database_Server);Initial Catalog=$(Database_Prefix).Master;User ID=$(Master_Database_Username);Password=$(Master_Database_Password);MultipleActiveResultSets=True
+        - name: SITECORE_Publishing__ConnectionStrings__Web
+          value: Data Source=$(Database_Server);Initial Catalog=$(Database_Prefix).Web;User ID=$(Web_Database_Username);Password=$(Web_Database_Password);MultipleActiveResultSets=True
+        livenessProbe:
+          httpGet:
+            path: /healthz/live
+            port: 80
+            httpHeaders:
+            - name: X-Kubernetes-Probe
+              value: Liveness
+          timeoutSeconds: 300
+          periodSeconds: 30
+          failureThreshold: 3
+        startupProbe:
+          httpGet:
+            path: /healthz/ready
+            port: 80
+            httpHeaders:
+            - name: X-Kubernetes-Probe
+              value: Startup
+          timeoutSeconds: 300
+          periodSeconds: 30
+          failureThreshold: 10
+        resources:
+          requests:
+            memory: 400Mi
+            cpu: 400m
+          limits:
+            memory: 2Gi
+            cpu: 2000m
+      imagePullSecrets:
+      - name: sitecore-docker-registry