Merge pull request #105 from SoftwareAG/dev-thr

APIGW / ES: PVC storage annotations added
SoftwareAG · Jul 19, 2024 · acd49fd · acd49fd
2 parents f0722ef + 0b53a46
commit acd49fd
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 4 deletions.
diff --git a/apigateway/helm/README.md b/apigateway/helm/README.md
@@ -167,7 +167,7 @@ Sub-folder `examples` contains some *values* examples for more use-cases. To use
 | `1.2.4` | Added Kibana extra container configuration, set by Values.kibana.extraContainers. <br> Added ServiceMonitor matchLabel for a specific service. The service is set by .Values.serviceMonitor.serviceName defaulting to API Gateways runtime service. |
 | `1.2.5` | Added possibility to read metering truststore password by secretKeyRef. <br> Added custom logging configuration for Kibana. |
 | `1.2.6` | Fixed commons dependency to enable metering change from 1.2.5. |
-| `1.2.7` | Added possibility to rename roleBinding for API Gateway, Kibana and Elasitcsearch. This allows for multiple deployments into the same namespace. |
+| `1.2.7` | Added possibility to rename roleBinding for API Gateway, Kibana and Elasitcsearch. This allows for multiple deployments into the same namespace. Also, CRD ServiceMonitor selector corrected. Support of ES storage PVC annotations. |
 ## Values
 
 | Key | Type | Default | Description |
@@ -230,8 +230,9 @@ Sub-folder `examples` contains some *values* examples for more use-cases. To use
 | elasticsearch.serviceAccount.name | string | `""` | Name of the ServiceAccount for Elasticsearch |
 | elasticsearch.serviceAccount.roleBindingName | string | `"elasticsearch-rolebinding"` | Name of the ServiceAccount Rolebinding used by the Elasticsearch ServiceAccount. Requires create=true to work. |
 | elasticsearch.serviceAccount.roleName | string | `""` | Name of the ServiceAccount Role used by the Elasticsearch ServiceAccount. Requires create=true to work. |
-| elasticsearch.storage | string | `""` |  |
-| elasticsearch.storageClassName | string | `""` |  |
+| elasticsearch.storage | string | `""` | Request size of storage. The default is 1Gi. |
+| elasticsearch.storageAnnotations | object | `{}` | Annotations of PVC storage |
+| elasticsearch.storageClassName | string | `""` | Use the storage class. |
 | elasticsearch.tlsEnabled | bool | `false` | Whether the communication from APIGW and Kibana should be HTTPS Note: you will need to create certificate and a separate truststore for the communication. |
 | elasticsearch.tlsSecretName | string | `""` | The name of the elasticsearch secret. By default it will created by the fullname + "-es-tls-secret" if tlsEnabled is set to true. |
 | elasticsearch.version | string | `"8.2.3"` | The ECK version to be used |

diff --git a/apigateway/helm/README.md.gotmpl b/apigateway/helm/README.md.gotmpl
@@ -168,5 +168,5 @@ Sub-folder `examples` contains some *values* examples for more use-cases. To use
 | `1.2.4` | Added Kibana extra container configuration, set by Values.kibana.extraContainers. <br> Added ServiceMonitor matchLabel for a specific service. The service is set by .Values.serviceMonitor.serviceName defaulting to API Gateways runtime service. |
 | `1.2.5` | Added possibility to read metering truststore password by secretKeyRef. <br> Added custom logging configuration for Kibana. |
 | `1.2.6` | Fixed commons dependency to enable metering change from 1.2.5. |
-| `1.2.7` | Added possibility to rename roleBinding for API Gateway, Kibana and Elasitcsearch. This allows for multiple deployments into the same namespace. |
+| `1.2.7` | Added possibility to rename roleBinding for API Gateway, Kibana and Elasitcsearch. This allows for multiple deployments into the same namespace. Also, CRD ServiceMonitor selector corrected. Support of ES storage PVC annotations. |
 {{ template "chart.valuesSection" . }}
diff --git a/apigateway/helm/templates/elasticsearch.yaml b/apigateway/helm/templates/elasticsearch.yaml
@@ -72,6 +72,10 @@ spec:
       volumeClaimTemplates:
       - metadata:
           name: elasticsearch-data # Do not change this name unless you set up a volume mount for the data path.
+          {{- with .Values.elasticsearch.storageAnnotations }}
+          annotations:
+          {{- toYaml . | nindent 12 }}
+          {{- end }}
         spec:
           accessModes:
           - ReadWriteOnce

diff --git a/apigateway/helm/values.yaml b/apigateway/helm/values.yaml
@@ -532,9 +532,15 @@ elasticsearch:
   #   memory: 128Mi  
   resources: {}
 
+  # -- Request size of storage. The default is 1Gi.
   storage: ""
+
+  # -- Use the storage class.
   storageClassName: ""
 
+  # -- Annotations of PVC storage
+  storageAnnotations: {}
+
   # -- The secret name that holds the sag es user for API Gateway.
   secretName: ""