Updates

georgechang · May 14, 2021 · 6a4266c · 6a4266c
1 parent bd5c868
commit 6a4266c
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 50 deletions.
diff --git a/aks/managed-premium-retained.yaml b/aks/managed-premium-retained.yaml
@@ -0,0 +1,8 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: managed-premium-retained
+provisioner: kubernetes.io/azure-disk
+reclaimPolicy: Retain
+parameters:
+  skuName: Premium_LRS
diff --git a/mssql/mssql-service.yaml b/mssql/mssql-service.yaml
@@ -5,7 +5,11 @@ metadata:
   namespace: mssql
   labels:
     app: mssql
+  annotations:
+    service.beta.kubernetes.io/azure-load-balancer-internal: "true"
+    service.beta.kubernetes.io/azure-load-balancer-internal-subnet: "mssql-subnet"
 spec:
+  type: LoadBalancer
   ports:
     - port: 1433
   selector:

diff --git a/mssql/mssql-statefulset.yaml b/mssql/mssql-statefulset.yaml
@@ -31,13 +31,13 @@ spec:
             - name: mssql
               containerPort: 1433
           volumeMounts:
-            - name: mssql-pv
+            - name: mssql-pvc
               mountPath: /var/opt/mssql
       nodeSelector:
         kubernetes.io/os: linux
   volumeClaimTemplates:
     - metadata:
-        name: mssql-pv
+        name: mssql-pvc
       spec:
         accessModes:
           - ReadWriteOnce

diff --git a/sitecore/sitecore-cd.yaml b/sitecore/sitecore-cd.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: sitecore
   labels:
     app: sitecore
+    role: cd
 spec:
   replicas: 1
   selector:
@@ -27,7 +28,7 @@ spec:
                 name: sitecore-configmap
           resources:
             limits:
-              memory: 8Gi
+              memory: 4Gi
               cpu: 1
       nodeSelector:
         kubernetes.io/os: windows

diff --git a/sitecore/sitecore-cm.yaml b/sitecore/sitecore-cm.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: sitecore
   labels:
     app: sitecore
+    role: cm
 spec:
   replicas: 1
   selector:
@@ -27,7 +28,7 @@ spec:
                 name: sitecore-configmap
           resources:
             limits:
-              memory: 8Gi
+              memory: 4Gi
               cpu: 1
       nodeSelector:
         kubernetes.io/os: windows
@@ -36,13 +37,19 @@ 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
diff --git a/sitecore/sitecore-ingress.yaml b/sitecore/sitecore-ingress.yaml
@@ -1,42 +1,34 @@
-apiVersion: networking.k8s.io/v1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: sitecore-ingress
-  namespace: sitecore
-  annotations:
-    kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/ssl-redirect: "false"
 spec:
   rules:
-    - host: cm.sitecore-k8s.local
+    - host: cm.azure.com
       http:
         paths:
-          - path: /
-            pathType: Prefix
+          - pathType: Prefix
+            path: /
             backend:
-              service:
-                name: sitecore-cm-service
-                port:
-                  number: 80
+              serviceName: sitecore-cm-service
+              servicePort: 80
 
-    - host: cd.sitecore-k8s.local
+    - host: cd.azure.com
       http:
         paths:
-          - path: /
-            pathType: Prefix
+          - pathType: Prefix
+            path: /
             backend:
-              service:
-                name: sitecore-cd-service
-                port:
-                  number: 80
+              serviceName: sitecore-cd-service
+              servicePort: 80
 
-    - host: id.sitecore-k8s.local
-      http:
-        paths:
-          - path: /
-            pathType: Prefix
-            backend:
-              service:
-                name: sitecore-id-service
-                port:
-                  number: 80
+    # - host: id.azure.com
+    #   http:
+    #     paths:
+    #       - pathType: Prefix
+    #         path: /
+    #         backend:
+    #           service:
+    #             name: sitecore-id-service
+    #             port:
+    #               number: 80
diff --git a/solr/solr-statefulset.yaml b/solr/solr-statefulset.yaml
@@ -33,7 +33,7 @@ spec:
             - name: solr
               containerPort: 8983
           volumeMounts:
-            - name: solr-pv
+            - name: solr-pvc
               mountPath: /var/solr
           livenessProbe:
             exec:
@@ -72,7 +72,7 @@ spec:
               mountPath: /var/solr
   volumeClaimTemplates:
     - metadata:
-        name: solr-pv
+        name: solr-pvc
       spec:
         accessModes:
           - ReadWriteOnce

diff --git a/zookeeper/zookeeper-service.yaml b/zookeeper/zookeeper-service.yaml
@@ -5,7 +5,10 @@ metadata:
   namespace: solr
   labels:
     app: zookeeper
+  annotations:
+    service.beta.kubernetes.io/azure-load-balancer-internal: "true"
 spec:
+  type: LoadBalancer
   ports:
     - port: 2888
       name: server

diff --git a/zookeeper/zookeeper-statefulset.yaml b/zookeeper/zookeeper-statefulset.yaml
@@ -44,7 +44,7 @@ spec:
               topologyKey: "kubernetes.io/hostname"
       containers:
         - name: zookeeper
-          image: zookeeper:3.5
+          image: zookeeper:3.6.1
           env:
             - name: ZK_REPLICAS
               value: "1"