Skip to content

Commit ba4e466

Browse files
authored
Merge pull request #1154 from tosi3k/es-pb
Use protobuf encoding for core K8s APIs in external-snapshotter
2 parents d5c03db + 5fd0af2 commit ba4e466

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

cmd/csi-snapshotter/main.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030

3131
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
"k8s.io/apimachinery/pkg/labels"
33+
"k8s.io/apimachinery/pkg/runtime"
3334
coreinformers "k8s.io/client-go/informers"
3435
"k8s.io/client-go/kubernetes"
3536
"k8s.io/client-go/kubernetes/scheme"
@@ -123,7 +124,9 @@ func main() {
123124
config.QPS = (float32)(*kubeAPIQPS)
124125
config.Burst = *kubeAPIBurst
125126

126-
kubeClient, err := kubernetes.NewForConfig(config)
127+
coreConfig := rest.CopyConfig(config)
128+
coreConfig.ContentType = runtime.ContentTypeProtobuf
129+
kubeClient, err := kubernetes.NewForConfig(coreConfig)
127130
if err != nil {
128131
klog.Error(err.Error())
129132
os.Exit(1)

cmd/snapshot-controller/main.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import (
3636
"k8s.io/client-go/util/workqueue"
3737

3838
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
39+
"k8s.io/apimachinery/pkg/runtime"
3940
"k8s.io/apimachinery/pkg/util/wait"
4041

4142
klog "k8s.io/klog/v2"
@@ -166,7 +167,9 @@ func main() {
166167
config.QPS = (float32)(*kubeAPIQPS)
167168
config.Burst = *kubeAPIBurst
168169

169-
kubeClient, err := kubernetes.NewForConfig(config)
170+
coreConfig := rest.CopyConfig(config)
171+
coreConfig.ContentType = runtime.ContentTypeProtobuf
172+
kubeClient, err := kubernetes.NewForConfig(coreConfig)
170173
if err != nil {
171174
klog.Error(err.Error())
172175
os.Exit(1)

0 commit comments

Comments
 (0)