[Fixes #64] Task: Use service names instead of pod_name

charts/geonode/README.md

@@ -31,7 +31,7 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
 | favicon | string | AAABAAMAEBAAAAEAIABoBA ... AAAA== | A base64 encoded favicon |
-| geonode.accesscontrol.lockdown | bool | `false` | Enable/Disable lockdown mode of GeoNode |
+| geonode.accesscontrol.lockdown | string | `"False"` | Enable/Disable lockdown mode of GeoNode |
 | geonode.acme.email | string | `"[email protected]"` | the email to be used to gain certificates |
 | geonode.acme.enabled | bool | `false` | enables cert-manager to do ACME challenges (aka certificates via letsencrypt) |
 | geonode.acme.stageUrl | string | `"https://acme-staging-v02.api.letsencrypt.org/directory"` | ACME staging environment (use acme-staging to avoid running into rate limits) stageUrl: https://acme-v02.api.letsencrypt.org/directory |
@@ -68,7 +68,7 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | geonode.haystack.search_results_per_page | string | `"200"` | hystack results per page |
 | geonode.image.name | string | `"52north/geonode"` | used geonode image |
 | geonode.image.tag | string | `"4.1.3"` | tag of used geonode image |
-| geonode.imagePullSecret | string | `""` | secret to use to pull geonode image |
+| geonode.imagePullSecret | string | `""` | pull secret to use for geonode image |
 | geonode.ingress.annotations | object | `{}` | adds ingress annotations for nginx ingress class |
 | geonode.ingress.enabled | bool | `true` | enables external access |
 | geonode.ingress.ingressClassName | string | `nil` | define kubernetes ingress class for geonode ingress |
@@ -100,7 +100,6 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | geonode.monitoring.user_analytics_enabled | bool | `true` |  |
 | geonode.monitoring.user_analytics_gzip | bool | `true` |  |
 | geonode.persistant.storageSize | string | `"10Gi"` | size of persistant geonode storage |
-| geonode.pod_name | string | `"geonode"` | pod name |
 | geonode.replicaCount | int | `1` | number of geonode replicas (! not working properly yet) |
 | geonode.resources.limits.cpu | int | `2` | limit cpu as in resource.requests.cpu (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
 | geonode.resources.limits.memory | string | `"2Gi"` | limits memory as in resource.limits.memory (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
@@ -142,8 +141,7 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | geoserver.container_name | string | `"geoserver"` | geoserver container name |
 | geoserver.image.name | string | `"geonode/geoserver"` | geoserver image docker image (default in zalf namespace because geonode one was not up to date) |
 | geoserver.image.tag | string | `"2.23.0"` | geoserver docker image tag |
-| geoserver.imagePullSecret | string | `""` | secret to use to pull geoserver image |
-| geoserver.pod_name | string | `"geoserver"` | geoserver pod name |
+| geoserver.imagePullSecret | string | `""` | pull secret to use for geoserver image |
 | geoserver.port | int | `8080` | geoserver port |
 | geoserver.resources.limits.cpu | int | `2` | limit cpu as in resource.requests.cpu (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
 | geoserver.resources.limits.memory | string | `"4Gi"` | limits memory as in resource.limits.memory (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
@@ -161,9 +159,8 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | nginx.external_cors.enabled | bool | `false` | Add Access-Control-Allow-Origin directive to allow integration from an external domain |
 | nginx.image.name | string | `"nginx"` | nginx docker image |
 | nginx.image.tag | string | `"1.25"` | nginx docker image tag |
-| nginx.imagePullSecret | string | `""` | secret to use to pull nginx image |
+| nginx.imagePullSecret | string | `""` | pull secret to use for nginx image |
 | nginx.maxClientBodySize | string | `"2G"` | max file upload size |
-| nginx.pod_name | string | `"nginx"` | nginx pod name |
 | nginx.replicaCount | int | `1` | nginx container replicas |
 | nginx.resources.limits.cpu | string | `"800m"` | limit cpu as in resource.requests.cpu (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
 | nginx.resources.limits.memory | string | `"1Gi"` | limits memory as in resource.limits.memory (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
@@ -193,7 +190,6 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | postgres.geodata_databasename_and_username | string | `"geodata"` | geoserver database name and username |
 | postgres.geonode_databasename_and_username | string | `"geonode"` | geonode database name and username |
 | postgres.operator_manifest.numberOfInstances | int | `1` | number of database instances |
-| postgres.operator_manifest.pod_name | string | `"postgresql"` | pod name for postgres containers == teamID for mainifest |
 | postgres.operator_manifest.postgres_version | int | `15` | postgres version |
 | postgres.operator_manifest.storageSize | string | `"3Gi"` | Database storage size |
 | postgres.schema | string | `"public"` | database schema |
@@ -204,9 +200,8 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | pycsw.endpoint | string | `"/catalogue/csw"` | pycsw url below geonode.ingress.externalDomain |
 | pycsw.image.name | string | `"geopython/pycsw"` | pycsw docker image |
 | pycsw.image.tag | string | `"2.6.1"` | pycsw docker image tag |
-| pycsw.imagePullSecret | string | `""` | secret to use to pull pycsw image |
+| pycsw.imagePullSecret | string | `""` | pull secret to use for pycsw image |
 | pycsw.mappings | string | copied from 4.1.x: https://github.com/GeoNode/geonode/blob/master/geonode/catalogue/backends/pycsw_local_mappings.py | pycsw config file parameters, see docs: https://docs.pycsw.org/_/downloads/en/latest/pdf/ |
-| pycsw.pod_name | string | `"pysw"` | pycsw pod name |
 | pycsw.port | int | `8000` | pycsw endpoint port |
 | pycsw.replicaCount | int | `1` | pycsw container replicas |
 | pycsw.resources.limits.cpu | string | `"500m"` | limit cpu as in resource.requests.cpu (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
@@ -227,4 +222,4 @@ Helm Chart for Geonode. Supported versions: Geonode: 4.1.3, Geoserver: 2.23.0, p
 | rabbitmq.requests.memory | string | `"1Gi"` | requested memory as in resource.requests.memory (https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) |
 
 ----------------------------------------------
-Autogenerated from chart metadata using [helm-docs v1.11.3](https://github.com/norwoodj/helm-docs/releases/v1.11.3)
+Autogenerated from chart metadata using [helm-docs v1.11.0](https://github.com/norwoodj/helm-docs/releases/v1.11.0)

charts/geonode/templates/_helpers.tpl

@@ -1,19 +1,23 @@
 
 # define pod names (equal service names)
 {{- define "geoserver_pod_name" -}}
-{{ .Release.Name }}-{{ .Values.geoserver.pod_name }}
+{{ .Release.Name }}-geoserver
 {{- end -}}
 
 {{- define "geonode_pod_name" -}}
-{{ .Release.Name }}-{{ .Values.geonode.pod_name }}
+{{ .Release.Name }}-geonode
 {{- end -}}
 
 {{- define "postgres_pod_name" -}}
-{{ .Release.Name }}-{{ .Values.postgres.operator_manifest.pod_name }}
+{{ .Release.Name }}-postgres
 {{- end -}}
 
 {{- define "nginx_pod_name" -}}
-{{ .Release.Name }}-{{ .Values.nginx.pod_name }}
+{{ .Release.Name }}-nginx
+{{- end -}}
+
+{{- define "pycsw_pod_name" -}}
+{{ .Release.Name }}-pycsw
 {{- end -}}
 
 # define secret names
@@ -104,11 +108,6 @@ postgres-password
 {{- end -}}
 {{- end -}}
 
-
-{{- define "pycsw_pod_name" -}}
-{{ .Release.Name }}-{{ .Values.pycsw.pod_name }}
-{{- end -}}
-
 # Volume names
 {{- define "persistant_volume_name" -}}
 persistence

charts/geonode/values.yaml

@@ -6,8 +6,6 @@ global:
 
 # geonode configuration
 geonode:
-  # -- pod name
-  pod_name: geonode
   # -- container name
   container_name: geonode
   # -- number of geonode replicas (! not working properly yet)
@@ -321,8 +319,6 @@ geonode:
 
 # CONFIGURATION FOR GEOSERVER DEPLOYMENT#
 geoserver:
-  # -- geoserver pod name
-  pod_name: geoserver
   # -- geoserver container name
   container_name: geoserver
   image:
@@ -358,8 +354,6 @@ geoserver:
 
 # CONFIGURATION FOR NGINX DEPLOYMENT
 nginx:
-  # -- nginx pod name
-  pod_name: nginx
   # -- nginx container name
   container_name: nginx
   # -- nginx container replicas
@@ -396,8 +390,6 @@ nginx:
 pycsw:
   # -- enable single pycsw pod
   enabled: True
-  # -- pycsw pod name
-  pod_name: pysw
   # -- pycsw container replicas
   replicaCount: 1
   # -- pycsw container name
@@ -602,8 +594,6 @@ postgres:
 
   # configuration for postgres operator database manifest
   operator_manifest:
-    # -- pod name for postgres containers == teamID for mainifest
-    pod_name: postgresql
     # -- Database storage size
     storageSize: 3Gi
     # -- number of database instances