Skip to content

Commit f04f496

Browse files
halimsamcemakd
authored andcommitted
remove GKE Data Cache Watcher regular event logs since it's generating
alot of no-op logs for customer.
1 parent 5b9665a commit f04f496

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

deploy/kubernetes/base/controller/controller.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,7 @@ spec:
139139
args:
140140
- "--v=5"
141141
- "--endpoint=unix:/csi/csi.sock"
142-
# - "--enable-data-cache"
143-
- "--enable-data-cache=true"
144-
- "--run-node-service=false"
145-
- "--run-controller-service=true"
142+
- --enable-data-cache
146143
env:
147144
- name: GOOGLE_APPLICATION_CREDENTIALS
148145
value: "/etc/cloud-sa/cloud-sa.json"

deploy/kubernetes/base/node_linux/node.yaml

Lines changed: 1 addition & 3 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ func watchDiskDetaches(watcher *fsnotify.Watcher, nodeName string, errorCh chan
631631
case err := <-watcher.Errors:
632632
errorCh <- fmt.Errorf("disk update event errored: %v", err)
633633
// watch for events
634-
case event := <-watcher.Events:
634+
case <-watcher.Events:
635635
// In case of an event i.e. creation or deletion of any new PV, we update the VG metadata.
636636
// This might include some non-LVM changes, no harm in updating metadata multiple times.
637637
args := []string{
@@ -643,7 +643,6 @@ func watchDiskDetaches(watcher *fsnotify.Watcher, nodeName string, errorCh chan
643643
klog.Errorf("Error updating volume group's metadata: %v", err)
644644
}
645645
reduceVolumeGroup(getVolumeGroupName(nodeName), true)
646-
klog.V(6).Infof("disk attach/detach event %#v\n", event)
647646
}
648647
}
649648
}

0 commit comments

Comments
 (0)