Namespace change

k8s_01/templates/configmap.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: config
-  namespace: {{.Values.namespace}}
+  namespace: {{.Release.Namespace}}
 data:
   config.json: |-
     {{toJson .Values.config}}

k8s_01/templates/daemonset.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: kubelogreader
-  namespace: {{.Values.namespace}}
+  namespace: {{.Release.Namespace}}
   labels:
     app: k8s_01
     host: kubelogreader
@@ -25,8 +25,9 @@ spec:
         - configMap:
             name: config
           name: config
-        - persistentVolumeClaim:
-            claimName: statestore-pvc
+        - hostPath:
+            path: {{.Values.statestore.hostMountPath}}
+            type: DirectoryOrCreate
           name: statestore
         - hostPath:
             path: /var/log/containers

k8s_01/templates/role.yaml

@@ -1,7 +1,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  namespace: {{.Values.namespace}}
+  namespace: {{.Release.Namespace}}
   name: kubelogreader
 rules:
 - apiGroups:

k8s_01/templates/rolebinding.yaml

@@ -2,11 +2,11 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: kubelogreader
-  namespace: {{.Values.namespace}}
+  namespace: {{.Release.Namespace}}
 subjects:
   - kind: ServiceAccount
     name: kubelogreader
-    namespace: {{.Values.namespace}}
+    namespace: {{.Release.Namespace}}
 roleRef:
   kind: ClusterRole
   name: kubelogreader

k8s_01/templates/service.yaml

@@ -2,6 +2,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: metrics-service
+  namespace: {{.Release.Namespace}}
   labels:
     app: k8s_01
     host: kubelogreader

k8s_01/templates/serviceaccount.yaml

@@ -2,4 +2,4 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: kubelogreader
-  namespace: {{.Values.namespace}}
+  namespace: {{.Release.Namespace}}

k8s_01/values.yaml

@@ -77,10 +77,12 @@ config:
 logging:
   level: INFO
 
-# Which namespace it will be installed to.
-namespace: teragrep
-
 # Keystore related
 keystore:
   # Which secret is passed to the container
   secretName: keystore
+
+# Statestore related
+statestore:
+  # Where statestore is mounted on the host
+  hostMountPath: /srv/k8s_01/statestore