From 0330418bdb912a760d94787642b87edaa486a506 Mon Sep 17 00:00:00 2001 From: Rob Habraken Date: Thu, 17 Dec 2020 15:23:59 +0100 Subject: [PATCH] Move default Redis connection string out of CD K8s spec files into separate K8s secret to allow for easier population of custom connection string --- k8s/sxp/10.0/ltsc2019/xm1/cd.yaml | 5 ++++- k8s/sxp/10.0/ltsc2019/xm1/secrets/kustomization.yaml | 3 +++ .../xm1/secrets/sitecore-redis-connection-string.txt | 1 + k8s/sxp/10.0/ltsc2019/xp1/cd.yaml | 5 ++++- k8s/sxp/10.0/ltsc2019/xp1/secrets/kustomization.yaml | 3 +++ .../xp1/secrets/sitecore-redis-connection-string.txt | 1 + 6 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 k8s/sxp/10.0/ltsc2019/xm1/secrets/sitecore-redis-connection-string.txt create mode 100644 k8s/sxp/10.0/ltsc2019/xp1/secrets/sitecore-redis-connection-string.txt diff --git a/k8s/sxp/10.0/ltsc2019/xm1/cd.yaml b/k8s/sxp/10.0/ltsc2019/xm1/cd.yaml index dd164176..180a1f04 100644 --- a/k8s/sxp/10.0/ltsc2019/xm1/cd.yaml +++ b/k8s/sxp/10.0/ltsc2019/xm1/cd.yaml @@ -89,7 +89,10 @@ spec: name: sitecore-solr key: sitecore-solr-connection-string.txt - name: Sitecore_ConnectionStrings_Redis.Sessions - value: redis:6379,ssl=False,abortConnect=False + valueFrom: + secretKeyRef: + name: sitecore-redis + key: sitecore-redis-connection-string.txt - name: SOLR_CORE_PREFIX_NAME valueFrom: secretKeyRef: diff --git a/k8s/sxp/10.0/ltsc2019/xm1/secrets/kustomization.yaml b/k8s/sxp/10.0/ltsc2019/xm1/secrets/kustomization.yaml index 59ee5e52..53227536 100644 --- a/k8s/sxp/10.0/ltsc2019/xm1/secrets/kustomization.yaml +++ b/k8s/sxp/10.0/ltsc2019/xm1/secrets/kustomization.yaml @@ -35,6 +35,9 @@ secretGenerator: files: - sitecore-solr-connection-string.txt - sitecore-solr-core-prefix-name.txt +- name: sitecore-redis + files: + - sitecore-redis-connection-string.txt - name: global-cd-tls files: - tls/global-cd/tls.key diff --git a/k8s/sxp/10.0/ltsc2019/xm1/secrets/sitecore-redis-connection-string.txt b/k8s/sxp/10.0/ltsc2019/xm1/secrets/sitecore-redis-connection-string.txt new file mode 100644 index 00000000..15a10e5f --- /dev/null +++ b/k8s/sxp/10.0/ltsc2019/xm1/secrets/sitecore-redis-connection-string.txt @@ -0,0 +1 @@ +redis:6379,ssl=False,abortConnect=False \ No newline at end of file diff --git a/k8s/sxp/10.0/ltsc2019/xp1/cd.yaml b/k8s/sxp/10.0/ltsc2019/xp1/cd.yaml index 917c32ce..79f204c9 100644 --- a/k8s/sxp/10.0/ltsc2019/xp1/cd.yaml +++ b/k8s/sxp/10.0/ltsc2019/xp1/cd.yaml @@ -134,7 +134,10 @@ spec: - name: Sitecore_ConnectionStrings_Xdb.ReferenceData.Client value: http://xdbrefdata - name: Sitecore_ConnectionStrings_Redis.Sessions - value: redis:6379,ssl=False,abortConnect=False + valueFrom: + secretKeyRef: + name: sitecore-redis + key: sitecore-redis-connection-string.txt - name: SOLR_CORE_PREFIX_NAME valueFrom: secretKeyRef: diff --git a/k8s/sxp/10.0/ltsc2019/xp1/secrets/kustomization.yaml b/k8s/sxp/10.0/ltsc2019/xp1/secrets/kustomization.yaml index 021ef850..973af0a3 100644 --- a/k8s/sxp/10.0/ltsc2019/xp1/secrets/kustomization.yaml +++ b/k8s/sxp/10.0/ltsc2019/xp1/secrets/kustomization.yaml @@ -61,6 +61,9 @@ secretGenerator: - name: sitecore-solr-xdb files: - sitecore-solr-connection-string-xdb.txt +- name: sitecore-redis + files: + - sitecore-redis-connection-string.txt - name: global-cd-tls files: - tls/global-cd/tls.key diff --git a/k8s/sxp/10.0/ltsc2019/xp1/secrets/sitecore-redis-connection-string.txt b/k8s/sxp/10.0/ltsc2019/xp1/secrets/sitecore-redis-connection-string.txt new file mode 100644 index 00000000..15a10e5f --- /dev/null +++ b/k8s/sxp/10.0/ltsc2019/xp1/secrets/sitecore-redis-connection-string.txt @@ -0,0 +1 @@ +redis:6379,ssl=False,abortConnect=False \ No newline at end of file