Move driver arguments to manifest files

jcyepez · Oct 11, 2018 · 7a99fb5 · 7a99fb5
1 parent f580f81
commit 7a99fb5
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 19 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -21,4 +21,4 @@ FROM registry.fedoraproject.org/fedora-minimal
 COPY --from=builder /go/src/github.com/kubernetes-sigs/aws-ebs-csi-driver/bin/aws-ebs-csi-driver /bin/aws-ebs-csi-driver
 RUN microdnf install -y e2fsprogs && microdnf clean all
 
-ENTRYPOINT ["/bin/aws-ebs-csi-driver", "-logtostderr", "-v", "5"]
+ENTRYPOINT ["/bin/aws-ebs-csi-driver"]
diff --git a/deploy/kubernetes/v1.12+/attacher.yaml b/deploy/kubernetes/v1.12+/attacher.yaml
@@ -80,8 +80,8 @@ spec:
             allowPrivilegeEscalation: true
           image: quay.io/k8scsi/csi-attacher:v0.4.0
           args:
-            - "--v=5"
-            - "--csi-address=$(ADDRESS)"
+            - --v=5
+            - --csi-address=$(ADDRESS)
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -97,7 +97,9 @@ spec:
             allowPrivilegeEscalation: true
           image: quay.io/bertinatto/ebs-csi-driver:testing
           args :
-            - "--endpoint=$(CSI_ENDPOINT)"
+            - --endpoint=$(CSI_ENDPOINT)
+            - --logtostderr
+            - --v=5
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock

diff --git a/deploy/kubernetes/v1.12+/node.yaml b/deploy/kubernetes/v1.12+/node.yaml
@@ -94,7 +94,9 @@ spec:
           imagePullPolicy: Always
           image: quay.io/bertinatto/ebs-csi-driver:testing
           args:
-            - "--endpoint=$(CSI_ENDPOINT)"
+            - --endpoint=$(CSI_ENDPOINT)
+            - --logtostderr
+            - --v=5
           env:
             - name: CSI_ENDPOINT
               value: unix:/csi/csi.sock

diff --git a/deploy/kubernetes/v1.12+/provisioner.yaml b/deploy/kubernetes/v1.12+/provisioner.yaml
@@ -89,9 +89,9 @@ spec:
             allowPrivilegeEscalation: true
           image: quay.io/k8scsi/csi-provisioner:v0.4.0
           args:
-            - "--provisioner=com.amazon.aws.csi.ebs"
-            - "--csi-address=$(ADDRESS)"
-            - "--v=5"
+            - --provisioner=com.amazon.aws.csi.ebs
+            - --csi-address=$(ADDRESS)
+            - --v=5
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -108,7 +108,9 @@ spec:
             allowPrivilegeEscalation: true
           image: quay.io/bertinatto/ebs-csi-driver:testing
           args :
-            - "--endpoint=$(CSI_ENDPOINT)"
+            - --endpoint=$(CSI_ENDPOINT)
+            - --logtostderr
+            - --v=5
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock

diff --git a/deploy/kubernetes/v1.[10,11]/attacher.yaml b/deploy/kubernetes/v1.[10,11]/attacher.yaml
@@ -80,8 +80,8 @@ spec:
             allowPrivilegeEscalation: true
           image: quay.io/k8scsi/csi-attacher:v0.3.0
           args:
-            - "--v=5"
-            - "--csi-address=$(ADDRESS)"
+            - --v=5
+            - --csi-address=$(ADDRESS)
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -97,7 +97,9 @@ spec:
             allowPrivilegeEscalation: true
           image: quay.io/bertinatto/ebs-csi-driver:testing
           args :
-            - "--endpoint=$(CSI_ENDPOINT)"
+            - --endpoint=$(CSI_ENDPOINT)
+            - --logtostderr
+            - --v=5
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock

diff --git a/deploy/kubernetes/v1.[10,11]/node.yaml b/deploy/kubernetes/v1.[10,11]/node.yaml
@@ -68,8 +68,8 @@ spec:
           imagePullPolicy: Always
           image: quay.io/k8scsi/driver-registrar:v0.3.0
           args:
-            - "--v=5"
-            - "--csi-address=$(ADDRESS)"
+            - --v=5
+            - --csi-address=$(ADDRESS)
           env:
             - name: ADDRESS
               value: /csi/csi.sock
@@ -86,7 +86,9 @@ spec:
           imagePullPolicy: Always
           image: quay.io/bertinatto/ebs-csi-driver:testing
           args:
-            - "--endpoint=$(CSI_ENDPOINT)"
+            - --endpoint=$(CSI_ENDPOINT)
+            - --logtostderr
+            - --v=5
           env:
             - name: CSI_ENDPOINT
               value: unix:/csi/csi.sock

diff --git a/deploy/kubernetes/v1.[10,11]/provisioner.yaml b/deploy/kubernetes/v1.[10,11]/provisioner.yaml
@@ -80,9 +80,9 @@ spec:
             allowPrivilegeEscalation: true
           image: quay.io/k8scsi/csi-provisioner:v0.3.0
           args:
-            - "--provisioner=com.amazon.aws.csi.ebs"
-            - "--csi-address=$(ADDRESS)"
-            - "--v=5"
+            - --provisioner=com.amazon.aws.csi.ebs
+            - --csi-address=$(ADDRESS)
+            - --v=5
           env:
             - name: ADDRESS
               value: /var/lib/csi/sockets/pluginproxy/csi.sock
@@ -99,7 +99,9 @@ spec:
             allowPrivilegeEscalation: true
           image: quay.io/bertinatto/ebs-csi-driver:testing
           args :
-            - "--endpoint=$(CSI_ENDPOINT)"
+            - --endpoint=$(CSI_ENDPOINT)
+            - --logtostderr
+            - --v=5
           env:
             - name: CSI_ENDPOINT
               value: unix:///var/lib/csi/sockets/pluginproxy/csi.sock