Merge pull request #144 from Sitecore/sxp/10.3.1.009452.1563

Update SXP Sitecore Container Deployment to 10.3 (10.3.1.009452.1563)
Sitecore · Nov 20, 2023 · dc8aa68 · dc8aa68
2 parents 07777b3 + cb13f72
commit dc8aa68
Show file tree

Hide file tree

Showing 32 changed files with 545 additions and 215 deletions.
diff --git a/k8s/sxp/10.3/ltsc2019/xm1/cm.yaml b/k8s/sxp/10.3/ltsc2019/xm1/cm.yaml
@@ -142,9 +142,9 @@ spec:
               name: sitecore-graphql
               key: sitecore-graphql-uploadmedia_encryptionkey.txt
         - name: Sitecore_Identity_Server_Authority
-          value: https://$(id-hostname)
+          value: https://id-placeholder-hostname
         - name: Sitecore_Identity_Server_CallbackAuthority
-          value: https://$(cm-hostname)
+          value: https://cm-placeholder-hostname
         - name: Sitecore_Identity_Server_InternalAuthority
           value: http://id
         - name: Sitecore_Identity_Server_Require_Https

diff --git a/k8s/sxp/10.3/ltsc2019/xm1/configmaps/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/xm1/configmaps/kustomization.yaml
@@ -9,20 +9,4 @@ configMapGenerator:
   files:
   - cd-hostname
   - cm-hostname
-  - id-hostname
-
-vars:
-- name: cm-hostname
-  objref:
-    kind: ConfigMap
-    name: sitecore-hostnames
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.cm-hostname
-- name: id-hostname
-  objref:
-    kind: ConfigMap
-    name: sitecore-hostnames
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.id-hostname
+  - id-hostname
diff --git a/k8s/sxp/10.3/ltsc2019/xm1/id.yaml b/k8s/sxp/10.3/ltsc2019/xm1/id.yaml
@@ -76,11 +76,11 @@ spec:
         - name: Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString
           value: Data Source=$(Database_Server);Initial Catalog=$(Sql_Database_Prefix).Core;User ID=$(Core_Database_Username);Password=$(Core_Database_Password);
         - name: Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl
-          value: https://$(cm-hostname)/sitecore/login?rc=1
+          value: https://cm-placeholder-hostname/sitecore/login?rc=1
         - name: Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup1
-          value: https://$(cm-hostname)
+          value: https://cm-placeholder-hostname
         - name: Sitecore_Sitecore__IdentityServer__PublicOrigin
-          value: https://$(id-hostname)
+          value: https://id-placeholder-hostname
         livenessProbe:
           httpGet:
             path: /healthz/live

diff --git a/k8s/sxp/10.3/ltsc2019/xm1/ingress-nginx/ingress.yaml b/k8s/sxp/10.3/ltsc2019/xm1/ingress-nginx/ingress.yaml
@@ -3,7 +3,6 @@ kind: Ingress
 metadata:
   name: sitecore-ingress
   annotations:
-    kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/proxy-buffer-size: "32k"
     nginx.ingress.kubernetes.io/affinity: "cookie"
     nginx.ingress.kubernetes.io/rewrite-target: /
@@ -12,8 +11,9 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
     nginx.ingress.kubernetes.io/proxy-body-size: "512m"
 spec:
+  ingressClassName: "nginx"
   rules:
-  - host: $(cd-hostname)
+  - host: cd-placeholder-hostname
     http:
       paths:
       - path: /
@@ -23,7 +23,7 @@ spec:
             name: cd
             port: 
               number: 80
-  - host: $(cm-hostname)
+  - host: cm-placeholder-hostname
     http:
       paths:
       - path: /
@@ -33,7 +33,7 @@ spec:
             name: cm
             port: 
               number: 80
-  - host: $(id-hostname)
+  - host: id-placeholder-hostname
     http:
       paths:
       - path: /
@@ -46,10 +46,10 @@ spec:
   tls:
   - secretName: global-cd-tls
     hosts:
-    - $(cd-hostname)
+    - cd-placeholder-hostname
   - secretName: global-cm-tls
     hosts:
-    - $(cm-hostname)
+    - cm-placeholder-hostname
   - secretName: global-id-tls
     hosts:
-    - $(id-hostname)
+    - id-placeholder-hostname
diff --git a/k8s/sxp/10.3/ltsc2019/xm1/ingress-nginx/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/xm1/ingress-nginx/kustomization.yaml
@@ -1,18 +1,69 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-bases:
-- ../configmaps
-
 resources:
-  - ingress.yaml
-  - configuration.yaml
+- ../configmaps
+- ingress.yaml
+- configuration.yaml
 
-vars:
-- name: cd-hostname
-  objref:
+replacements:
+- source:
+    fieldPath: data.cd-hostname
+    kind: ConfigMap
+    name: sitecore-hostnames
+    version: v1
+  targets:
+  - select:
+      group: networking.k8s.io
+      kind: Ingress
+      name: sitecore-ingress
+      version: v1
+    fieldPaths:
+    - spec.rules.[host=cd-placeholder-hostname].host
+  - select:
+      group: networking.k8s.io
+      kind: Ingress
+      name: sitecore-ingress
+      version: v1
+    fieldPaths:
+    - spec.tls.[secretName=global-cd-tls].hosts.0
+- source:
+    fieldPath: data.cm-hostname
+    kind: ConfigMap
+    name: sitecore-hostnames
+    version: v1
+  targets:
+  - select:
+      group: networking.k8s.io
+      kind: Ingress
+      name: sitecore-ingress
+      version: v1
+    fieldPaths:
+    - spec.rules.[host=cm-placeholder-hostname].host
+  - select:
+      group: networking.k8s.io
+      kind: Ingress
+      name: sitecore-ingress
+      version: v1
+    fieldPaths:
+    - spec.tls.[secretName=global-cm-tls].hosts.0
+- source:
+    fieldPath: data.id-hostname
     kind: ConfigMap
     name: sitecore-hostnames
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.cd-hostname
+    version: v1
+  targets:
+  - select:
+      group: networking.k8s.io
+      kind: Ingress
+      name: sitecore-ingress
+      version: v1
+    fieldPaths:
+    - spec.rules.[host=id-placeholder-hostname].host
+  - select:
+      group: networking.k8s.io
+      kind: Ingress
+      name: sitecore-ingress
+      version: v1
+    fieldPaths:
+    - spec.tls.[secretName=global-id-tls].hosts.0
diff --git a/k8s/sxp/10.3/ltsc2019/xm1/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/xm1/kustomization.yaml
@@ -1,7 +1,5 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-bases:
-- configmaps
 images:
 - name: sitecore-xm1-cd
   newName: scr.sitecore.com/sxp/sitecore-xm1-cd
@@ -13,6 +11,60 @@ images:
   newName: scr.sitecore.com/sxp/sitecore-id7
   newTag: 10.3-ltsc2019
 resources:
+- configmaps
 - cm.yaml
 - cd.yaml
 - id.yaml
+replacements:
+- source:
+    fieldPath: data.cm-hostname
+    kind: ConfigMap
+    name: sitecore-hostnames
+    version: v1
+  targets:
+  - select:
+      kind: Deployment
+      name: cm
+    fieldPaths:
+    - spec.template.spec.containers.[name=sitecore-xm1-cm].env.[name=Sitecore_Identity_Server_CallbackAuthority].value
+    options:
+      delimiter: //
+      index: 1
+  - select:
+      kind: Deployment
+      name: id
+    fieldPaths:
+    - spec.template.spec.containers.[name=sitecore-xm1-id].env.[name=Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl].value
+    options:
+      delimiter: /
+      index: 2
+  - select:
+      kind: Deployment
+      name: id
+    fieldPaths:
+    - spec.template.spec.containers.[name=sitecore-xm1-id].env.[name=Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup1].value
+    options:
+      delimiter: //
+      index: 1
+- source:
+    fieldPath: data.id-hostname
+    kind: ConfigMap
+    name: sitecore-hostnames
+    version: v1
+  targets:
+  - select:
+      kind: Deployment
+      name: cm
+    fieldPaths:
+    - spec.template.spec.containers.[name=sitecore-xm1-cm].env.[name=Sitecore_Identity_Server_Authority].value
+    options:
+      delimiter: //
+      index: 1
+  - select:
+      kind: Deployment
+      name: id
+    fieldPaths:
+    - spec.template.spec.containers.[name=sitecore-xm1-id].env.[name=Sitecore_Sitecore__IdentityServer__PublicOrigin].value
+    options:
+      delimiter: //
+      index: 1
diff --git a/k8s/sxp/10.3/ltsc2019/xm1/overlays/init/SearchStax/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/xm1/overlays/init/SearchStax/kustomization.yaml
@@ -1,6 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-bases:
+resources:
 - ..\..\..\init
 patchesStrategicMerge:
 - solr-init.yaml
@@ -15,4 +15,4 @@ secretGenerator:
   files:
   - sitecore-searchstax-apikey.txt
   - sitecore-searchstax-account-name.txt
-  - sitecore-searchstax-deployment-uid.txt
+  - sitecore-searchstax-deployment-uid.txt
diff --git a/k8s/sxp/10.3/ltsc2019/xp1/cm.yaml b/k8s/sxp/10.3/ltsc2019/xp1/cm.yaml
@@ -235,9 +235,9 @@ spec:
               name: sitecore-graphql
               key: sitecore-graphql-uploadmedia_encryptionkey.txt
         - name: Sitecore_Identity_Server_Authority
-          value: https://$(id-hostname)
+          value: https://id-placeholder-hostname
         - name: Sitecore_Identity_Server_CallbackAuthority
-          value: https://$(cm-hostname)
+          value: https://cm-placeholder-hostname
         - name: Sitecore_Identity_Server_InternalAuthority
           value: http://id
         - name: Sitecore_Identity_Server_Require_Https

diff --git a/k8s/sxp/10.3/ltsc2019/xp1/configmaps/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/xp1/configmaps/kustomization.yaml
@@ -9,20 +9,4 @@ configMapGenerator:
   files:
   - cd-hostname
   - cm-hostname
-  - id-hostname
-
-vars:
-- name: cm-hostname
-  objref:
-    kind: ConfigMap
-    name: sitecore-hostnames
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.cm-hostname
-- name: id-hostname
-  objref:
-    kind: ConfigMap
-    name: sitecore-hostnames
-    apiVersion: v1
-  fieldref:
-    fieldpath: data.id-hostname
+  - id-hostname
diff --git a/k8s/sxp/10.3/ltsc2019/xp1/id.yaml b/k8s/sxp/10.3/ltsc2019/xp1/id.yaml
@@ -76,11 +76,11 @@ spec:
         - name: Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString
           value: Data Source=$(Database_Server);Initial Catalog=$(Sql_Database_Prefix).Core;User ID=$(Core_Database_Username);Password=$(Core_Database_Password);
         - name: Sitecore_Sitecore__IdentityServer__AccountOptions__PasswordRecoveryUrl
-          value: https://$(cm-hostname)/sitecore/login?rc=1
+          value: https://cm-placeholder-hostname/sitecore/login?rc=1
         - name: Sitecore_Sitecore__IdentityServer__Clients__DefaultClient__AllowedCorsOrigins__AllowedCorsOriginsGroup1
-          value: https://$(cm-hostname)
+          value: https://cm-placeholder-hostname
         - name: Sitecore_Sitecore__IdentityServer__PublicOrigin
-          value: https://$(id-hostname)
+          value: https://id-placeholder-hostname
         livenessProbe:
           httpGet:
             path: /healthz/live

diff --git a/k8s/sxp/10.3/ltsc2019/xp1/ingress-nginx/ingress.yaml b/k8s/sxp/10.3/ltsc2019/xp1/ingress-nginx/ingress.yaml
@@ -3,7 +3,6 @@ kind: Ingress
 metadata:
   name: sitecore-ingress
   annotations:
-    kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/proxy-buffer-size: "32k"
     nginx.ingress.kubernetes.io/affinity: "cookie"
     nginx.ingress.kubernetes.io/rewrite-target: /
@@ -12,8 +11,9 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
     nginx.ingress.kubernetes.io/proxy-body-size: "512m"
 spec:
+  ingressClassName: "nginx"
   rules:
-  - host: $(cd-hostname)
+  - host: cd-placeholder-hostname
     http:
       paths:
       - path: /
@@ -23,7 +23,7 @@ spec:
             name: cd
             port: 
               number: 80
-  - host: $(cm-hostname)
+  - host: cm-placeholder-hostname
     http:
       paths:
       - path: /
@@ -33,7 +33,7 @@ spec:
             name: cm
             port: 
               number: 80
-  - host: $(id-hostname)
+  - host: id-placeholder-hostname
     http:
       paths:
       - path: /
@@ -46,10 +46,10 @@ spec:
   tls:
   - secretName: global-cd-tls
     hosts:
-    - $(cd-hostname)
+    - cd-placeholder-hostname
   - secretName: global-cm-tls
     hosts:
-    - $(cm-hostname)
+    - cm-placeholder-hostname
   - secretName: global-id-tls
     hosts:
-    - $(id-hostname)
+    - id-placeholder-hostname