From 7d51934b64fb58d16d6b3c034f592f9de741d628 Mon Sep 17 00:00:00 2001 From: alexberryman Date: Thu, 30 May 2024 17:50:13 -0400 Subject: [PATCH] remove worker volumes --- charts/neighborhoods-apps/CHANGELOG.md | 2 ++ charts/neighborhoods-apps/Chart.yaml | 2 +- charts/neighborhoods-apps/templates/worker-deployment.yaml | 7 ------- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/charts/neighborhoods-apps/CHANGELOG.md b/charts/neighborhoods-apps/CHANGELOG.md index 9b12e98..ba06b11 100644 --- a/charts/neighborhoods-apps/CHANGELOG.md +++ b/charts/neighborhoods-apps/CHANGELOG.md @@ -1,4 +1,6 @@ # Changelog +## 2.13.0 +- Remove worker log pods ## 2.12.4 - Fix deployment name on hpa ## 2.12.3 diff --git a/charts/neighborhoods-apps/Chart.yaml b/charts/neighborhoods-apps/Chart.yaml index b5310f2..12cfd8e 100644 --- a/charts/neighborhoods-apps/Chart.yaml +++ b/charts/neighborhoods-apps/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: Neighborhoods standard chart setup with Nginx fronting the HTTP deployment name: neighborhoods-app -version: 2.12.4 +version: 2.13.0 kubeVersion: ">=1.23.0-0" home: https://github.com/neighborhoods/neighborhoods-chart sources: diff --git a/charts/neighborhoods-apps/templates/worker-deployment.yaml b/charts/neighborhoods-apps/templates/worker-deployment.yaml index 203a40a..f82b922 100644 --- a/charts/neighborhoods-apps/templates/worker-deployment.yaml +++ b/charts/neighborhoods-apps/templates/worker-deployment.yaml @@ -1,7 +1,6 @@ {{- $root := . -}} {{- $def := .Values.workerDefault -}} {{- range $id, $val := .Values.workers -}} -{{- $logs := .logs | default $def.logs -}} --- apiVersion: apps/v1 kind: Deployment @@ -56,23 +55,17 @@ spec: {{ end}} {{ include "util.v1.extra.command_and_args" .app | indent 8 }} {{ include "util.v1.extra.resources" (.app.resources | default $def.app.resources) | indent 8 }} - volumeMounts: - - mountPath: {{ $root.Values.app.logRoot | required "Must specify .Values.app.logRoot" | quote }} - name: {{ include "util.v1.logwatch.name" "app" | quote }} {{ with $root.Values.app.extraVolumeMounts }}{{ toYaml . | indent 8 }}{{ end }} {{ with $def.app.extraVolumeMounts }}{{ toYaml . | indent 8 }}{{ end }} {{ with .app.extraVolumeMounts }}{{ toYaml . | indent 8 }}{{ end }} -{{ include "util.v1.logwatch.container_list" $logs | indent 6 }} {{ with $def.extraContainers }}{{ toYaml . | indent 6 }}{{ end }} {{ with .extraContainers }}{{ toYaml . | indent 6 }}{{ end }} initContainers: {{ with $def.extraInitContainers }}{{ toYaml . | indent 6 }}{{ end }} {{ with .extraInitContainers }}{{ toYaml . | indent 6 }}{{ end }} -{{ include "util.v1.logwatch.container_init_list" $logs | indent 6 }} volumes: -{{ include "util.v1.logwatch.volume_list" $logs | indent 6 }} {{ with $root.Values.extraVolumes }}{{ toYaml . | indent 6 }}{{ end }} {{ with $def.extraVolumes }}{{ toYaml . | indent 6 }}{{ end }} {{ with .extraVolumes }}{{ toYaml . | indent 6 }}{{ end }}