-
Notifications
You must be signed in to change notification settings - Fork 8
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #840 from intershop/release/develop/icm
Release icm-as:minor icm-web:patch
- Loading branch information
Showing
22 changed files
with
471 additions
and
95 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| apiVersion: v2 | ||
| # name and version must be in this exact order, otherwise bump2version won't work | ||
| name: icm-as | ||
| version: 2.2.0 | ||
| version: 2.3.0 | ||
| description: Intershop Commerce Management - AppServer | ||
| type: application | ||
| appVersion: 11.10.3-LTS |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,18 @@ | ||
|
|
||
| <a name="icm-as-2.2.0"></a> | ||
| ## [icm-as-2.2.0](https://github.com/intershop/helm-charts/compare/icm-as-2.1.1...icm-as-2.2.0) | ||
| <a name="icm-as-2.3.0"></a> | ||
| ## [icm-as-2.3.0](https://github.com/intershop/helm-charts/compare/icm-as-2.2.0...icm-as-2.3.0) | ||
|
|
||
| > 2024-09-03 | ||
| > 2024-11-22 | ||
| ### Chore | ||
|
|
||
| * bump versions of icm:minor icm-as:minor icm-replication:minor | ||
| * bump versions of icm-as:minor icm-web:patch | ||
|
|
||
| ### Feat | ||
|
|
||
| * **icm:** New replication environment configuration ([#803](https://github.com/intershop/helm-charts/issues/803)) | ||
| * enhance icm infrastructure probing by file system probes ([#829](https://github.com/intershop/helm-charts/issues/829)) | ||
|
|
||
| ### Fix | ||
|
|
||
| * fix inframon jvm-options ([#838](https://github.com/intershop/helm-charts/issues/838)) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| {{/* vim: set filetype=mustache: */}} | ||
| {{/* | ||
| Creates init-containers | ||
| */}} | ||
| {{- define "icm-as.infrastructureMonitoringContainer" -}} | ||
| {{- if .Values.infrastructureMonitoring.enabled }} | ||
| - name: infrastructure-monitoring | ||
| image: {{ .Values.infrastructureMonitoring.image.repository }} | ||
| imagePullPolicy: {{ .Values.infrastructureMonitoring.imagePullPolicy | default "IfNotPresent" }} | ||
| env: | ||
| {{- if .Values.mssql.enabled }} | ||
| - name: QUARKUS_DATASOURCE_JDBC_URL | ||
| value: {{ printf "jdbc:sqlserver://%s-mssql-service:1433;database=%s;TrustServerCertificate=True;" (include "icm-as.fullname" .) .Values.mssql.databaseName }} | ||
| - name: QUARKUS_DATASOURCE_USERNAME | ||
| value: "{{ .Values.mssql.user }}" | ||
| {{ include "icm-as.envDatabasePassword" (list "QUARKUS_DATASOURCE_PASSWORD" .Values.mssql.passwordSecretKeyRef .Values.mssql.password) | indent 2 }} | ||
| {{- else }} | ||
| - name: QUARKUS_DATASOURCE_JDBC_URL | ||
| {{ if regexMatch ".+;$" .Values.database.jdbcURL -}} | ||
| value: "{{ .Values.database.jdbcURL }}TrustServerCertificate=True;" | ||
| {{- else -}} | ||
| value: "{{ .Values.database.jdbcURL }};TrustServerCertificate=True;" | ||
| {{- end }} | ||
| - name: QUARKUS_DATASOURCE_USERNAME | ||
| value: "{{ .Values.database.jdbcUser }}" | ||
| {{ include "icm-as.envDatabasePassword" (list "QUARKUS_DATASOURCE_PASSWORD" .Values.database.jdbcPasswordSecretKeyRef .Values.database.jdbcPassword) | indent 2 }} | ||
| {{- end }} | ||
| - name: JAVA_OPTS_APPEND | ||
| value: '{{ include "icm-as.infrastructureMonitoringContainer.commonProbeOpts" (list .Values.infrastructureMonitoring.databaseLatency (dict "name" "databaseLatency" "type" "JDBC_LATENCY")) }} {{ include "icm-as.infrastructureMonitoringContainer.fsProbeOpts" (list .Values.infrastructureMonitoring.sitesLatency (dict "name" "sitesLatency" "type" "FILE_SYSTEM_LATENCY")) }} {{ include "icm-as.infrastructureMonitoringContainer.fsTpProbeOpts" (list .Values.infrastructureMonitoring.sitesReadThroughput (dict "name" "sitesReadThroughput" "type" "FILE_SYSTEM_READ_THROUGHPUT")) }} {{ include "icm-as.infrastructureMonitoringContainer.fsTpProbeOpts" (list .Values.infrastructureMonitoring.sitesWriteThroughput (dict "name" "sitesWriteThroughput" "type" "FILE_SYSTEM_WRITE_THROUGHPUT")) }}' | ||
| ports: | ||
| - name: inframonitoring | ||
| containerPort: 8080 | ||
| protocol: TCP | ||
| resources: | ||
| limits: | ||
| cpu: 100m | ||
| memory: 200Mi | ||
| requests: | ||
| cpu: 100m | ||
| memory: 200Mi | ||
| {{ include "icm-as.volumeMounts" . | indent 2 }} | ||
| {{ include "icm-as.infrastructureMonitoringContainer.k8sProbe" (list "started" 3 60 10) }} | ||
| {{ include "icm-as.infrastructureMonitoringContainer.k8sProbe" (list "live" 3 30 10) }} | ||
| {{ include "icm-as.infrastructureMonitoringContainer.k8sProbe" (list "ready" 3 30 10) }} | ||
| {{- end }} | ||
| {{- end -}} | ||
|
|
||
| {{/* | ||
| creates a K8s probe configuration (startup, liveness, readiness) | ||
| expecting to get called like: | ||
| {{ include "icm-as.infrastructureMonitoringContainer.k8sProbe" (list "<type>" <failureThreshold> <initialDelaySeconds> <periodSeconds>) }} | ||
| with | ||
| <type>: one of [started, live, ready] | ||
| <failureThreshold>: failure threshold (count) | ||
| <initialDelaySeconds>: initial delay (seconds) | ||
| <periodSeconds>: period (seconds) | ||
| */}} | ||
| {{- define "icm-as.infrastructureMonitoringContainer.k8sProbe" -}} | ||
| {{- $type := index . 0 }} | ||
| {{- $failureThreshold := index . 1 }} | ||
| {{- $initialDelaySeconds := index . 2 }} | ||
| {{- $periodSeconds := index . 3 }} | ||
| {{- if eq $type "started" }} | ||
| startupProbe: | ||
| {{- else if eq $type "live" }} | ||
| livenessProbe: | ||
| {{- else }} | ||
| readinessProbe: | ||
| {{- end }} | ||
| httpGet: | ||
| path: /q/health/{{ $type }} | ||
| port: inframonitoring | ||
| failureThreshold: {{ $failureThreshold }} | ||
| initialDelaySeconds: {{ $initialDelaySeconds }} | ||
| periodSeconds: {{ $periodSeconds }} | ||
| {{- end -}} | ||
|
|
||
| {{/* | ||
| creates an infrastructure probe configuration (common options) | ||
| expecting to get called like: | ||
| - name: JAVA_OPTS_APPEND | ||
| value: '{{ include "icm-as.infrastructureMonitoringContainer.commonProbeOpts" (list .Values.infrastructureMonitoring.databaseLatency (dict "name" "databaseLatency" "type" "JDBC_LATENCY")) }}' | ||
| replace: '.Values.infrastructureMonitoring.databaseLatency' by the probe's values | ||
| "databaseLatency" by the probe's name | ||
| "JDBC_LATENCY" by the probe's type | ||
| */}} | ||
| {{- define "icm-as.infrastructureMonitoringContainer.commonProbeOpts" -}} | ||
| {{- $probeValues := index . 0 }} | ||
| {{- $probeOpts := index . 1 }} | ||
| {{- $probeName := $probeOpts.name }} | ||
| {{- $isEnabled := default false $probeValues.enabled }} | ||
| {{- $probeType := $probeOpts.type }} | ||
| {{- if $isEnabled -}} | ||
| {{- printf "-Dprobes.%s.enabled=%t -Dprobes.%s.type=%s -Dprobes.%s.interval=%s" $probeName $isEnabled $probeName (quote $probeType) $probeName (quote (default "60S" $probeValues.interval)) -}} | ||
| {{- end -}} | ||
| {{- end -}} | ||
| {{/* | ||
| creates an infrastructure probe configuration (file system related options) | ||
| expecting to get called like: | ||
| - name: JAVA_OPTS_APPEND | ||
| value: '{{ include "icm-as.infrastructureMonitoringContainer.fsProbeOpts" (list .Values.infrastructureMonitoring.sitesLatency (dict "name" "sitesLatency" "type" "FILE_SYSTEM_LATENCY")) }}' | ||
| replace: '.Values.infrastructureMonitoring.sitesLatency' by the probe's values | ||
| "sitesLatency" by the probe's name | ||
| "FILE_SYSTEM_LATENCY" by the probe's type | ||
| */}} | ||
| {{- define "icm-as.infrastructureMonitoringContainer.fsProbeOpts" -}} | ||
| {{- $probeValues := index . 0 }} | ||
| {{- $probeOpts := index . 1 }} | ||
| {{- $probeName := $probeOpts.name }} | ||
| {{- $isEnabled := default false $probeValues.enabled }} | ||
| {{- $path := $probeValues.path }} | ||
| {{- include "icm-as.infrastructureMonitoringContainer.commonProbeOpts" (list $probeValues $probeOpts) }}{{- if $isEnabled }} {{ printf "-Dprobes.%s.path=%s" $probeName (quote $path) -}}{{- end -}} | ||
| {{- end -}} | ||
|
|
||
| {{/* | ||
| creates an infrastructure probe configuration (file system throughput related options) | ||
| expecting to get called like: | ||
| - name: JAVA_OPTS_APPEND | ||
| value: '{{ include "icm-as.infrastructureMonitoringContainer.fsThroughputProbeOpts" (list .Values.infrastructureMonitoring.sitesReadThroughput (dict "name" "sitesReadThroughput" "type" "FILE_SYSTEM_READ_THROUGHPUT")) }}' | ||
| replace: '.Values.infrastructureMonitoring.sitesReadThroughput' by the probe's values | ||
| "sitesReadThroughput" by the probe's name | ||
| "FILE_SYSTEM_READ_THROUGHPUT" by the probe's type | ||
| */}} | ||
| {{- define "icm-as.infrastructureMonitoringContainer.fsTpProbeOpts" -}} | ||
| {{- $probeValues := index . 0 }} | ||
| {{- $probeOpts := index . 1 }} | ||
| {{- $probeName := $probeOpts.name }} | ||
| {{- $isEnabled := default false $probeValues.enabled }} | ||
| {{- $fileSize := $probeValues.fileSize }} | ||
| {{- include "icm-as.infrastructureMonitoringContainer.fsProbeOpts" (list $probeValues $probeOpts) }}{{- if $isEnabled }} {{ printf "-Dprobes.%s.fileSize=%s" $probeName (quote (default "5 Mi" $fileSize)) -}}{{- end -}} | ||
| {{- end -}} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
charts/icm-as/templates/infrastructure-monitoring-service.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| {{- if .Values.infrastructureMonitoring.enabled }} | ||
| apiVersion: v1 | ||
| kind: Service | ||
| metadata: | ||
| name: {{ include "icm-as.fullname" . }}-inframonitoring | ||
| labels: | ||
| app: {{ include "icm-as.fullname" . }} | ||
| chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" | ||
| annotations: | ||
| prometheus.io/path: /q/metrics | ||
| prometheus.io/scheme: http | ||
| prometheus.io/scrape: 'true' | ||
| prometheus.io/port: '8080' | ||
| spec: | ||
| ports: | ||
| - name: inframonitoring | ||
| port: 8080 | ||
| targetPort: inframonitoring | ||
| selector: | ||
| app: icm-as | ||
| release: {{ include "icm-as.fullname" . }} | ||
| status: | ||
| loadBalancer: {} | ||
| {{- end }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.