Skip to content

Commit

Permalink
Bump csi-proxy client to v1
Browse files Browse the repository at this point in the history
  • Loading branch information
mauriciopoppe committed Jun 19, 2021
1 parent 35e0f2e commit fa2f4d8
Show file tree
Hide file tree
Showing 14 changed files with 2,483 additions and 462 deletions.
9 changes: 5 additions & 4 deletions deploy/kubernetes/overlays/noauth-debug/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ transformers:
patchesStrategicMerge:
- noauth.yaml
- controller-overlay.yaml
- node-overlay.yaml
namespace: gce-pd-csi-driver
# To change the dev image, add something like the following.
images:
- name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
newName: gcr.io/mauriciopoppe-gke-dev/gcp-compute-persistent-disk-csi-driver
newTag: latest
# images:
# - name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
# newName: gcr.io/mauriciopoppe-gke-dev/gcp-compute-persistent-disk-csi-driver
# newTag: latest
21 changes: 21 additions & 0 deletions deploy/kubernetes/overlays/noauth-debug/node-overlay.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
kind: DaemonSet
apiVersion: apps/v1
metadata:
name: csi-gce-pd-node
spec:
template:
spec:
containers:
- name: gce-pd-driver
imagePullPolicy: Always
---
kind: DaemonSet
apiVersion: apps/v1
metadata:
name: csi-gce-pd-node-win
spec:
template:
spec:
containers:
- name: gce-pd-driver
imagePullPolicy: Always
1 change: 0 additions & 1 deletion pkg/mount-manager/safe-mounter_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ func NewSafeMounter() (*mount.SafeFormatAndMount, error) {
Exec: utilexec.New(),
}, nil
}
// TODO(mauriciopoppe): this info might be misleading while we move to use v1 because we're still using v1beta3/v1beta2
klog.V(4).Infof("failed to connect to csi-proxy v1 with error=%v, will try with v1Beta", err)

csiProxyMounterV1Beta, err := NewCSIProxyMounterV1Beta()
Expand Down
3 changes: 1 addition & 2 deletions pkg/resizefs/resizefs_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,8 @@ import (
"context"
"fmt"

volumeapiv1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1"
volumeapiv1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1"
// TODO(mauriciopoppe): use v1 when it's released, the import is aliased to volumeapiv1 for a smaller diff later
volumeapiv1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta3"

"k8s.io/klog"
"k8s.io/mount-utils"
Expand Down

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit fa2f4d8

Please sign in to comment.