Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(helm): allow additional volume mounts #929

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPENDENCIES
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
maven/mavencentral/com.apicatalog/carbon-did/0.0.2, Apache-2.0, approved, #9239

Check warning on line 1 in DEPENDENCIES

View workflow job for this annotation

GitHub Actions / verify / verify-dependencies / Dash-Verify-Licenses

Restricted Dependencies found

Some dependencies are marked 'restricted' - please review them
maven/mavencentral/com.apicatalog/iron-verifiable-credentials/0.8.1, Apache-2.0, approved, #9234
maven/mavencentral/com.apicatalog/titanium-json-ld/1.0.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.apicatalog/titanium-json-ld/1.3.1, Apache-2.0, approved, #8912
Expand All @@ -10,7 +10,7 @@
maven/mavencentral/com.azure/azure-core/1.44.1, MIT, approved, clearlydefined
maven/mavencentral/com.azure/azure-core/1.45.1, MIT AND Apache-2.0, approved, #11845
maven/mavencentral/com.azure/azure-identity/1.10.1, MIT AND Apache-2.0, approved, #10086
maven/mavencentral/com.azure/azure-identity/1.11.1, , restricted, clearlydefined
maven/mavencentral/com.azure/azure-identity/1.11.1, MIT, approved, clearlydefined
maven/mavencentral/com.azure/azure-json/1.1.0, MIT AND Apache-2.0, approved, #10547
maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.7.0, MIT, approved, #10868
maven/mavencentral/com.azure/azure-security-keyvault-secrets/4.7.3, MIT, approved, #10868
Expand Down
11 changes: 5 additions & 6 deletions charts/tractusx-connector-azure-vault/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
| controlplane.ssi.oauth.tokenurl | string | `""` | The URL (of KeyCloak), where access tokens can be obtained |
| controlplane.tolerations | list | `[]` | |
| controlplane.url.protocol | string | `""` | Explicitly declared url for reaching the dsp api (e.g. if ingresses not used) |
| controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
| controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
| controlplane.volumeMounts | string | `nil` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
| controlplane.volumes | string | `nil` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
| customCaCerts | object | `{}` | Add custom ca certificates to the truststore |
| customLabels | object | `{}` | To add some custom labels |
| dataplane.affinity | object | `{}` | |
Expand Down Expand Up @@ -250,8 +250,8 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
| dataplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
| dataplane.tolerations | list | `[]` | |
| dataplane.url.public | string | `""` | Explicitly declared url for reaching the public api (e.g. if ingresses not used) |
| dataplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
| dataplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
| dataplane.volumeMounts | string | `nil` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
| dataplane.volumes | string | `nil` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
| fullnameOverride | string | `""` | |
| imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
| install.postgresql | bool | `true` | |
Expand All @@ -260,9 +260,8 @@ helm install my-release tractusx-edc/tractusx-connector-azure-vault --version 0.
| postgresql.auth.database | string | `"edc"` | |
| postgresql.auth.password | string | `"password"` | |
| postgresql.auth.username | string | `"user"` | |
| postgresql.enabled | bool | `false` | |
| postgresql.jdbcUrl | string | `"jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc"` | |
| postgresql.primary.persistence | string | `nil` | |
| postgresql.primary.persistence.enabled | bool | `false` | |
| postgresql.readReplicas.persistence.enabled | bool | `false` | |
| serviceAccount.annotations | object | `{}` | |
| serviceAccount.create | bool | `true` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,9 @@ spec:
{{- end }}
{{- end }}
volumeMounts:
{{- if .Values.controlplane.volumeMounts }}
{{- toYaml .Values.controlplane.volumeMounts | nindent 12 }}
{{- end}}
- name: "configuration"
mountPath: "/app/opentelemetry.properties"
subPath: "opentelemetry.properties"
Expand All @@ -391,6 +394,9 @@ spec:
- name: "tmp"
mountPath: "/tmp"
volumes:
{{- if .Values.controlplane.volumeMounts }}
{{- toYaml .Values.controlplane.volumes | nindent 8 }}
{{- end}}
- name: "configuration"
configMap:
name: {{ include "txdc.fullname" . }}-controlplane
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,9 @@ spec:
{{- end }}
{{- end }}
volumeMounts:
{{- if .Values.dataplane.volumeMounts }}
{{- toYaml .Values.dataplane.volumeMounts | nindent 12 }}
{{- end}}
- name: "configuration"
mountPath: "/app/opentelemetry.properties"
subPath: "opentelemetry.properties"
Expand All @@ -256,6 +259,9 @@ spec:
- name: "tmp"
mountPath: "/tmp"
volumes:
{{- if .Values.dataplane.volumes }}
{{- toYaml .Values.dataplane.volumes | nindent 8 }}
{{- end}}
- name: "configuration"
configMap:
name: {{ include "txdc.fullname" . }}-dataplane
Expand Down
10 changes: 5 additions & 5 deletions charts/tractusx-connector-azure-vault/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,9 @@ controlplane:
# -- If preset enables certificate generation via cert-manager cluster-wide issuer
clusterIssuer: ""
# -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
volumeMounts: []
volumeMounts:
# -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
volumes: []
volumes:
# -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
Expand Down Expand Up @@ -445,9 +445,9 @@ dataplane:
# -- If preset enables certificate generation via cert-manager cluster-wide issuer
clusterIssuer: ""
# -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
volumeMounts: []
volumeMounts:
# -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
volumes: []
volumes:
# -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
Expand Down Expand Up @@ -499,7 +499,7 @@ postgresql:
jdbcUrl: "jdbc:postgresql://{{ .Release.Name }}-postgresql:5432/edc"
primary:
persistence:
enabled: false
enabled: false
readReplicas:
persistence:
enabled: false
Expand Down
8 changes: 4 additions & 4 deletions charts/tractusx-connector/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,8 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.6.0-rc2 \
| controlplane.ssi.oauth.tokenurl | string | `""` | The URL (of KeyCloak), where access tokens can be obtained |
| controlplane.tolerations | list | `[]` | |
| controlplane.url.protocol | string | `""` | Explicitly declared url for reaching the dsp api (e.g. if ingresses not used) |
| controlplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
| controlplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
| controlplane.volumeMounts | string | `nil` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
| controlplane.volumes | string | `nil` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
| customCaCerts | object | `{}` | Add custom ca certificates to the truststore |
| customLabels | object | `{}` | To add some custom labels |
| dataplane.affinity | object | `{}` | |
Expand Down Expand Up @@ -244,8 +244,8 @@ helm install my-release tractusx-edc/tractusx-connector --version 0.6.0-rc2 \
| dataplane.service.type | string | `"ClusterIP"` | [Service type](https://kubernetes.io/docs/concepts/services-networking/service/#publishing-services-service-types) to expose the running application on a set of Pods as a network service. |
| dataplane.tolerations | list | `[]` | |
| dataplane.url.public | string | `""` | Explicitly declared url for reaching the public api (e.g. if ingresses not used) |
| dataplane.volumeMounts | list | `[]` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
| dataplane.volumes | list | `[]` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
| dataplane.volumeMounts | string | `nil` | declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container |
| dataplane.volumes | string | `nil` | [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories |
| fullnameOverride | string | `""` | |
| imagePullSecrets | list | `[]` | Existing image pull secret to use to [obtain the container image from private registries](https://kubernetes.io/docs/concepts/containers/images/#using-a-private-registry) |
| install.postgresql | bool | `true` | |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,9 @@ spec:
{{- end }}
{{- end }}
volumeMounts:
{{- if .Values.controlplane.volumeMounts }}
{{- toYaml .Values.controlplane.volumeMounts | nindent 12 }}
{{- end}}
- name: "configuration"
mountPath: "/app/opentelemetry.properties"
subPath: "opentelemetry.properties"
Expand All @@ -390,6 +393,9 @@ spec:
- name: "tmp"
mountPath: "/tmp"
volumes:
{{- if .Values.controlplane.volumeMounts }}
{{- toYaml .Values.controlplane.volumes | nindent 8 }}
{{- end}}
- name: "configuration"
configMap:
name: {{ include "txdc.fullname" . }}-controlplane
Expand Down
6 changes: 6 additions & 0 deletions charts/tractusx-connector/templates/deployment-dataplane.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,9 @@ spec:
{{- end }}
{{- end }}
volumeMounts:
{{- if .Values.dataplane.volumeMounts }}
{{- toYaml .Values.dataplane.volumeMounts | nindent 12 }}
{{- end}}
- name: "configuration"
mountPath: "/app/opentelemetry.properties"
subPath: "opentelemetry.properties"
Expand All @@ -255,6 +258,9 @@ spec:
- name: "tmp"
mountPath: "/tmp"
volumes:
{{- if .Values.dataplane.volumeMounts }}
{{- toYaml .Values.dataplane.volumes | nindent 8 }}
{{- end}}
- name: "configuration"
configMap:
name: {{ include "txdc.fullname" . }}-dataplane
Expand Down
8 changes: 4 additions & 4 deletions charts/tractusx-connector/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,9 @@ controlplane:
# -- If preset enables certificate generation via cert-manager cluster-wide issuer
clusterIssuer: ""
# -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
volumeMounts: []
volumeMounts:
# -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
volumes: []
volumes:
# -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
Expand Down Expand Up @@ -443,9 +443,9 @@ dataplane:
# -- If preset enables certificate generation via cert-manager cluster-wide issuer
clusterIssuer: ""
# -- declare where to mount [volumes](https://kubernetes.io/docs/concepts/storage/volumes/) into the container
volumeMounts: []
volumeMounts:
# -- [volume](https://kubernetes.io/docs/concepts/storage/volumes/) directories
volumes: []
volumes:
# -- [resource management](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/) for the container
resources: {}
# We usually recommend not to specify default resources and to leave this as a conscious
Expand Down