chore: clean up and add comments

georgechang · Jul 19, 2021 · 8370ffe · 8370ffe
1 parent 6a4266c
commit 8370ffe
Show file tree

Hide file tree

Showing 17 changed files with 60 additions and 175 deletions.
diff --git a/Dockerfile b/Dockerfile
diff --git a/aks/azurefile-retained.yaml b/aks/azurefile-retained.yaml
diff --git a/aks/nginx-internal-ingress-controller.sh b/aks/nginx-internal-ingress-controller.sh
diff --git a/azure/sql.bicep b/azure/sql.bicep
diff --git a/azure/sql.json b/azure/sql.json
diff --git a/mssql/mssql-statefulset.yaml b/mssql/mssql-statefulset.yaml
@@ -26,7 +26,7 @@ spec:
             - name: ACCEPT_EULA
               value: "Y"
             - name: SA_PASSWORD
-              value: "pass@word1"
+              value: "password"
           ports:
             - name: mssql
               containerPort: 1433

diff --git a/sitecore/cortexproc.yaml b/sitecore/cortexproc.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: cortexproc
-          image: scr.sitecore.com/sxp/sitecore-xp0-cortexprocessingworker:10.0.0-ltsc2019
+          image: scr.sitecore.com/sxp/sitecore-xp0-cortexprocessingworker:10.1-ltsc2019
           envFrom:
             - configMapRef:
                 name: sitecore-configmap

diff --git a/sitecore/identity.yaml b/sitecore/identity.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: identity
-          image: scr.sitecore.com/sxp/sitecore-id:10.0.0-ltsc2019
+          image: scr.sitecore.com/sxp/sitecore-id:10.1-ltsc2019
           ports:
             - name: web
               containerPort: 80
@@ -28,7 +28,7 @@ spec:
           resources:
             limits:
               memory: 8Gi
-              cpu: 1
+              cpu: 1000m
       nodeSelector:
         kubernetes.io/os: windows
 ---

diff --git a/sitecore/sitecore-cd.yaml b/sitecore/sitecore-cd.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: sitecore-cd
-          image: scr.sitecore.com/sxp/sitecore-xp1-cd:10.0.0-ltsc2019
+          image: scr.sitecore.com/sxp/sitecore-xp1-cd:10.1-ltsc2019
           ports:
             - name: web
               containerPort: 80
@@ -29,7 +29,7 @@ spec:
           resources:
             limits:
               memory: 4Gi
-              cpu: 1
+              cpu: 1000m
       nodeSelector:
         kubernetes.io/os: windows
 ---

diff --git a/sitecore/sitecore-cm.yaml b/sitecore/sitecore-cm.yaml
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: sitecore-cm
-          image: scr.sitecore.com/sxp/sitecore-xp0-cm:10.0.0-ltsc2019
+          image: scr.sitecore.com/sxp/sitecore-xp0-cm:10.1-ltsc2019
           ports:
             - name: web
               containerPort: 80
@@ -29,27 +29,18 @@ spec:
           resources:
             limits:
               memory: 4Gi
-              cpu: 1
+              cpu: 1000m
       nodeSelector:
         kubernetes.io/os: windows
 ---
 apiVersion: v1
 kind: Service
 metadata:
   name: sitecore-cm-service
-<<<<<<< HEAD:sitecore/sitecore-cm.yaml
-  namespace: sitecore
-=======
->>>>>>> 3f53c9c (Updates):sitecore/sitecore-cm-deployment.yaml
   labels:
     app: sitecore
     role: cm
 spec:
-<<<<<<< HEAD:sitecore/sitecore-cm.yaml
-  type: ClusterIP
-  clusterIP: None
-=======
->>>>>>> 3f53c9c (Updates):sitecore/sitecore-cm-deployment.yaml
   ports:
     - port: 80
   selector:

diff --git a/sitecore/sitecore-configmap.yaml b/sitecore/sitecore-configmap.yaml
@@ -4,16 +4,16 @@ metadata:
   name: sitecore-configmap
 data:
   Sitecore_AppSettings_instanceNameMode__define: default
-  Sitecore_ConnectionStrings_Core: Data Source=mssql-service;Initial Catalog=Sitecore.Core;User ID=sa;Password=pass@word1
-  Sitecore_ConnectionStrings_Security: Data Source=mssql-service;Initial Catalog=Sitecore.Core;User ID=sa;Password=pass@word1
-  Sitecore_ConnectionStrings_Master: Data Source=mssql-service;Initial Catalog=Sitecore.Master;User ID=sa;Password=pass@word1
-  Sitecore_ConnectionStrings_Web: Data Source=mssql-service;Initial Catalog=Sitecore.Web;User ID=sa;Password=pass@word1
+  Sitecore_ConnectionStrings_Core: Data Source=mssql-service;Initial Catalog=Sitecore.Core;User ID=sa;Password=password
+  Sitecore_ConnectionStrings_Security: Data Source=mssql-service;Initial Catalog=Sitecore.Core;User ID=sa;Password=password
+  Sitecore_ConnectionStrings_Master: Data Source=mssql-service;Initial Catalog=Sitecore.Master;User ID=sa;Password=password
+  Sitecore_ConnectionStrings_Web: Data Source=mssql-service;Initial Catalog=Sitecore.Web;User ID=sa;Password=password
   Sitecore_ConnectionStrings_Reporting.ApiKey: vqr4pnanyuuz8q85rbzvxih9yd3bytew
-  Sitecore_ConnectionStrings_Messaging: Data Source=mssql-service;Initial Catalog=Sitecore.Messaging;User ID=sa;Password=pass@word1
-  Sitecore_ConnectionStrings_Xdb.Referencedata: Data Source=mssql-service;Initial Catalog=Sitecore.Referencedata;User ID=sa;Password=pass@word1
-  Sitecore_ConnectionStrings_ExperienceForms: Data Source=mssql-service;Initial Catalog=Sitecore.ExperienceForms;User ID=sa;Password=pass@word1
-  Sitecore_ConnectionStrings_Exm.Master: Data Source=mssql-service;Initial Catalog=Sitecore.Exm.master;User ID=sa;Password=pass@word1
-  Sitecore_ConnectionStrings_Reporting: Data Source=mssql-service;Initial Catalog=Sitecore.Reporting;User ID=sa;Password=pass@word1
+  Sitecore_ConnectionStrings_Messaging: Data Source=mssql-service;Initial Catalog=Sitecore.Messaging;User ID=sa;Password=password
+  Sitecore_ConnectionStrings_Xdb.Referencedata: Data Source=mssql-service;Initial Catalog=Sitecore.Referencedata;User ID=sa;Password=password
+  Sitecore_ConnectionStrings_ExperienceForms: Data Source=mssql-service;Initial Catalog=Sitecore.ExperienceForms;User ID=sa;Password=password
+  Sitecore_ConnectionStrings_Exm.Master: Data Source=mssql-service;Initial Catalog=Sitecore.Exm.master;User ID=sa;Password=password
+  Sitecore_ConnectionStrings_Reporting: Data Source=mssql-service;Initial Catalog=Sitecore.Reporting;User ID=sa;Password=password
   Sitecore_ConnectionStrings_Sitecore.Reporting.Client: http://cortexreporting
   Sitecore_ConnectionStrings_Solr.Search: http://solr-service:8983/solr
   Sitecore_ConnectionStrings_XConnect.Collection: http://xdbcollection

diff --git a/sitecore/xconnect.yaml b/sitecore/xconnect.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: xconnect
-          image: scr.sitecore.com/sxp/sitecore-xp0-xconnect:10.0.0-ltsc2019
+          image: scr.sitecore.com/sxp/sitecore-xp0-xconnect:10.1-ltsc2019
           envFrom:
             - configMapRef:
                 name: sitecore-configmap

diff --git a/sitecore/xdbautomation.yaml b/sitecore/xdbautomation.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: xdbautomation
-          image: scr.sitecore.com/sxp/sitecore-xp0-xdbautomationworker:10.0.0-ltsc2019
+          image: scr.sitecore.com/sxp/sitecore-xp0-xdbautomationworker:10.1-ltsc2019
           envFrom:
             - configMapRef:
                 name: sitecore-configmap

diff --git a/sitecore/xdbsearch.yaml b/sitecore/xdbsearch.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
         - name: xdbsearch
-          image: scr.sitecore.com/sxp/sitecore-xp0-xdbsearchworker:10.0.0-ltsc2019
+          image: scr.sitecore.com/sxp/sitecore-xp0-xdbsearchworker:10.1-ltsc2019
           envFrom:
             - configMapRef:
                 name: sitecore-configmap

diff --git a/solr/solr-statefulset.yaml b/solr/solr-statefulset.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: solr
 spec:
-  replicas: 1
+  replicas: 3 # set this to the number of Solr pod instances you want
   selector:
     matchLabels:
       app: solr
@@ -21,21 +21,35 @@ spec:
         fsGroup: 1001
       nodeSelector:
         kubernetes.io/os: linux
+        agentpool: solr
+      affinity:
+        # this causes K8s to only schedule only one Solr pod per node
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - labelSelector:
+                matchExpressions:
+                  - key: "app"
+                    operator: In
+                    values:
+                      - solr
+              topologyKey: "kubernetes.io/hostname"
       containers:
         - name: solr
-          image: solr:8.5.2
+          image: solr:8.4
           env:
+            # ZK_HOST lists all of the hostnames for all of the Zookeeper instances - this should correspond to however many ZK instances you have running.
             - name: ZK_HOST
-              value: zookeeper-statefulset-0.zookeeper-service:2181 #,zookeeper-statefulset-1.zookeeper-service:2181,zookeeper-statefulset-2.zookeeper-service:2181
+              value: zookeeper-statefulset-0.zookeeper-service:2181,zookeeper-statefulset-1.zookeeper-service:2181,zookeeper-statefulset-2.zookeeper-service:2181, etc
             - name: SOLR_JAVA_MEM
-              value: "-Xms4g -Xmx4g"
+              value: "-Xms4g -Xmx4g" # set the JVM memory usage and limit
           ports:
             - name: solr
               containerPort: 8983
           volumeMounts:
             - name: solr-pvc
               mountPath: /var/solr
           livenessProbe:
+            # runs a built-in script to check for Solr readiness/liveness
             exec:
               command:
                 - /bin/bash
@@ -44,6 +58,7 @@ spec:
             initialDelaySeconds: 20
             timeoutSeconds: 5
           readinessProbe:
+            # runs a built-in script to check for Solr readiness/liveness
             exec:
               command:
                 - /bin/bash
@@ -52,17 +67,19 @@ spec:
             initialDelaySeconds: 20
             timeoutSeconds: 5
       initContainers:
+        # runs a built-script to wait until all Zookeeper instances are up and running
         - name: solr-zk-waiter
-          image: solr:8.5.2
+          image: solr:8.4
           command:
             - /bin/bash
             - "-c"
             - "/opt/docker-solr/scripts/wait-for-zookeeper.sh"
           env:
             - name: ZK_HOST
-              value: zookeeper-statefulset-0.zookeeper-service:2181 #,zookeeper-statefulset-1.zookeeper-service:2181,zookeeper-statefulset-2.zookeeper-service:2181
+              value: zookeeper-statefulset-0.zookeeper-service:2181,zookeeper-statefulset-1.zookeeper-service:2181,zookeeper-statefulset-2.zookeeper-service:2181
+        # runs a built-in script to initialize Solr instance if necessary
         - name: solr-init
-          image: solr:8.5.2
+          image: solr:8.4
           command:
             - /bin/bash
             - "-c"
@@ -76,7 +93,7 @@ spec:
       spec:
         accessModes:
           - ReadWriteOnce
-        storageClassName: managed-premium-retained
+        storageClassName: managed-premium
         resources:
           requests:
-            storage: 100Mi
+            storage: 1Gi
diff --git a/zookeeper/zookeeper-service.yaml b/zookeeper/zookeeper-service.yaml
@@ -5,10 +5,7 @@ metadata:
   namespace: solr
   labels:
     app: zookeeper
-  annotations:
-    service.beta.kubernetes.io/azure-load-balancer-internal: "true"
 spec:
-  type: LoadBalancer
   ports:
     - port: 2888
       name: server