Skip to content

Commit

Permalink
Merge pull request #574 from uselagoon/logging-operator-update
Browse files Browse the repository at this point in the history
Logging operator update
  • Loading branch information
smlx authored Jun 19, 2023
2 parents 2c21804 + ae7c7d0 commit c0f9c54
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 9 deletions.
1 change: 1 addition & 0 deletions .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
helm repo add amazeeio https://amazeeio.github.io/charts/
helm repo add gatekeeper https://open-policy-agent.github.io/gatekeeper/charts
helm repo add nats https://nats-io.github.io/k8s/helm/charts/
helm repo add kube-logging https://kube-logging.github.io/helm-charts
- name: Generate helm templates
run: |
cd charts
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
helm repo add amazeeio https://amazeeio.github.io/charts/
helm repo add gatekeeper https://open-policy-agent.github.io/gatekeeper/charts
helm repo add nats https://nats-io.github.io/k8s/helm/charts/
helm repo add kube-logging https://kube-logging.github.io/helm-charts
- name: Run chart-releaser
uses: helm/[email protected]
Expand Down
8 changes: 4 additions & 4 deletions charts/lagoon-logging/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: logging-operator
repository: https://kubernetes-charts.banzaicloud.com
version: 3.17.10
digest: sha256:293ac5ba13713b7edcc8fb655e8fd402c6d466c57edcdc9886f1336b39815b8c
generated: "2022-11-28T22:12:54.57492083+08:00"
repository: https://kube-logging.github.io/helm-charts
version: 4.2.3
digest: sha256:bcfec23e091d887e7892f70bddbcf33a09195e4140372028b25f8e16cf54436f
generated: "2023-06-14T14:13:35.857841045+08:00"
13 changes: 8 additions & 5 deletions charts/lagoon-logging/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,21 @@ type: application
# time you make changes to the chart and its templates, including the app
# version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.77.0
version: 0.78.0

dependencies:
- name: logging-operator
repository: https://kubernetes-charts.banzaicloud.com
version: ~3.17.0
repository: https://kube-logging.github.io/helm-charts
version: ~4.2.0
condition: logging-operator.enabled

# This section is used to collect a changelog for artifacthub.io
# It should be started afresh for each release
# Valid supported kinds are added, changed, deprecated, removed, fixed and security
annotations:
artifacthub.io/changes: |
- kind: added
description: add chart option to configure logging-operator subchart metrics, and enable the fluentbit ServiceMonitor by default
- kind: changed
description: bump the logging-operator chart dependency to v4.2.3
links:
- name: Release Notes
url: https://github.com/uselagoon/lagoon-charts/releases/tag/lagoon-logging-0.78.0
1 change: 1 addition & 0 deletions charts/lagoon-logging/templates/logging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ metadata:
labels:
{{- include "lagoon-logging.labels" . | nindent 4 }}
spec:
enableRecreateWorkloadOnImmutableFieldChange: true
fluentd:
security:
podSecurityContext:
Expand Down
1 change: 1 addition & 0 deletions default.ct.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ chart-repos:
- amazeeio=https://amazeeio.github.io/charts/
- gatekeeper=https://open-policy-agent.github.io/gatekeeper/charts
- nats=https://nats-io.github.io/k8s/helm/charts/
- kube-logging=https://kube-logging.github.io/helm-charts
excluded-charts:
- lagoon-test
- lagoon-gatekeeper
Expand Down

0 comments on commit c0f9c54

Please sign in to comment.