Allow opensearch deployement, resolving app to storage cluster connection issues still

Author: whatnick

helm-chart/stac-fastapi/README.md

@@ -169,7 +169,6 @@ opensearch:
   persistence:
     enabled: true
     size: 100Gi
-    storageClass: "fast-ssd"
 ```
 
 #### External Database

helm-chart/stac-fastapi/templates/_helpers.tpl

@@ -69,13 +69,29 @@ Create the database host based on backend selection
 {{- .Values.externalDatabase.host }}
 {{- else if eq .Values.backend "elasticsearch" }}
 {{- if .Values.elasticsearch.enabled }}
+{{- if .Values.elasticsearch.masterService }}
+{{- .Values.elasticsearch.masterService }}
+{{- else if .Values.elasticsearch.fullnameOverride }}
+{{- printf "%s-master" .Values.elasticsearch.fullnameOverride }}
+{{- else if .Values.elasticsearch.clusterName }}
+{{- printf "%s-master" .Values.elasticsearch.clusterName }}
+{{- else }}
 {{- printf "%s-%s" .Release.Name "elasticsearch-master" }}
+{{- end }}
 {{- else }}
 {{- fail "Elasticsearch is not enabled but backend is set to elasticsearch" }}
 {{- end }}
 {{- else if eq .Values.backend "opensearch" }}
 {{- if .Values.opensearch.enabled }}
+{{- if .Values.opensearch.masterService }}
+{{- .Values.opensearch.masterService }}
+{{- else if .Values.opensearch.fullnameOverride }}
+{{- printf "%s-master" .Values.opensearch.fullnameOverride }}
+{{- else if .Values.opensearch.clusterName }}
+{{- printf "%s-master" .Values.opensearch.clusterName }}
+{{- else }}
 {{- printf "%s-%s" .Release.Name "opensearch-cluster-master" }}
+{{- end }}
 {{- else }}
 {{- fail "OpenSearch is not enabled but backend is set to opensearch" }}
 {{- end }}
@@ -168,4 +184,28 @@ Determine if OpenSearch should be enabled based on backend selection
 {{- else }}
 {{- false }}
 {{- end }}
+{{- end }}
+
+{{/*
+Determine PodDisruptionBudget apiVersion based on cluster capabilities
+*/}}
+{{- define "stac-fastapi.pdb.apiVersion" -}}
+{{- if semverCompare ">=1.21-0" .Capabilities.KubeVersion.GitVersion }}
+policy/v1
+{{- else }}
+policy/v1beta1
+{{- end }}
+{{- end }}
+
+{{/*
+Determine HorizontalPodAutoscaler apiVersion based on cluster capabilities
+*/}}
+{{- define "stac-fastapi.hpa.apiVersion" -}}
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2" }}
+autoscaling/v2
+{{- else if .Capabilities.APIVersions.Has "autoscaling/v2beta2" }}
+autoscaling/v2beta2
+{{- else }}
+autoscaling/v2beta1
+{{- end }}
 {{- end }}

helm-chart/stac-fastapi/templates/hpa.yaml

@@ -1,5 +1,6 @@
 {{- if .Values.app.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
+{{- $hpaApiVersion := (include "stac-fastapi.hpa.apiVersion" . | trim) }}
+apiVersion: {{ $hpaApiVersion }}
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "stac-fastapi.fullname" . }}
@@ -17,12 +18,24 @@ spec:
     - type: Resource
       resource:
         name: cpu
+        {{- if or (eq $hpaApiVersion "autoscaling/v2") (eq $hpaApiVersion "autoscaling/v2beta2") }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.app.autoscaling.targetCPUUtilizationPercentage }}
+        {{- else }}
         targetAverageUtilization: {{ .Values.app.autoscaling.targetCPUUtilizationPercentage }}
+        {{- end }}
     {{- end }}
     {{- if .Values.app.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
+        {{- if or (eq $hpaApiVersion "autoscaling/v2") (eq $hpaApiVersion "autoscaling/v2beta2") }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.app.autoscaling.targetMemoryUtilizationPercentage }}
+        {{- else }}
         targetAverageUtilization: {{ .Values.app.autoscaling.targetMemoryUtilizationPercentage }}
+        {{- end }}
     {{- end }}
 {{- end }}

helm-chart/stac-fastapi/templates/poddisruptionbudget.yaml

@@ -1,5 +1,6 @@
 {{- if .Values.podDisruptionBudget.enabled }}
-apiVersion: policy/v1beta1
+{{- $pdbApiVersion := (include "stac-fastapi.pdb.apiVersion" . | trim) }}
+apiVersion: {{ $pdbApiVersion }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ include "stac-fastapi.fullname" . }}

helm-chart/stac-fastapi/values-elasticsearch.yaml

@@ -104,7 +104,7 @@ elasticsearch:
   # Persistent storage
   volumeClaimTemplate:
     accessModes: ["ReadWriteOnce"]
-    storageClassName: "fast-ssd"  # Use high-performance storage class
+    # storageClassName: "fast-ssd"  # Use high-performance storage class
     resources:
       requests:
         storage: 100Gi

helm-chart/stac-fastapi/values-opensearch.yaml

@@ -75,6 +75,7 @@ opensearch:
 
   # Cluster configuration
   clusterName: "stac-opensearch-prod"
+  masterService: "opensearch-cluster-master"
   replicas: 3
 
   # OpenSearch roles for each node
@@ -116,7 +117,7 @@ opensearch:
   # Persistent storage
   persistence:
     enabled: true
-    storageClass: "fast-ssd"  # Use high-performance storage class
+    # storageClass: "fast-ssd"  # Use high-performance storage class
     accessModes:
       - ReadWriteOnce
     size: 100Gi

helm-chart/stac-fastapi/values.yaml

@@ -81,13 +81,13 @@ app:
     #      - stac-fastapi.local
 
   # Resource limits and requests
-  resources: {}
-    # limits:
-    #   cpu: 100m
-    #   memory: 128Mi
-    # requests:
-    #   cpu: 100m
-    #   memory: 128Mi
+  resources:
+    requests:
+      cpu: 250m
+      memory: 512Mi
+    limits:
+      cpu: 1000m
+      memory: 1Gi
 
   # Horizontal Pod Autoscaler
   autoscaling:
@@ -245,6 +245,9 @@ opensearch:
   # OpenSearch cluster name
   clusterName: "stac-opensearch"
 
+  # Service name used to expose the master nodes
+  masterService: "opensearch-cluster-master"
+  
   # Node group configuration
   nodeGroup: "master"