Merge branch 'main' of github.com:zalf-rdm/geonode-k8s into issue_#17…

…6_Task_support_GeoNode_4.3
zalf-rdm · Jun 21, 2024 · 9436087 · 9436087
2 parents 382137d + a2bd2bd
commit 9436087
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 21 deletions.
diff --git a/charts/geonode/templates/geonode/geonode-deploy.yaml b/charts/geonode/templates/geonode/geonode-deploy.yaml
@@ -84,9 +84,10 @@ spec:
           dockerize -stdout /var/log/geonode.log /usr/local/bin/uwsgi --ini /usr/src/geonode/uwsgi.ini
 
         ports:
-        - containerPort: 8000
-        - containerPort: 8001
-
+        - name: http
+          containerPort: 8000
+        - name: http-monitor
+          containerPort: 8001
         envFrom:
         - configMapRef:
             name: {{ include "geonode_pod_name" . }}-env
@@ -155,6 +156,19 @@ spec:
           readOnly: true
         {{ end }}
 
+        startupProbe:
+          httpGet:
+            path: /
+            port: http-monitor
+          failureThreshold: 10
+          periodSeconds: 10
+
+        livenessProbe:
+          httpGet:
+            path: /
+            port: http-monitor
+          initialDelaySeconds: 90
+          periodSeconds: 10
         resources:
           requests:
             memory: {{ .Values.geonode.resources.requests.memory }}

diff --git a/charts/geonode/templates/geoserver/geoserver-deploy.yaml b/charts/geonode/templates/geoserver/geoserver-deploy.yaml
@@ -82,14 +82,12 @@ spec:
         readinessProbe:
           tcpSocket:
             port: {{ .Values.geoserver.port }}
-          initialDelaySeconds: 60
           periodSeconds: 5
           failureThreshold: 15
-
         livenessProbe:
           tcpSocket:
             port: {{ .Values.geoserver.port }}
-          initialDelaySeconds: 180
+          initialDelaySeconds: 90
           periodSeconds: 5
           failureThreshold: 15
 

diff --git a/charts/geonode/templates/nginx/nginx-deploy.yaml b/charts/geonode/templates/nginx/nginx-deploy.yaml
@@ -28,12 +28,11 @@ spec:
         image: "{{ .Values.nginx.image.name }}:{{ .Values.nginx.image.tag }}"
         imagePullPolicy: {{ .Values.nginx.imagePullPolicy }}
         ports:
+          - name: http
         {{- if (eq .Values.geonode.general.externalScheme "https" )}}
-        - containerPort: 443
-          name: https
+            containerPort: 443
         {{- else }}
-        - containerPort: 80
-          name: http
+            containerPort: 80
         {{- end }}
 
         volumeMounts:
@@ -46,6 +45,14 @@ spec:
         - name: nginx-confd
           mountPath: /etc/nginx/conf.d
 
+        # this will fail as long as statics are not build by the geonode sts
+        livenessProbe:
+          httpGet:
+            path: /
+            port: http
+          initialDelaySeconds: 15
+          timeoutSeconds: 5
+
         resources:
           requests:
             memory: {{ .Values.nginx.resources.requests.memory }}

diff --git a/charts/geonode/templates/pycsw/pycsw-deploy.yaml b/charts/geonode/templates/pycsw/pycsw-deploy.yaml
@@ -57,7 +57,8 @@ spec:
           value: "postgresql://$(GEONODE_DATABASE):$(GEONODE_DATABASE_PASSWORD)@$(DATABASE_HOST):$(DATABASE_PORT)/$(GEONODE_DATABASE)"
 
         ports:
-        - containerPort: {{ .Values.pycsw.port }}
+        - name: http
+          containerPort: {{ .Values.pycsw.port }}
         volumeMounts:
         - name: pycsw-cfg
           mountPath: "/etc/pycsw/pycsw.cfg"
@@ -67,19 +68,24 @@ spec:
           mountPath: /etc/pycsw/pycsw-mappings.py
           subPath: pycsw-mappings.py
           readOnly: true
+        readinessProbe:
+          httpGet:
+            path: /
+            port: http
+          timeoutSeconds: 5
+        livenessProbe:
+          httpGet:
+            path: /
+            port: http
+          initialDelaySeconds: 10
+          timeoutSeconds: 5
         resources:
           requests:
             memory: {{ .Values.pycsw.resources.requests.memory }}
             cpu: {{ .Values.pycsw.resources.requests.cpu }}
           limits:
             memory: {{ .Values.pycsw.resources.limits.memory }}
             cpu: {{ .Values.pycsw.resources.limits.cpu }}
-        # livenessProbe:
-        #   httpGet:
-        #     path: /
-        #     port: {{ .Values.pycsw.port }}
-        #   initialDelaySeconds: 3
-        #   periodSeconds: 10
 
       volumes:
       - name: pycsw-cfg

diff --git a/docs/minikube-installation.md b/docs/minikube-installation.md
@@ -1,6 +1,6 @@
-# Installation guide for Minicube
+# Installation guide for Minikube
 
-## Install Minicube
+## Install Minikube
 
 To install minikube itself follow the instruction on https://kubernetes.io/de/docs/tasks/tools/install-minikube/
 
@@ -12,7 +12,7 @@ Download or update latest helm chart dependencies listed in /chart.yaml.
 helm dependency update charts/geonode
 ```
 
-## Edit Minicube values
+## Edit Minikube values
 
 View and edit the predefined minikube values under /minikube-values.yaml
 
@@ -117,4 +117,4 @@ There are several ways to expose services from minikube, find information in the
 
 Now you are able to access the geonode installation by opening your browser and open http://geonode for geonode and http://geonode/geoserver for geoserver
 
-Have Fun!
+Have Fun!