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.

Sign up for GitHub

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

OPSEXP-2292 Review and align chart activemq with newer principals #144

Merged
merged 3 commits into from
Nov 7, 2023
Merged

OPSEXP-2292 Review and align chart activemq with newer principals #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81e1335
OPSEXP-2292 alfresco-common dep in activemq
slohe1 Oct 30, 2023
74aa069
OPSEXP-2292 update image
slohe1 Nov 6, 2023
54e2efa
OPSEXP-2292 dep version update
slohe1 Nov 6, 2023
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
6 changes: 3 additions & 3 deletions charts/activemq/Chart.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: alfresco-common
repository: https://alfresco.github.io/alfresco-helm-charts/
version: 2.0.0
digest: sha256:04d458edc1a42ae7a4e4bc73d5872cc5cab9ef5960e5b6226af605a661bff71f
generated: "2023-07-26T13:09:04.032549214Z"
version: 3.0.0
digest: sha256:d06b86767c5716a7ac02252c31125a77277bb91d6bdbb9fa1fef295c84642c32
generated: "2023-11-06T19:46:54.63579+05:30"
4 changes: 2 additions & 2 deletions charts/activemq/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ keywords:
name: activemq
sources:
- https://github.com/Alfresco/alfresco-helm-charts
version: 3.3.0
version: 3.4.0
appVersion: 5.17.5
dependencies:
- name: alfresco-common
version: 2.0.0
version: 3.0.0
repository: https://alfresco.github.io/alfresco-helm-charts/
icon: https://avatars0.githubusercontent.com/u/391127?s=200&v=4
6 changes: 3 additions & 3 deletions charts/activemq/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# activemq

![Version: 3.3.0](https://img.shields.io/badge/Version-3.3.0-informational?style=flat-square) ![AppVersion: 5.17.5](https://img.shields.io/badge/AppVersion-5.17.5-informational?style=flat-square)
![Version: 3.4.0](https://img.shields.io/badge/Version-3.4.0-informational?style=flat-square) ![AppVersion: 5.17.5](https://img.shields.io/badge/AppVersion-5.17.5-informational?style=flat-square)

A Helm chart providing a basic Apache ActiveMQ deployment required to evaluate ACS (not meant to be used in production).

Expand All @@ -12,7 +12,7 @@ A Helm chart providing a basic Apache ActiveMQ deployment required to evaluate A

| Repository | Name | Version |
|------------|------|---------|
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 2.0.0 |
| https://alfresco.github.io/alfresco-helm-charts/ | alfresco-common | 3.0.0 |

## Values

Expand All @@ -25,7 +25,7 @@ A Helm chart providing a basic Apache ActiveMQ deployment required to evaluate A
| global.alfrescoRegistryPullSecrets | string | `"quay-registry-secret"` | Authenticate to image registry before pulling by providing an existing secret of type kubernetes.io/dockerconfigjson |
| image.pullPolicy | string | `"IfNotPresent"` | |
| image.repository | string | `"alfresco/alfresco-activemq"` | |
| image.tag | string | `"5.17.5-jre17-rockylinux8"` | |
| image.tag | string | `"5.18.3-jre17-rockylinux8"` | |
| livenessProbe.failureThreshold | int | `6` | |
| livenessProbe.initialDelaySeconds | int | `60` | |
| livenessProbe.periodSeconds | int | `10` | |
Expand Down
8 changes: 4 additions & 4 deletions charts/activemq/templates/deployment-activemq.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ spec:
labels:
{{- include "activemq.selectorLabels" . | nindent 8 }}
spec:
{{- include "component-pod-security-context" .Values | indent 4 }}
{{- include "alfresco-content-services.imagePullSecrets" . | indent 6 }}
{{- include "alfresco-common.component-pod-security-context" .Values | indent 4 }}
{{- include "alfresco-common.imagePullSecrets" . | indent 6 }}
containers:
- name: {{ .Values.service.name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- include "component-security-context" .Values | indent 6 }}
{{- include "alfresco-common.component-security-context" .Values | indent 6 }}
env:
- name: ACTIVEMQ_CONFIG_MINMEMORY
value: "{{ .Values.resources.requests.memory | replace "Mi" "" }}"
Expand Down Expand Up @@ -75,7 +75,7 @@ spec:
mountPath: {{ .Values.persistence.data.mountPath }}
subPath: {{ .Values.persistence.data.subPath }}
volumes:
{{- include "data_volume" .Values | nindent 8 }}
{{- include "alfresco-common.data_volume" .Values | nindent 8 }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 8 }}
Expand Down
2 changes: 1 addition & 1 deletion charts/activemq/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ replicaCount: 1
nodeSelector: {}
image:
repository: alfresco/alfresco-activemq
tag: 5.17.5-jre17-rockylinux8
tag: 5.18.3-jre17-rockylinux8
pullPolicy: IfNotPresent
adminUser:
# -- An existing kubernetes secret that contains BROKER_USERNAME and BROKER_PASSWORD keys to override the default user credentials
Expand Down