Skip to content
Commits on Source (3)
...@@ -2,6 +2,7 @@ apiVersion: v1 ...@@ -2,6 +2,7 @@ apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
name: {{ .Values.configmap.name }} name: {{ .Values.configmap.name }}
namespace: {{ .Release.Namespace }}
labels: labels:
{{ include "local-path-provisioner.labels" . | indent 4 }} {{ include "local-path-provisioner.labels" . | indent 4 }}
data: data:
......
...@@ -2,6 +2,7 @@ apiVersion: apps/v1 ...@@ -2,6 +2,7 @@ apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: {{ include "local-path-provisioner.fullname" . }} name: {{ include "local-path-provisioner.fullname" . }}
namespace: {{ .Release.Namespace }}
labels: labels:
{{ include "local-path-provisioner.labels" . | indent 4 }} {{ include "local-path-provisioner.labels" . | indent 4 }}
spec: spec:
......
...@@ -3,7 +3,8 @@ apiVersion: v1 ...@@ -3,7 +3,8 @@ apiVersion: v1
kind: Secret kind: Secret
metadata: metadata:
name: {{ .Values.defaultSettings.registrySecret }} name: {{ .Values.defaultSettings.registrySecret }}
namespace: {{ .Release.Namespace }}
type: kubernetes.io/dockerconfigjson type: kubernetes.io/dockerconfigjson
data: data:
.dockerconfigjson: {{ template "local-path-provisioner.secret" . }} .dockerconfigjson: {{ template "local-path-provisioner.secret" . }}
{{- end }} {{- end }}
\ No newline at end of file
...@@ -3,6 +3,7 @@ apiVersion: v1 ...@@ -3,6 +3,7 @@ apiVersion: v1
kind: ServiceAccount kind: ServiceAccount
metadata: metadata:
name: {{ template "local-path-provisioner.serviceAccountName" . }} name: {{ template "local-path-provisioner.serviceAccountName" . }}
namespace: {{ .Release.Namespace }}
labels: labels:
{{ include "local-path-provisioner.labels" . | indent 4 }} {{ include "local-path-provisioner.labels" . | indent 4 }}
imagePullSecrets: imagePullSecrets:
......
...@@ -48,6 +48,10 @@ const ( ...@@ -48,6 +48,10 @@ const (
defaultVolumeType = "hostPath" defaultVolumeType = "hostPath"
) )
const (
nodeNameAnnotationKey = "local.path.provisioner/selected-node"
)
var ( var (
ConfigFileCheckInterval = 30 * time.Second ConfigFileCheckInterval = 30 * time.Second
...@@ -342,14 +346,15 @@ func (p *LocalPathProvisioner) Provision(ctx context.Context, opts pvController. ...@@ -342,14 +346,15 @@ func (p *LocalPathProvisioner) Provision(ctx context.Context, opts pvController.
} }
return &v1.PersistentVolume{ return &v1.PersistentVolume{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: name, Name: name,
Annotations: map[string]string{nodeNameAnnotationKey: nodeName},
}, },
Spec: v1.PersistentVolumeSpec{ Spec: v1.PersistentVolumeSpec{
PersistentVolumeReclaimPolicy: *opts.StorageClass.ReclaimPolicy, PersistentVolumeReclaimPolicy: *opts.StorageClass.ReclaimPolicy,
AccessModes: pvc.Spec.AccessModes, AccessModes: pvc.Spec.AccessModes,
VolumeMode: &fs, VolumeMode: &fs,
Capacity: v1.ResourceList{ Capacity: v1.ResourceList{
v1.ResourceName(v1.ResourceStorage): pvc.Spec.Resources.Requests[v1.ResourceName(v1.ResourceStorage)], v1.ResourceStorage: pvc.Spec.Resources.Requests[v1.ResourceStorage],
}, },
PersistentVolumeSource: pvs, PersistentVolumeSource: pvs,
NodeAffinity: nodeAffinity, NodeAffinity: nodeAffinity,
......