From 91b8a87de9a9e20954bea2bd9f77135dbe3db4ae Mon Sep 17 00:00:00 2001 From: Eugenia Bilynska Date: Mon, 20 Nov 2023 13:32:25 +0200 Subject: [PATCH 1/2] Update 10.3 SXP Sitecore Container Deployment to 10.3.1.009452.1563 Updated for AKS 1.27 compatibility --- .../ltsc2019/upgrade/xm1/kustomization.yaml | 2 +- .../ltsc2019/upgrade/xp1/kustomization.yaml | 2 +- k8s/sxp/10.3/ltsc2019/xm1/cm.yaml | 4 +- .../xm1/configmaps/kustomization.yaml | 18 +--- k8s/sxp/10.3/ltsc2019/xm1/id.yaml | 6 +- .../ltsc2019/xm1/ingress-nginx/ingress.yaml | 14 +-- .../xm1/ingress-nginx/kustomization.yaml | 73 +++++++++++++--- .../10.3/ltsc2019/xm1/init/kustomization.yaml | 2 +- k8s/sxp/10.3/ltsc2019/xm1/kustomization.yaml | 56 +++++++++++- .../init/SearchStax/kustomization.yaml | 4 +- k8s/sxp/10.3/ltsc2019/xp1/cm.yaml | 4 +- .../xp1/configmaps/kustomization.yaml | 18 +--- k8s/sxp/10.3/ltsc2019/xp1/id.yaml | 6 +- .../ltsc2019/xp1/ingress-nginx/ingress.yaml | 14 +-- .../xp1/ingress-nginx/kustomization.yaml | 69 +++++++++++++-- .../10.3/ltsc2019/xp1/init/kustomization.yaml | 2 +- k8s/sxp/10.3/ltsc2019/xp1/kustomization.yaml | 56 +++++++++++- .../init/SearchStax/kustomization.yaml | 4 +- .../ltsc2022/upgrade/xm1/kustomization.yaml | 2 +- .../ltsc2022/upgrade/xp1/kustomization.yaml | 2 +- k8s/sxp/10.3/ltsc2022/xm1/cm.yaml | 4 +- .../xm1/configmaps/kustomization.yaml | 18 +--- k8s/sxp/10.3/ltsc2022/xm1/id.yaml | 6 +- .../ltsc2022/xm1/ingress-nginx/ingress.yaml | 14 +-- .../xm1/ingress-nginx/kustomization.yaml | 73 +++++++++++++--- .../10.3/ltsc2022/xm1/init/kustomization.yaml | 6 +- k8s/sxp/10.3/ltsc2022/xm1/kustomization.yaml | 65 ++++++++++++-- .../init/SearchStax/kustomization.yaml | 10 +-- k8s/sxp/10.3/ltsc2022/xp1/cm.yaml | 4 +- .../xp1/configmaps/kustomization.yaml | 18 +--- k8s/sxp/10.3/ltsc2022/xp1/id.yaml | 6 +- .../ltsc2022/xp1/ingress-nginx/ingress.yaml | 14 +-- .../xp1/ingress-nginx/kustomization.yaml | 69 +++++++++++++-- .../10.3/ltsc2022/xp1/init/kustomization.yaml | 6 +- k8s/sxp/10.3/ltsc2022/xp1/kustomization.yaml | 87 +++++++++++++++---- .../init/SearchStax/kustomization.yaml | 10 +-- 36 files changed, 549 insertions(+), 219 deletions(-) diff --git a/k8s/sxp/10.3/ltsc2019/upgrade/xm1/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/upgrade/xm1/kustomization.yaml index fdb8af94..f71a4394 100644 --- a/k8s/sxp/10.3/ltsc2019/upgrade/xm1/kustomization.yaml +++ b/k8s/sxp/10.3/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.3-ltsc2019 + newTag: 10.3-ltsc2019 \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2019/upgrade/xp1/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/upgrade/xp1/kustomization.yaml index 0e32deab..efa57a37 100644 --- a/k8s/sxp/10.3/ltsc2019/upgrade/xp1/kustomization.yaml +++ b/k8s/sxp/10.3/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.3-ltsc2019 + newTag: 10.3-ltsc2019 \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2019/xm1/cm.yaml b/k8s/sxp/10.3/ltsc2019/xm1/cm.yaml index 42d1ee02..0ffc0bea 100644 --- 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 index 0064e2e9..ea28225a 100644 --- 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 \ No newline at end of file + - id-hostname \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2019/xm1/id.yaml b/k8s/sxp/10.3/ltsc2019/xm1/id.yaml index c1a3b506..fa907eb3 100644 --- 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 index ca5df406..3b939a42 100644 --- 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) \ No newline at end of file + - id-placeholder-hostname \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2019/xm1/ingress-nginx/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/xm1/ingress-nginx/kustomization.yaml index 5774fcd6..cf09a27d 100644 --- 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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2019/xm1/init/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/xm1/init/kustomization.yaml index d116b8b2..2cafb0d6 100644 --- a/k8s/sxp/10.3/ltsc2019/xm1/init/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2019/xm1/init/kustomization.yaml @@ -9,4 +9,4 @@ images: newTag: 10.3-ltsc2019 resources: - mssql-init.yaml -- solr-init.yaml +- solr-init.yaml \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2019/xm1/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/xm1/kustomization.yaml index 14dd1198..6480b944 100644 --- 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 \ No newline at end of file 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 index 44941522..e4a513b4 100644 --- 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 \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2019/xp1/cm.yaml b/k8s/sxp/10.3/ltsc2019/xp1/cm.yaml index 5eb1c123..62aeb17e 100644 --- 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 index 0064e2e9..ea28225a 100644 --- 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 \ No newline at end of file + - id-hostname \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2019/xp1/id.yaml b/k8s/sxp/10.3/ltsc2019/xp1/id.yaml index eca5e0c8..8d5b4731 100644 --- 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 index ca5df406..3b939a42 100644 --- 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) \ No newline at end of file + - id-placeholder-hostname \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2019/xp1/ingress-nginx/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/xp1/ingress-nginx/kustomization.yaml index 5774fcd6..9f7e12f5 100644 --- a/k8s/sxp/10.3/ltsc2019/xp1/ingress-nginx/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2019/xp1/ingress-nginx/kustomization.yaml @@ -1,18 +1,69 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -bases: -- ../configmaps - resources: + - ../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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2019/xp1/init/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/xp1/init/kustomization.yaml index 594ab42a..09d57d8e 100644 --- a/k8s/sxp/10.3/ltsc2019/xp1/init/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2019/xp1/init/kustomization.yaml @@ -9,4 +9,4 @@ images: newTag: 10.3-ltsc2019 resources: - mssql-init.yaml -- solr-init.yaml +- solr-init.yaml \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2019/xp1/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/xp1/kustomization.yaml index 717a9e01..e1314961 100644 --- a/k8s/sxp/10.3/ltsc2019/xp1/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2019/xp1/kustomization.yaml @@ -1,7 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -bases: -- configmaps images: - name: sitecore-xp1-cd newName: scr.sitecore.com/sxp/sitecore-xp1-cd @@ -48,6 +46,7 @@ images: - name: pwsh-initContainer newName: mcr.microsoft.com/powershell:lts-nanoserver-1809 resources: +- configmaps - cm.yaml - cd.yaml - id.yaml @@ -62,3 +61,56 @@ resources: - xdbrefdata.yaml - xdbsearch.yaml - xdbsearchworker.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-xp1-cm].env.[name=Sitecore_Identity_Server_CallbackAuthority].value + options: + delimiter: // + index: 1 + - select: + kind: Deployment + name: id + fieldPaths: + - spec.template.spec.containers.[name=sitecore-xp1-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-xp1-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-xp1-cm].env.[name=Sitecore_Identity_Server_Authority].value + options: + delimiter: // + index: 1 + - select: + kind: Deployment + name: id + fieldPaths: + - spec.template.spec.containers.[name=sitecore-xp1-id].env.[name=Sitecore_Sitecore__IdentityServer__PublicOrigin].value + options: + delimiter: // + index: 1 \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2019/xp1/overlays/init/SearchStax/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/xp1/overlays/init/SearchStax/kustomization.yaml index 59fcfa39..e1447333 100644 --- a/k8s/sxp/10.3/ltsc2019/xp1/overlays/init/SearchStax/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2019/xp1/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 \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2022/upgrade/xm1/kustomization.yaml b/k8s/sxp/10.3/ltsc2022/upgrade/xm1/kustomization.yaml index b60db321..4183e71e 100644 --- a/k8s/sxp/10.3/ltsc2022/upgrade/xm1/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2022/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.3-ltsc2022 \ No newline at end of file + newTag: 10.3-ltsc2022 diff --git a/k8s/sxp/10.3/ltsc2022/upgrade/xp1/kustomization.yaml b/k8s/sxp/10.3/ltsc2022/upgrade/xp1/kustomization.yaml index fac546a1..db91ca15 100644 --- a/k8s/sxp/10.3/ltsc2022/upgrade/xp1/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2022/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.3-ltsc2022 \ No newline at end of file + newTag: 10.3-ltsc2022 diff --git a/k8s/sxp/10.3/ltsc2022/xm1/cm.yaml b/k8s/sxp/10.3/ltsc2022/xm1/cm.yaml index 42d1ee02..0ffc0bea 100644 --- a/k8s/sxp/10.3/ltsc2022/xm1/cm.yaml +++ b/k8s/sxp/10.3/ltsc2022/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/ltsc2022/xm1/configmaps/kustomization.yaml b/k8s/sxp/10.3/ltsc2022/xm1/configmaps/kustomization.yaml index 0064e2e9..ea28225a 100644 --- a/k8s/sxp/10.3/ltsc2022/xm1/configmaps/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2022/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 \ No newline at end of file + - id-hostname \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2022/xm1/id.yaml b/k8s/sxp/10.3/ltsc2022/xm1/id.yaml index c1a3b506..fa907eb3 100644 --- a/k8s/sxp/10.3/ltsc2022/xm1/id.yaml +++ b/k8s/sxp/10.3/ltsc2022/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/ltsc2022/xm1/ingress-nginx/ingress.yaml b/k8s/sxp/10.3/ltsc2022/xm1/ingress-nginx/ingress.yaml index ca5df406..3b939a42 100644 --- a/k8s/sxp/10.3/ltsc2022/xm1/ingress-nginx/ingress.yaml +++ b/k8s/sxp/10.3/ltsc2022/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) \ No newline at end of file + - id-placeholder-hostname \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2022/xm1/ingress-nginx/kustomization.yaml b/k8s/sxp/10.3/ltsc2022/xm1/ingress-nginx/kustomization.yaml index 5774fcd6..cf09a27d 100644 --- a/k8s/sxp/10.3/ltsc2022/xm1/ingress-nginx/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2022/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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2022/xm1/init/kustomization.yaml b/k8s/sxp/10.3/ltsc2022/xm1/init/kustomization.yaml index 48a547e9..3279f8e7 100644 --- a/k8s/sxp/10.3/ltsc2022/xm1/init/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2022/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.3-ltsc2022 - 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.3/ltsc2022/xm1/kustomization.yaml b/k8s/sxp/10.3/ltsc2022/xm1/kustomization.yaml index 29b0a626..b70f112b 100644 --- a/k8s/sxp/10.3/ltsc2022/xm1/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2022/xm1/kustomization.yaml @@ -1,9 +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 @@ -14,8 +10,61 @@ images: - name: sitecore-xm1-id newName: scr.sitecore.com/sxp/sitecore-id7 newTag: 10.3-ltsc2022 - resources: - - cm.yaml - - cd.yaml - - id.yaml \ No newline at end of file +- 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/ltsc2022/xm1/overlays/init/SearchStax/kustomization.yaml b/k8s/sxp/10.3/ltsc2022/xm1/overlays/init/SearchStax/kustomization.yaml index dbcf7df0..903ec3f1 100644 --- a/k8s/sxp/10.3/ltsc2022/xm1/overlays/init/SearchStax/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2022/xm1/overlays/init/SearchStax/kustomization.yaml @@ -1,17 +1,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - -bases: +resources: - ..\..\..\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.3-ltsc2022 - 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.3/ltsc2022/xp1/cm.yaml b/k8s/sxp/10.3/ltsc2022/xp1/cm.yaml index 5eb1c123..62aeb17e 100644 --- a/k8s/sxp/10.3/ltsc2022/xp1/cm.yaml +++ b/k8s/sxp/10.3/ltsc2022/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/ltsc2022/xp1/configmaps/kustomization.yaml b/k8s/sxp/10.3/ltsc2022/xp1/configmaps/kustomization.yaml index 0064e2e9..ea28225a 100644 --- a/k8s/sxp/10.3/ltsc2022/xp1/configmaps/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2022/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 \ No newline at end of file + - id-hostname \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2022/xp1/id.yaml b/k8s/sxp/10.3/ltsc2022/xp1/id.yaml index eca5e0c8..8d5b4731 100644 --- a/k8s/sxp/10.3/ltsc2022/xp1/id.yaml +++ b/k8s/sxp/10.3/ltsc2022/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/ltsc2022/xp1/ingress-nginx/ingress.yaml b/k8s/sxp/10.3/ltsc2022/xp1/ingress-nginx/ingress.yaml index ca5df406..3b939a42 100644 --- a/k8s/sxp/10.3/ltsc2022/xp1/ingress-nginx/ingress.yaml +++ b/k8s/sxp/10.3/ltsc2022/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) \ No newline at end of file + - id-placeholder-hostname \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2022/xp1/ingress-nginx/kustomization.yaml b/k8s/sxp/10.3/ltsc2022/xp1/ingress-nginx/kustomization.yaml index 5774fcd6..9f7e12f5 100644 --- a/k8s/sxp/10.3/ltsc2022/xp1/ingress-nginx/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2022/xp1/ingress-nginx/kustomization.yaml @@ -1,18 +1,69 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -bases: -- ../configmaps - resources: + - ../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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/k8s/sxp/10.3/ltsc2022/xp1/init/kustomization.yaml b/k8s/sxp/10.3/ltsc2022/xp1/init/kustomization.yaml index e9c22e6a..07c73e04 100644 --- a/k8s/sxp/10.3/ltsc2022/xp1/init/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2022/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.3-ltsc2022 - 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.3/ltsc2022/xp1/kustomization.yaml b/k8s/sxp/10.3/ltsc2022/xp1/kustomization.yaml index 265eae0f..9790a950 100644 --- a/k8s/sxp/10.3/ltsc2022/xp1/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2022/xp1/kustomization.yaml @@ -1,9 +1,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - -bases: -- configmaps - images: - name: sitecore-xp1-cd newName: scr.sitecore.com/sxp/sitecore-xp1-cd @@ -49,19 +45,72 @@ images: newTag: 10.3-ltsc2022 - name: pwsh-initContainer newName: mcr.microsoft.com/powershell:lts-nanoserver-ltsc2022 - 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 +- configmaps +- 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 +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-xp1-cm].env.[name=Sitecore_Identity_Server_CallbackAuthority].value + options: + delimiter: // + index: 1 + - select: + kind: Deployment + name: id + fieldPaths: + - spec.template.spec.containers.[name=sitecore-xp1-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-xp1-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-xp1-cm].env.[name=Sitecore_Identity_Server_Authority].value + options: + delimiter: // + index: 1 + - select: + kind: Deployment + name: id + fieldPaths: + - spec.template.spec.containers.[name=sitecore-xp1-id].env.[name=Sitecore_Sitecore__IdentityServer__PublicOrigin].value + options: + delimiter: // + index: 1 diff --git a/k8s/sxp/10.3/ltsc2022/xp1/overlays/init/SearchStax/kustomization.yaml b/k8s/sxp/10.3/ltsc2022/xp1/overlays/init/SearchStax/kustomization.yaml index 72434e2c..0e858908 100644 --- a/k8s/sxp/10.3/ltsc2022/xp1/overlays/init/SearchStax/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2022/xp1/overlays/init/SearchStax/kustomization.yaml @@ -1,17 +1,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization - -bases: +resources: - ..\..\..\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.3-ltsc2022 - 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 From cb13f7292fd4b5bcf685aa3a2f125fc11697464f Mon Sep 17 00:00:00 2001 From: Eugenia Bilynska Date: Mon, 20 Nov 2023 13:35:44 +0200 Subject: [PATCH 2/2] Update for code guidlelines --- k8s/sxp/10.3/ltsc2019/upgrade/xm1/kustomization.yaml | 2 +- k8s/sxp/10.3/ltsc2019/upgrade/xp1/kustomization.yaml | 2 +- k8s/sxp/10.3/ltsc2019/xm1/init/kustomization.yaml | 2 +- k8s/sxp/10.3/ltsc2019/xp1/init/kustomization.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/k8s/sxp/10.3/ltsc2019/upgrade/xm1/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/upgrade/xm1/kustomization.yaml index f71a4394..fdb8af94 100644 --- a/k8s/sxp/10.3/ltsc2019/upgrade/xm1/kustomization.yaml +++ b/k8s/sxp/10.3/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.3-ltsc2019 \ No newline at end of file + newTag: 10.3-ltsc2019 diff --git a/k8s/sxp/10.3/ltsc2019/upgrade/xp1/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/upgrade/xp1/kustomization.yaml index efa57a37..0e32deab 100644 --- a/k8s/sxp/10.3/ltsc2019/upgrade/xp1/kustomization.yaml +++ b/k8s/sxp/10.3/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.3-ltsc2019 \ No newline at end of file + newTag: 10.3-ltsc2019 diff --git a/k8s/sxp/10.3/ltsc2019/xm1/init/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/xm1/init/kustomization.yaml index 2cafb0d6..d116b8b2 100644 --- a/k8s/sxp/10.3/ltsc2019/xm1/init/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2019/xm1/init/kustomization.yaml @@ -9,4 +9,4 @@ images: newTag: 10.3-ltsc2019 resources: - mssql-init.yaml -- solr-init.yaml \ No newline at end of file +- solr-init.yaml diff --git a/k8s/sxp/10.3/ltsc2019/xp1/init/kustomization.yaml b/k8s/sxp/10.3/ltsc2019/xp1/init/kustomization.yaml index 09d57d8e..594ab42a 100644 --- a/k8s/sxp/10.3/ltsc2019/xp1/init/kustomization.yaml +++ b/k8s/sxp/10.3/ltsc2019/xp1/init/kustomization.yaml @@ -9,4 +9,4 @@ images: newTag: 10.3-ltsc2019 resources: - mssql-init.yaml -- solr-init.yaml \ No newline at end of file +- solr-init.yaml