[bitnami/logstash] Add missing namespace metadata (#10135)

* [bitnami/logstash] Add missing namespace metadata Signed-off-by: Miguel Ruiz <miruiz@vmware.com> * ServiceMonitor namespace Signed-off-by: Miguel Ruiz <miruiz@vmware.com> * CommonAnnotations Signed-off-by: Miguel Ruiz <miruiz@vmware.com> * Fix VIB upload image reference Signed-off-by: Miguel Ruiz <miruiz@vmware.com> * Replace template with include Signed-off-by: Miguel Ruiz <miruiz@vmware.com>
2026-02-25 15:57:33 +08:00 · 2022-05-12 10:46:11 +02:00
parent 9649e70982
commit e6b093a369
11 changed files with 20 additions and 14 deletions
--- a/.vib/logstash/vib-verify.json
+++ b/.vib/logstash/vib-verify.json
@@ -22,7 +22,7 @@
          "url": "{SHA_ARCHIVE}",
          "path": "/bitnami/logstash"
        },
-        "runtime_parameters": "InNlcnZpY2UiOgogICJwb3J0cyI6CiAgICAiaHR0cCI6CiAgICAgICJwb3J0IjogODAKICAidHlwZSI6ICJMb2FkQmFsYW5jZXIi",
+        "runtime_parameters": "InNlcnZpY2UiOgogICJwb3J0cyI6CiAgICAtICJuYW1lIjogImh0dHAiCiAgICAgICJwb3J0IjogODAKICAgICAgInRhcmdldFBvcnQiOiAiaHR0cCIKICAgICAgInByb3RvY29sIjogIlRDUCIKICAidHlwZSI6ICJMb2FkQmFsYW5jZXIiCg==",
        "target_platform": {
          "target_platform_id": "{VIB_ENV_TARGET_PLATFORM}",
          "size": {
--- a/bitnami/logstash/templates/configuration-cm.yaml
+++ b/bitnami/logstash/templates/configuration-cm.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
  name: {{ include "common.names.fullname" . }}
-  namespace: {{ template "common.names.namespace" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
  labels: {{- include "common.labels.standard" . | nindent 4 }}
    {{- if .Values.commonLabels }}
    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
--- a/bitnami/logstash/templates/headless-svc.yaml
+++ b/bitnami/logstash/templates/headless-svc.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
  name: {{ printf "%s-headless" (include "common.names.fullname" .) }}
-  namespace: {{ template "common.names.namespace" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
  labels: {{- include "common.labels.standard" . | nindent 4 }}
    {{- if .Values.commonLabels }}
    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
--- a/bitnami/logstash/templates/ingress.yaml
+++ b/bitnami/logstash/templates/ingress.yaml
@@ -3,7 +3,7 @@ apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }}
 kind: Ingress
 metadata:
  name: {{ template "common.names.fullname" . }}
-  namespace: {{ template "common.names.namespace" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
  labels: {{- include "common.labels.standard" . | nindent 4 }}
    {{- if .Values.commonLabels }}
    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
--- a/bitnami/logstash/templates/metrics-svc.yaml
+++ b/bitnami/logstash/templates/metrics-svc.yaml
@@ -3,6 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
  name: {{ printf "%s-metrics" (include "common.names.fullname" .) }}
+  namespace: {{ include "common.names.namespace" . | quote }}
  labels: {{- include "common.labels.standard" . | nindent 4 }}
    {{- if .Values.commonLabels }}
    {{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
--- a/bitnami/logstash/templates/pdb.yaml
+++ b/bitnami/logstash/templates/pdb.yaml
@@ -1,9 +1,16 @@
 {{- if .Values.pdb.create }}
 apiVersion: {{ include "common.capabilities.policy.apiVersion" . }}
-kind: pdb
+kind: PodDisruptionBudget
 metadata:
  name: {{ include "common.names.fullname" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
  labels: {{- include "common.labels.standard" . | nindent 4 }}
+    {{- if .Values.commonLabels }}
+    {{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
+    {{- end }}
+  {{- if .Values.commonAnnotations }}
+  annotations: {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
+  {{- end }}
 spec:
  {{- if .Values.pdb.minAvailable }}
  minAvailable: {{ .Values.pdb.minAvailable }}
--- a/bitnami/logstash/templates/serviceaccount.yaml
+++ b/bitnami/logstash/templates/serviceaccount.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
  name: {{ template "logstash.serviceAccountName" . }}
-  namespace: {{ template "common.names.namespace" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
  labels: {{- include "common.labels.standard" . | nindent 4 }}
    {{- if .Values.commonLabels }}
    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
--- a/bitnami/logstash/templates/servicemonitor.yaml
+++ b/bitnami/logstash/templates/servicemonitor.yaml
@@ -3,9 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
  name: {{ include "common.names.fullname" . }}
-  {{- if .Values.metrics.serviceMonitor.namespace }}
-  namespace: {{ .Values.metrics.serviceMonitor.namespace }}
-  {{- end }}
+  namespace: {{ default (include "common.names.namespace" .) .Values.metrics.serviceMonitor.namespace | quote }}
  labels: {{- include "common.labels.standard" . | nindent 4 }}
    {{- if .Values.commonLabels }}
    {{- include "common.tplvalues.render" (dict "value" .Values.commonLabels "context" $) | nindent 4 }}
@@ -45,5 +43,5 @@ spec:
      {{- end }}
  namespaceSelector:
    matchNames:
-      - {{ template "common.names.namespace" . }}
+      - {{ include "common.names.namespace" . | quote }}
 {{- end }}
--- a/bitnami/logstash/templates/sts.yaml
+++ b/bitnami/logstash/templates/sts.yaml
@@ -2,7 +2,7 @@ apiVersion: {{ include "common.capabilities.statefulset.apiVersion" . }}
 kind: StatefulSet
 metadata:
  name: {{ include "common.names.fullname" . }}
-  namespace: {{ template "common.names.namespace" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
  labels: {{- include "common.labels.standard" . | nindent 4 }}
    {{- if .Values.commonLabels }}
    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
--- a/bitnami/logstash/templates/svc.yaml
+++ b/bitnami/logstash/templates/svc.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
  name: {{ include "common.names.fullname" . }}
-  namespace: {{ template "common.names.namespace" . }}
+  namespace: {{ include "common.names.namespace" . | quote }}
  labels: {{- include "common.labels.standard" . | nindent 4 }}
    {{- if .Values.commonLabels }}
    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
--- a/bitnami/logstash/templates/tls-secret.yaml
+++ b/bitnami/logstash/templates/tls-secret.yaml
@@ -5,7 +5,7 @@ apiVersion: v1
 kind: Secret
 metadata:
  name: {{ .name }}
-  namespace: {{ template "common.names.namespace" $ }}
+  namespace: {{ include "common.names.namespace" $ | quote }}
  labels: {{- include "common.labels.standard" $ | nindent 4 }}
    {{- if $.Values.commonLabels }}
    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}
@@ -26,7 +26,7 @@ apiVersion: v1
 kind: Secret
 metadata:
  name: {{ printf "%s-tls" .Values.ingress.hostname }}
-  namespace: {{ template "common.names.namespace" $ }}
+  namespace: {{ include "common.names.namespace" $ | quote }}
  labels: {{- include "common.labels.standard" . | nindent 4 }}
    {{- if .Values.commonLabels }}
    {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}