From beefdaee932fddc539632547e19e5219d60d943c Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Thu, 12 May 2022 11:00:52 +0200 Subject: [PATCH] [bitnami/mediawiki] Add missing namespace metadata (#10139) * [bitnami/mediawiki] Add missing namespace metadata Signed-off-by: Miguel Ruiz * Add quotes Signed-off-by: Miguel Ruiz * ServiceMonitor namespace Signed-off-by: Miguel Ruiz * Fix VIB upload image reference Signed-off-by: Miguel Ruiz * Quote namespaces Signed-off-by: Miguel Ruiz --- .../mediawiki/cypress/cypress/integration/mediawiki_spec.js | 2 +- bitnami/mediawiki/Chart.yaml | 2 +- bitnami/mediawiki/templates/deployment.yaml | 1 + bitnami/mediawiki/templates/externaldb-secrets.yaml | 1 + bitnami/mediawiki/templates/ingress.yaml | 1 + bitnami/mediawiki/templates/mediawiki-pvc.yaml | 1 + .../mediawiki/templates/networkpolicy-backend-ingress.yaml | 1 + bitnami/mediawiki/templates/networkpolicy-egress.yaml | 1 + bitnami/mediawiki/templates/networkpolicy-ingress.yaml | 1 + bitnami/mediawiki/templates/secrets.yaml | 1 + bitnami/mediawiki/templates/servicemonitor.yaml | 6 +----- bitnami/mediawiki/templates/tls-secrets.yaml | 4 ++-- 12 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.vib/mediawiki/cypress/cypress/integration/mediawiki_spec.js b/.vib/mediawiki/cypress/cypress/integration/mediawiki_spec.js index 5c82a67c54..fc3fe14c55 100644 --- a/.vib/mediawiki/cypress/cypress/integration/mediawiki_spec.js +++ b/.vib/mediawiki/cypress/cypress/integration/mediawiki_spec.js @@ -46,7 +46,7 @@ it('allows to upload a file', () => { cy.login(); cy.visit('/wiki/Special:Upload'); cy.get('#wpUploadFile').selectFile( - 'cypress/fixtures/images/upload_image.png', + 'cypress/fixtures/images/post_image.png', { force: true, } diff --git a/bitnami/mediawiki/Chart.yaml b/bitnami/mediawiki/Chart.yaml index e2b1cae9e1..0a4c51c2f2 100644 --- a/bitnami/mediawiki/Chart.yaml +++ b/bitnami/mediawiki/Chart.yaml @@ -32,4 +32,4 @@ name: mediawiki sources: - https://github.com/bitnami/bitnami-docker-mediawiki - https://www.mediawiki.org/ -version: 14.1.0 +version: 14.1.1 diff --git a/bitnami/mediawiki/templates/deployment.yaml b/bitnami/mediawiki/templates/deployment.yaml index 3720bf31bf..d50e658da6 100644 --- a/bitnami/mediawiki/templates/deployment.yaml +++ b/bitnami/mediawiki/templates/deployment.yaml @@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} diff --git a/bitnami/mediawiki/templates/externaldb-secrets.yaml b/bitnami/mediawiki/templates/externaldb-secrets.yaml index d44cad2412..625576a640 100644 --- a/bitnami/mediawiki/templates/externaldb-secrets.yaml +++ b/bitnami/mediawiki/templates/externaldb-secrets.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ printf "%s-externaldb" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} diff --git a/bitnami/mediawiki/templates/ingress.yaml b/bitnami/mediawiki/templates/ingress.yaml index 31074f7c22..a8ea83476c 100644 --- a/bitnami/mediawiki/templates/ingress.yaml +++ b/bitnami/mediawiki/templates/ingress.yaml @@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.ingress.apiVersion" . }} kind: Ingress metadata: name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} diff --git a/bitnami/mediawiki/templates/mediawiki-pvc.yaml b/bitnami/mediawiki/templates/mediawiki-pvc.yaml index 4e88483a06..4d7ab9582a 100644 --- a/bitnami/mediawiki/templates/mediawiki-pvc.yaml +++ b/bitnami/mediawiki/templates/mediawiki-pvc.yaml @@ -3,6 +3,7 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: {{ template "common.names.fullname" . }}-mediawiki + namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} diff --git a/bitnami/mediawiki/templates/networkpolicy-backend-ingress.yaml b/bitnami/mediawiki/templates/networkpolicy-backend-ingress.yaml index 99ce711daa..e69a024e70 100644 --- a/bitnami/mediawiki/templates/networkpolicy-backend-ingress.yaml +++ b/bitnami/mediawiki/templates/networkpolicy-backend-ingress.yaml @@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }} kind: NetworkPolicy metadata: name: {{ printf "%s-backend" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} diff --git a/bitnami/mediawiki/templates/networkpolicy-egress.yaml b/bitnami/mediawiki/templates/networkpolicy-egress.yaml index d8b8242da6..d908e9b883 100644 --- a/bitnami/mediawiki/templates/networkpolicy-egress.yaml +++ b/bitnami/mediawiki/templates/networkpolicy-egress.yaml @@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }} kind: NetworkPolicy metadata: name: {{ printf "%s-egress" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} diff --git a/bitnami/mediawiki/templates/networkpolicy-ingress.yaml b/bitnami/mediawiki/templates/networkpolicy-ingress.yaml index 370e420b5e..27cbbbb21f 100644 --- a/bitnami/mediawiki/templates/networkpolicy-ingress.yaml +++ b/bitnami/mediawiki/templates/networkpolicy-ingress.yaml @@ -3,6 +3,7 @@ apiVersion: {{ include "common.capabilities.networkPolicy.apiVersion" . }} kind: NetworkPolicy metadata: name: {{ printf "%s-ingress" (include "common.names.fullname" .) }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} diff --git a/bitnami/mediawiki/templates/secrets.yaml b/bitnami/mediawiki/templates/secrets.yaml index 10952173c1..82a941a2ae 100644 --- a/bitnami/mediawiki/templates/secrets.yaml +++ b/bitnami/mediawiki/templates/secrets.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ template "common.names.fullname" . }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }} diff --git a/bitnami/mediawiki/templates/servicemonitor.yaml b/bitnami/mediawiki/templates/servicemonitor.yaml index 0ac4db0f71..5cc1de9a47 100644 --- a/bitnami/mediawiki/templates/servicemonitor.yaml +++ b/bitnami/mediawiki/templates/servicemonitor.yaml @@ -3,11 +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 | quote }} - {{- else }} - namespace: {{ .Release.Namespace | quote }} - {{- end }} + namespace: {{ default .Release.Namespace .Values.metrics.serviceMonitor.namespace | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} app.kubernetes.io/component: metrics {{- if .Values.commonLabels }} diff --git a/bitnami/mediawiki/templates/tls-secrets.yaml b/bitnami/mediawiki/templates/tls-secrets.yaml index 2ea73433cf..2d3b0cd727 100644 --- a/bitnami/mediawiki/templates/tls-secrets.yaml +++ b/bitnami/mediawiki/templates/tls-secrets.yaml @@ -5,7 +5,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ .name }} - namespace: {{ $.Release.Namespace }} + namespace: {{ $.Release.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: {{ .Release.Namespace }} + namespace: {{ .Release.Namespace | quote }} labels: {{- include "common.labels.standard" . | nindent 4 }} {{- if .Values.commonLabels }} {{- include "common.tplvalues.render" ( dict "value" .Values.commonLabels "context" $ ) | nindent 4 }}