helm: add namespace to all resource templates
The helm templates assumed that the resources would be installed
to the given namespace for the helm install or upgrade. This works
perfectly until there is a desire to extract the manifests from
the helm chart and instead install with those. Thus, the namespace
is added to all the resources in the chart where they were
missing.
Signed-off-by: travisn <tnielsen@redhat.com>
(cherry picked from commit b4e51f6d12)
This commit is contained in:
1 parent
d6c25340cc
commit
55c2089fd6
11 files changed
+11
-1
No files matched your search
@@ -5,6 +5,7 @@ apiVersion: ceph.rook.io/v1
|
||||
kind: CephBlockPool
|
||||
metadata:
|
||||
name: {{ $blockpool.name }}
|
||||
namespace: {{ $root.Release.Namespace }} # namespace:cluster
|
||||
spec:
|
||||
{{ toYaml $blockpool.spec | indent 2 }}
|
||||
---
|
||||
|
||||
@@ -3,6 +3,7 @@ apiVersion: ceph.rook.io/v1
|
||||
kind: CephCluster
|
||||
metadata:
|
||||
name: {{ default .Release.Namespace .Values.clusterName }}
|
||||
namespace: {{ .Release.Namespace }} # namespace:cluster
|
||||
spec:
|
||||
{{- if .Values.monitoring }}
|
||||
monitoring:
|
||||
|
||||
@@ -5,6 +5,7 @@ apiVersion: ceph.rook.io/v1
|
||||
kind: CephBlockPool
|
||||
metadata:
|
||||
name: {{ $ecblockpool.name }}
|
||||
namespace: {{ $root.Release.Namespace }} # namespace:cluster
|
||||
spec:
|
||||
{{ toYaml $ecblockpool.spec | indent 2 }}
|
||||
{{ end }}
|
||||
@@ -43,4 +44,3 @@ parameters:
|
||||
allowVolumeExpansion: {{ $cephEcStorage.allowVolumeExpansion }}
|
||||
reclaimPolicy: {{ $cephEcStorage.reclaimPolicy }}
|
||||
{{ end }}
|
||||
|
||||
@@ -5,6 +5,7 @@ apiVersion: ceph.rook.io/v1
|
||||
kind: CephFilesystem
|
||||
metadata:
|
||||
name: {{ $filesystem.name }}
|
||||
namespace: {{ $root.Release.Namespace }} # namespace:cluster
|
||||
spec:
|
||||
{{ toYaml $filesystem.spec | indent 2 }}
|
||||
---
|
||||
|
||||
@@ -5,6 +5,7 @@ apiVersion: {{ include "capabilities.ingress.apiVersion" $ }}
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: {{ .name }}
|
||||
namespace: {{ .Release.Namespace }} # namespace:cluster
|
||||
{{- with .ingress.annotations }}
|
||||
annotations: {{- toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
|
||||
@@ -5,6 +5,7 @@ apiVersion: ceph.rook.io/v1
|
||||
kind: CephObjectStore
|
||||
metadata:
|
||||
name: {{ $objectstore.name }}
|
||||
namespace: {{ $root.Release.Namespace }} # namespace:cluster
|
||||
spec:
|
||||
{{ toYaml $objectstore.spec | indent 2 }}
|
||||
---
|
||||
|
||||
@@ -4,6 +4,7 @@ kind: ConfigMap
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
name: rook-config-override
|
||||
namespace: {{ .Release.Namespace }} # namespace:cluster
|
||||
data:
|
||||
config: |
|
||||
{{ .Values.configOverride | nindent 4 }}
|
||||
|
||||
@@ -4,6 +4,7 @@ apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: rook-ceph-tools
|
||||
namespace: {{ .Release.Namespace }} # namespace:cluster
|
||||
labels:
|
||||
app: rook-ceph-tools
|
||||
spec:
|
||||
|
||||
@@ -4,6 +4,7 @@ apiVersion: {{ include "capabilities.ingress.apiVersion" . }}
|
||||
kind: Ingress
|
||||
metadata:
|
||||
name: {{ template "clusterName" . }}-dashboard
|
||||
namespace: {{ .Release.Namespace }} # namespace:cluster
|
||||
{{- if .Values.ingress.dashboard.annotations }}
|
||||
annotations: {{- toYaml .Values.ingress.dashboard.annotations | nindent 4 }}
|
||||
{{- end }}
|
||||
|
||||
@@ -4,6 +4,7 @@ kind: ConfigMap
|
||||
apiVersion: v1
|
||||
metadata:
|
||||
name: rook-ceph-operator-config
|
||||
namespace: {{ .Release.Namespace }} # namespace:operator
|
||||
data:
|
||||
ROOK_LOG_LEVEL: {{ .Values.logLevel | quote }}
|
||||
ROOK_CEPH_COMMANDS_TIMEOUT_SECONDS: {{ .Values.cephCommandsTimeoutSeconds | quote }}
|
||||
|
||||
@@ -2,6 +2,7 @@ apiVersion: apps/v1
|
||||
kind: Deployment
|
||||
metadata:
|
||||
name: rook-ceph-operator
|
||||
namespace: {{ .Release.Namespace }} # namespace:operator
|
||||
labels:
|
||||
operator: rook
|
||||
storage-backend: ceph
|
||||
|
||||
Reference in new issue
Block a user