diff --git a/charts/zot/Chart.yaml b/charts/zot/Chart.yaml index e87b89c..83456b3 100644 --- a/charts/zot/Chart.yaml +++ b/charts/zot/Chart.yaml @@ -3,4 +3,4 @@ appVersion: v2.1.2-rc3 description: A Helm chart for Kubernetes name: zot type: application -version: 0.1.64 +version: 0.1.65 diff --git a/charts/zot/templates/configmap.yaml b/charts/zot/templates/configmap.yaml index a6a29c3..d91e4e3 100644 --- a/charts/zot/templates/configmap.yaml +++ b/charts/zot/templates/configmap.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ConfigMap metadata: name: {{ .Release.Name }}-config + namespace: {{ .Values.namespace | default .Release.Namespace }} data: {{- range $key, $val := .Values.configFiles }} {{ $key }}: {{ $val | quote }} diff --git a/charts/zot/templates/deployment.yaml b/charts/zot/templates/deployment.yaml index 8ad8bd2..47e0671 100644 --- a/charts/zot/templates/deployment.yaml +++ b/charts/zot/templates/deployment.yaml @@ -2,6 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: {{ include "zot.fullname" . }} + namespace: {{ .Values.namespace | default .Release.Namespace }} labels: {{- include "zot.labels" . | nindent 4 }} {{- with .Values.deploymentAnnotations }} diff --git a/charts/zot/templates/ingress.yaml b/charts/zot/templates/ingress.yaml index 02d9dbf..2f56142 100644 --- a/charts/zot/templates/ingress.yaml +++ b/charts/zot/templates/ingress.yaml @@ -7,6 +7,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: {{ $fullName }} + namespace: {{ .Values.namespace | default .Release.Namespace }} labels: app: {{ .Chart.Name }} release: {{ .Release.Name }} diff --git a/charts/zot/templates/pvc.yaml b/charts/zot/templates/pvc.yaml index d30c59a..8e43548 100644 --- a/charts/zot/templates/pvc.yaml +++ b/charts/zot/templates/pvc.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: name: {{ .Values.pvc.name | default (printf "%s-pvc" .Release.Name) }} + namespace: {{ .Values.namespace | default .Release.Namespace }} spec: accessModes: - {{ .Values.pvc.accessMode | default "ReadWriteOnce" }} diff --git a/charts/zot/templates/secret.yaml b/charts/zot/templates/secret.yaml index 4d5f8d1..a3b9e1a 100644 --- a/charts/zot/templates/secret.yaml +++ b/charts/zot/templates/secret.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: Secret metadata: name: {{ .Release.Name }}-secret + namespace: {{ .Values.namespace | default .Release.Namespace }} type: Opaque data: {{- range $key, $val := .Values.secretFiles }} diff --git a/charts/zot/templates/service.yaml b/charts/zot/templates/service.yaml index 14b997b..9ea69e1 100644 --- a/charts/zot/templates/service.yaml +++ b/charts/zot/templates/service.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Service metadata: name: {{ include "zot.fullname" . }} + namespace: {{ .Values.namespace | default .Release.Namespace }} labels: {{- include "zot.labels" . | nindent 4 }} {{- with .Values.service.annotations }} diff --git a/charts/zot/templates/serviceaccount.yaml b/charts/zot/templates/serviceaccount.yaml index 23f5efa..c7101e1 100644 --- a/charts/zot/templates/serviceaccount.yaml +++ b/charts/zot/templates/serviceaccount.yaml @@ -3,6 +3,7 @@ apiVersion: v1 kind: ServiceAccount metadata: name: {{ include "zot.serviceAccountName" . }} + namespace: {{ .Values.namespace | default .Release.Namespace }} labels: {{- include "zot.labels" . | nindent 4 }} {{- with .Values.serviceAccount.annotations }} diff --git a/charts/zot/templates/servicemonitor.yaml b/charts/zot/templates/servicemonitor.yaml index 335f244..33cabe4 100644 --- a/charts/zot/templates/servicemonitor.yaml +++ b/charts/zot/templates/servicemonitor.yaml @@ -6,6 +6,7 @@ apiVersion: monitoring.coreos.com/v1 kind: ServiceMonitor metadata: name: {{ include "zot.fullname" . }} + namespace: {{ .Values.namespace | default .Release.Namespace }} labels: app.kubernetes.io/component: metrics spec: diff --git a/charts/zot/templates/tests/test-connection-fails.yaml b/charts/zot/templates/tests/test-connection-fails.yaml index 0e7a059..c27dac2 100644 --- a/charts/zot/templates/tests/test-connection-fails.yaml +++ b/charts/zot/templates/tests/test-connection-fails.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Pod metadata: name: "{{ include "zot.fullname" . }}-test-connection-fails" + namespace: {{ .Values.namespace | default .Release.Namespace }} labels: {{- include "zot.labels" . | nindent 4 }} annotations: diff --git a/charts/zot/templates/tests/test-connection.yaml b/charts/zot/templates/tests/test-connection.yaml index 59c64b4..8f336b3 100644 --- a/charts/zot/templates/tests/test-connection.yaml +++ b/charts/zot/templates/tests/test-connection.yaml @@ -2,6 +2,7 @@ apiVersion: v1 kind: Pod metadata: name: "{{ include "zot.fullname" . }}-test-connection" + namespace: {{ .Values.namespace | default .Release.Namespace }} labels: {{- include "zot.labels" . | nindent 4 }} annotations: diff --git a/charts/zot/unittests/__snapshot__/ingress_test.yaml.snap b/charts/zot/unittests/__snapshot__/ingress_test.yaml.snap index 115a740..eb420cf 100644 --- a/charts/zot/unittests/__snapshot__/ingress_test.yaml.snap +++ b/charts/zot/unittests/__snapshot__/ingress_test.yaml.snap @@ -10,6 +10,7 @@ should match snapshot of default values: app: zot release: RELEASE-NAME name: RELEASE-NAME-zot + namespace: NAMESPACE spec: ingressClassName: nginx-test rules: diff --git a/charts/zot/values.yaml b/charts/zot/values.yaml index 00a577a..ca0a7d7 100644 --- a/charts/zot/values.yaml +++ b/charts/zot/values.yaml @@ -7,6 +7,8 @@ image: pullPolicy: IfNotPresent # Overrides the image tag whose default is the chart appVersion. tag: "v2.1.2-rc3" +# Defaults to the release namespace if not specified +namespace: "" serviceAccount: # Specifies whether a service account should be created create: true