Skip to content

Commit 08c8fcc

Browse files
committed
remove GKE Data Cache Watcher regular event logs since it's generating
alot of no-op logs for customer.
1 parent 752a144 commit 08c8fcc

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

deploy/kubernetes/base/controller/controller.yaml

+1-4
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,7 @@ spec:
144144
- "--endpoint=unix:/csi/csi.sock"
145145
- "--supports-dynamic-iops-provisioning=hyperdisk-balanced,hyperdisk-extreme"
146146
- "--supports-dynamic-throughput-provisioning=hyperdisk-balanced,hyperdisk-throughput,hyperdisk-ml"
147-
# - "--enable-data-cache"
148-
- "--enable-data-cache=true"
149-
- "--run-node-service=false"
150-
- "--run-controller-service=true"
147+
- --enable-data-cache
151148
command:
152149
- /gce-pd-csi-driver
153150
env:

deploy/kubernetes/base/node_linux/node.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,7 @@ spec:
4646
- "--v=5"
4747
- "--endpoint=unix:/csi/csi.sock"
4848
- "--run-controller-service=false"
49-
- "--run-node-service=true"
50-
# - "--enable-data-cache"
51-
- "--enable-data-cache=true"
49+
- "--enable-data-cache"
5250
- "--node-name=$(KUBE_NODE_NAME)"
5351
securityContext:
5452
privileged: true

deploy/kubernetes/images/stable-master/image.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@ metadata:
5050
imageTag:
5151
name: gke.gcr.io/gcp-compute-persistent-disk-csi-driver
5252
# pdImagePlaceholder in test/k8s-integration/main.go is updated automatically with the newTag
53-
newName: gcr.io/samhalim-joonix/gcp-compute-persistent-disk-csi-driver
54-
newTag: "datacache_sam"
53+
newName: registry.k8s.io/cloud-provider-gcp/gcp-compute-persistent-disk-csi-driver
54+
newTag: "v1.17.2"
5555
---

pkg/gce-pd-csi-driver/cache.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -646,7 +646,7 @@ func watchDiskDetaches(watcher *fsnotify.Watcher, nodeName string, errorCh chan
646646
case err := <-watcher.Errors:
647647
errorCh <- fmt.Errorf("disk update event errored: %v", err)
648648
// watch for events
649-
case event := <-watcher.Events:
649+
case <-watcher.Events:
650650
// In case of an event i.e. creation or deletion of any new PV, we update the VG metadata.
651651
// This might include some non-LVM changes, no harm in updating metadata multiple times.
652652
args := []string{
@@ -658,7 +658,6 @@ func watchDiskDetaches(watcher *fsnotify.Watcher, nodeName string, errorCh chan
658658
klog.Errorf("Error updating volume group's metadata: %v", err)
659659
}
660660
reduceVolumeGroup(getVolumeGroupName(nodeName), true)
661-
klog.V(6).Infof("disk attach/detach event %#v\n", event)
662661
}
663662
}
664663
}

0 commit comments

Comments
 (0)