kubernetes-csi/csi-driver-nfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #117 from songjiaxun/azurestack

Browse Source 
fix: limit node server to deploy only on Linux nodes
This commit is contained in:
Kubernetes Prow Robot 2020-12-22 03:00:26 -08:00 committed by GitHub
commit f5b513f1be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml
View File

@ -17,6 +17,8 @@ spec:
spec: spec:
hostNetwork: true # original nfs connection would be broken without hostNetwork setting hostNetwork: true # original nfs connection would be broken without hostNetwork setting
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
nodeSelector:
kubernetes.io/os: linux
containers: containers:
- name: liveness-probe - name: liveness-probe
image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}" image: "{{ .Values.image.livenessProbe.repository }}:{{ .Values.image.livenessProbe.tag }}"

2
deploy/csi-nfs-node.yaml
View File

@ -17,6 +17,8 @@ spec:
spec: spec:
hostNetwork: true # original nfs connection would be broken without hostNetwork setting hostNetwork: true # original nfs connection would be broken without hostNetwork setting
dnsPolicy: ClusterFirstWithHostNet dnsPolicy: ClusterFirstWithHostNet
nodeSelector:
kubernetes.io/os: linux
containers: containers:
- name: liveness-probe - name: liveness-probe
image: k8s.gcr.io/sig-storage/livenessprobe:v2.1.0 image: k8s.gcr.io/sig-storage/livenessprobe:v2.1.0

3
deploy/example/deployment.yaml
View File

@ -26,7 +26,8 @@ spec:
labels: labels:
name: deployment-nfs name: deployment-nfs
spec: spec:
containers: nodeSelector:
"kubernetes.io/os": linux
containers: containers:
- name: deployment-nfs - name: deployment-nfs
image: mcr.microsoft.com/oss/nginx/nginx:1.17.3-alpine image: mcr.microsoft.com/oss/nginx/nginx:1.17.3-alpine

2
test/e2e/testsuites/testsuites.go
View File

@ -323,6 +323,7 @@ func NewTestPod(c clientset.Interface, ns *v1.Namespace, command string) *TestPo
GenerateName: "nfs-volume-tester-", GenerateName: "nfs-volume-tester-",
}, },
Spec: v1.PodSpec{ Spec: v1.PodSpec{
NodeSelector: map[string]string{"kubernetes.io/os": "linux"},
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "volume-tester", Name: "volume-tester",
@ -446,6 +447,7 @@ func NewTestDeployment(c clientset.Interface, ns *v1.Namespace, command string,
Labels: map[string]string{"app": selectorValue}, Labels: map[string]string{"app": selectorValue},
}, },
Spec: v1.PodSpec{ Spec: v1.PodSpec{
NodeSelector: map[string]string{"kubernetes.io/os": "linux"},
Containers: []v1.Container{ Containers: []v1.Container{
{ {
Name: "volume-tester", Name: "volume-tester",