Merge pull request #145 from Sitecore/feature/sxc-30250

Add SXC Sitecore Commerce Container SDK 10.2.0.80218.30250
Sitecore · Jan 5, 2024 · 3b1dfa5 · 3b1dfa5
2 parents dc8aa68 + 591d0ea
commit 3b1dfa5
Show file tree

Hide file tree

Showing 12 changed files with 549 additions and 105 deletions.
diff --git a/sxc/10.2/k8s-commerce-xc1/bizfx.yaml b/sxc/10.2/k8s-commerce-xc1/bizfx.yaml
@@ -49,11 +49,11 @@ spec:
               name: commerce-bizfx
               key: commerce-bizfx-shopname.txt
         - name: sitecore_xc_bizfx_bizfx_url
-          value: https://$(bizfx-hostname)
+          value: https://bizfx-placeholder-hostname
         - name: sitecore_xc_bizfx_authoring_url
-          value: https://$(engine-authoring-hostname)
+          value: https://engine-authoring-placeholder-hostname
         - name: sitecore_xc_bizfx_identity_server_url
-          value: https://$(id-hostname)
+          value: https://id-placeholder-hostname       
         livenessProbe:
           httpGet:
             path: /

diff --git a/sxc/10.2/k8s-commerce-xc1/cd.yaml b/sxc/10.2/k8s-commerce-xc1/cd.yaml
@@ -168,7 +168,7 @@ spec:
               name: sitecore-protect-media-requests
               key: sitecore-media-request-protection-shared-secret.txt
         - name: Sitecore_Identity_Server_Authority
-          value: https://$(id-hostname)
+          value: https://id-placeholder-hostname
         - name: Sitecore_Identity_Server_InternalAuthority
           value: http://id
         - name: Sitecore_xc_Minions_Url

diff --git a/sxc/10.2/k8s-commerce-xc1/cm.yaml b/sxc/10.2/k8s-commerce-xc1/cm.yaml
@@ -233,9 +233,9 @@ spec:
         - name: Sitecore_Processing_Service_Require_Https
           value: 'false'
         - 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/sxc/10.2/k8s-commerce-xc1/configmaps/kustomization.yaml b/sxc/10.2/k8s-commerce-xc1/configmaps/kustomization.yaml
@@ -14,54 +14,3 @@ configMapGenerator:
   - engine-authoring-hostname
   - engine-minions-hostname
   - engine-shops-hostname
-
-vars:
-- name: cd-hostname
-  objref:
-    kind: ConfigMap
-    name: sitecore-hostnames
-    apiVersion: v1
-  fieldref:
-    fieldpath: data[cd-hostname]
-- 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]
-- name: bizfx-hostname
-  objref:
-    kind: ConfigMap
-    name: sitecore-hostnames
-    apiVersion: v1
-  fieldref:
-    fieldpath: data[bizfx-hostname]
-- name: engine-authoring-hostname
-  objref:
-    kind: ConfigMap
-    name: sitecore-hostnames
-    apiVersion: v1
-  fieldref:
-    fieldpath: data[engine-authoring-hostname]
-- name: engine-minions-hostname
-  objref:
-    kind: ConfigMap
-    name: sitecore-hostnames
-    apiVersion: v1
-  fieldref:
-    fieldpath: data[engine-minions-hostname]
-- name: engine-shops-hostname
-  objref:
-    kind: ConfigMap
-    name: sitecore-hostnames
-    apiVersion: v1
-  fieldref:
-    fieldpath: data[engine-shops-hostname]
diff --git a/sxc/10.2/k8s-commerce-xc1/engine-authoring.yaml b/sxc/10.2/k8s-commerce-xc1/engine-authoring.yaml
@@ -107,14 +107,20 @@ spec:
             secretKeyRef:
               name: commerce-solr
               key: commerce-solr-prefix-name.txt
+        - name: sitecore_xc_bizfx_bizfx_url
+          value: https://bizfx-placeholder-hostname
+        - name: COMMERCEENGINE_CMUrl
+          value: https://cm-placeholder-hostname
+        - name: COMMERCEENGINE_CDUrl
+          value: https://cd-placeholder-hostname
         - name: COMMERCEENGINE_AppSettings__EnvironmentName
           value: HabitatAuthoring
         - name: COMMERCEENGINE_AppSettings__SitecoreIdentityServerUrl
-          value: https://$(id-hostname)
+          value: https://id-placeholder-hostname
         - name: COMMERCEENGINE_AppSettings__InternalSitecoreIdentityServerUrl
           value: http://id
         - name: COMMERCEENGINE_AppSettings__AllowedOrigins
-          value: https://$(bizfx-hostname)|https://$(cm-hostname)|https://$(cd-hostname)
+          value: $(sitecore_xc_bizfx_bizfx_url)|$(COMMERCEENGINE_CMUrl)|$(COMMERCEENGINE_CDUrl)
         - name: COMMERCEENGINE_AppSettings__AntiForgeryEnabled
           value: "false"
         - name: COMMERCEENGINE_AppSettings__UseHttpsInKestrel
@@ -155,7 +161,7 @@ spec:
         - name: COMMERCEENGINE_SitecoreExternalProtocol
           value: https
         - name: COMMERCEENGINE_SitecoreExternalHost
-          value: $(cm-hostname)
+          value: cm-placeholder-hostname
         - name: COMMERCEENGINE_IsSolrCloud
           value: "true"
         - name: COMMERCEENGINE_StorefrontIndexPrefix_web_index
@@ -183,11 +189,11 @@ spec:
         - name: COMMERCEENGINE_SearchIndexPrefixPriceCardsScope-Rebuild
           value: $(SOLR_COMMERCE_PREFIX_NAME)_PriceCardsScope-Rebuild
         - name: COMMERCEENGINE_EngineAuthoringUrl
-          value: https://$(engine-authoring-hostname)
+          value: https://engine-authoring-placeholder-hostname
         - name: COMMERCEENGINE_EngineShopsUrl
-          value: https://$(engine-shops-hostname)
+          value: https://engine-shops-placeholder-hostname
         - name: COMMERCEENGINE_EngineMinionsUrl
-          value: https://$(engine-minions-hostname)
+          value: https://engine-minions-placeholder-hostname
         livenessProbe:
           httpGet:
             path: /health

diff --git a/sxc/10.2/k8s-commerce-xc1/engine-minions.yaml b/sxc/10.2/k8s-commerce-xc1/engine-minions.yaml
@@ -107,14 +107,20 @@ spec:
             secretKeyRef:
               name: commerce-solr
               key: commerce-solr-prefix-name.txt
+        - name: sitecore_xc_bizfx_bizfx_url
+          value: https://bizfx-placeholder-hostname
+        - name: COMMERCEENGINE_CMUrl
+          value: https://cm-placeholder-hostname
+        - name: COMMERCEENGINE_CDUrl
+          value: https://cd-placeholder-hostname
         - name: COMMERCEENGINE_AppSettings__EnvironmentName
           value: HabitatMinions
         - name: COMMERCEENGINE_AppSettings__SitecoreIdentityServerUrl
-          value: https://$(id-hostname)
+          value: https://id-placeholder-hostname
         - name: COMMERCEENGINE_AppSettings__InternalSitecoreIdentityServerUrl
           value: http://id
         - name: COMMERCEENGINE_AppSettings__AllowedOrigins
-          value: https://$(bizfx-hostname)|https://$(cm-hostname)|https://$(cd-hostname)
+          value: $(sitecore_xc_bizfx_bizfx_url)|$(COMMERCEENGINE_CMUrl)|$(COMMERCEENGINE_CDUrl)
         - name: COMMERCEENGINE_AppSettings__AntiForgeryEnabled
           value: "false"
         - name: COMMERCEENGINE_AppSettings__UseHttpsInKestrel
@@ -155,7 +161,7 @@ spec:
         - name: COMMERCEENGINE_SitecoreExternalProtocol
           value: https
         - name: COMMERCEENGINE_SitecoreExternalHost
-          value: $(cm-hostname)
+          value: cm-placeholder-hostname
         - name: COMMERCEENGINE_IsSolrCloud
           value: "true"
         - name: COMMERCEENGINE_StorefrontIndexPrefix_web_index
@@ -183,11 +189,11 @@ spec:
         - name: COMMERCEENGINE_SearchIndexPrefixPriceCardsScope-Rebuild
           value: $(SOLR_COMMERCE_PREFIX_NAME)_PriceCardsScope-Rebuild
         - name: COMMERCEENGINE_EngineAuthoringUrl
-          value: https://$(engine-authoring-hostname)
+          value: https://engine-authoring-placeholder-hostname
         - name: COMMERCEENGINE_EngineShopsUrl
-          value: https://$(engine-shops-hostname)
+          value: https://engine-shops-placeholder-hostname
         - name: COMMERCEENGINE_EngineMinionsUrl
-          value: https://$(engine-minions-hostname)
+          value: https://engine-minions-placeholder-hostname
         livenessProbe:
           httpGet:
             path: /health

diff --git a/sxc/10.2/k8s-commerce-xc1/engine-shops.yaml b/sxc/10.2/k8s-commerce-xc1/engine-shops.yaml
@@ -107,14 +107,20 @@ spec:
             secretKeyRef:
               name: commerce-solr
               key: commerce-solr-prefix-name.txt
+        - name: sitecore_xc_bizfx_bizfx_url
+          value: https://bizfx-placeholder-hostname
+        - name: COMMERCEENGINE_CMUrl
+          value: https://cm-placeholder-hostname
+        - name: COMMERCEENGINE_CDUrl
+          value: https://cd-placeholder-hostname    
         - name: COMMERCEENGINE_AppSettings__EnvironmentName
           value: HabitatShops
         - name: COMMERCEENGINE_AppSettings__SitecoreIdentityServerUrl
-          value: https://$(id-hostname)
+          value: https://id-placeholder-hostname
         - name: COMMERCEENGINE_AppSettings__InternalSitecoreIdentityServerUrl
           value: http://id
         - name: COMMERCEENGINE_AppSettings__AllowedOrigins
-          value: https://$(bizfx-hostname)|https://$(cm-hostname)|https://$(cd-hostname)
+          value: $(sitecore_xc_bizfx_bizfx_url)|$(COMMERCEENGINE_CMUrl)|$(COMMERCEENGINE_CDUrl)
         - name: COMMERCEENGINE_AppSettings__AntiForgeryEnabled
           value: "false"
         - name: COMMERCEENGINE_AppSettings__UseHttpsInKestrel
@@ -155,7 +161,7 @@ spec:
         - name: COMMERCEENGINE_SitecoreExternalProtocol
           value: https
         - name: COMMERCEENGINE_SitecoreExternalHost
-          value: $(cm-hostname)
+          value: cm-placeholder-hostname
         - name: COMMERCEENGINE_IsSolrCloud
           value: "true"
         - name: COMMERCEENGINE_StorefrontIndexPrefix_web_index
@@ -183,11 +189,11 @@ spec:
         - name: COMMERCEENGINE_SearchIndexPrefixPriceCardsScope-Rebuild
           value: PriceCardsScope-Rebuild
         - name: COMMERCEENGINE_EngineAuthoringUrl
-          value: https://$(engine-authoring-hostname)
+          value: https://engine-authoring-placeholder-hostname
         - name: COMMERCEENGINE_EngineShopsUrl
-          value: https://$(engine-shops-hostname)
+          value: https://engine-shops-placeholder-hostname
         - name: COMMERCEENGINE_EngineMinionsUrl
-          value: https://$(engine-minions-hostname)
+          value: https://engine-minions-placeholder-hostname
         livenessProbe:
           httpGet:
             path: /health

diff --git a/sxc/10.2/k8s-commerce-xc1/id.yaml b/sxc/10.2/k8s-commerce-xc1/id.yaml
@@ -78,18 +78,26 @@ spec:
             secretKeyRef:
               name: commerce-connect-client
               key: commerce-connect-clientsecret.txt
+        - name: sitecore_xc_bizfx_bizfx_url
+          value: https://bizfx-placeholder-hostname
+        - name: COMMERCEENGINE_EngineAuthoringUrl
+          value: https://engine-authoring-placeholder-hostname
+        - name: COMMERCEENGINE_CMUrl
+          value: https://cm-placeholder-hostname
+        - name: COMMERCEENGINE_CDUrl
+          value: https://cd-placeholder-hostname
         - name: Sitecore_Sitecore__IdentityServer__SitecoreMemberShipOptions__ConnectionString
           value: Data Source=$(Database_Server);Initial Catalog=Sitecore.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
         - name: Sitecore_Sitecore__IdentityServer__Clients__CommerceClient__AllowedCorsOrigins__AllowedCorsOriginsGroup1
-          value: https://$(bizfx-hostname)|https://$(engine-authoring-hostname)
+          value: $(sitecore_xc_bizfx_bizfx_url)|$(COMMERCEENGINE_EngineAuthoringUrl)
         - name: Sitecore_Sitecore__IdentityServer__Clients__CommerceEngineConnectClient__AllowedCorsOrigins__AllowedCorsOriginsGroup1
-          value: https://$(cm-hostname)|https://$(cd-hostname)
+          value: $(COMMERCEENGINE_CMUrl)|$(COMMERCEENGINE_CDUrl)
         livenessProbe:
           httpGet:
             path: /healthz/live

diff --git a/sxc/10.2/k8s-commerce-xc1/ingress-nginx/ingress.yaml b/sxc/10.2/k8s-commerce-xc1/ingress-nginx/ingress.yaml
@@ -2,8 +2,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: sitecore-ingress
-  annotations:
-    kubernetes.io/ingress.class: nginx
+  annotations:    
     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: /
@@ -43,7 +43,7 @@ spec:
             name: id
             port:
               number: 80
-  - host: $(bizfx-hostname)
+  - host: bizfx-placeholder-hostname
     http:
       paths:
       - path: /
@@ -53,7 +53,7 @@ spec:
             name: bizfx
             port:
               number: 80
-  - host: $(engine-authoring-hostname)
+  - host: engine-authoring-placeholder-hostname
     http:
       paths:
       - path: /
@@ -63,7 +63,7 @@ spec:
             name: engine-authoring
             port:
               number: 5000
-  - host: $(engine-minions-hostname)
+  - host: engine-minions-placeholder-hostname
     http:
       paths:
       - path: /
@@ -73,7 +73,7 @@ spec:
             name: engine-minions
             port:
               number: 5000
-  - host: $(engine-shops-hostname)
+  - host: engine-shops-placeholder-hostname
     http:
       paths:
       - path: /
@@ -86,22 +86,22 @@ 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
   - secretName: global-bizfx-tls
     hosts:
-    - $(bizfx-hostname)
+    - bizfx-placeholder-hostname
   - secretName: global-authoring-tls
     hosts:
-    - $(engine-authoring-hostname)
+    - engine-authoring-placeholder-hostname
   - secretName: global-minions-tls
     hosts:
-    - $(engine-minions-hostname)
+    - engine-minions-placeholder-hostname
   - secretName: global-shops-tls
     hosts:
-    - $(engine-shops-hostname)
+    - engine-shops-placeholder-hostname