From 07eb88145f409ec74280d3575e887ebaaf9345a4 Mon Sep 17 00:00:00 2001
From: Ole Markus With <o.with@sportradar.com>
Date: Sat, 6 Feb 2021 07:40:07 +0100
Subject: [PATCH] Remove unset config options

---
 upup/models/bindata.go                                        | 4 ----
 .../addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template   | 4 ----
 .../tests/bootstrapchannelbuilder/cilium/manifest.yaml        | 2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/upup/models/bindata.go b/upup/models/bindata.go
index 8ff72be3a8..03d0c383f0 100644
--- a/upup/models/bindata.go
+++ b/upup/models/bindata.go
@@ -31524,10 +31524,6 @@ data:
   config.yaml: |
     peer-service: unix:///var/run/cilium/hubble.sock
     listen-address: :4245
-    dial-timeout: 
-    retry-timeout: 
-    sort-buffer-len-max: 
-    sort-buffer-drain-timeout: 
     disable-client-tls: true
     disable-server-tls: true
 {{ end }}
diff --git a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template
index da3aa4c9a1..e3a08593b2 100644
--- a/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template
+++ b/upup/models/cloudup/resources/addons/networking.cilium.io/k8s-1.12-v1.9.yaml.template
@@ -219,10 +219,6 @@ data:
   config.yaml: |
     peer-service: unix:///var/run/cilium/hubble.sock
     listen-address: :4245
-    dial-timeout: 
-    retry-timeout: 
-    sort-buffer-len-max: 
-    sort-buffer-drain-timeout: 
     disable-client-tls: true
     disable-server-tls: true
 {{ end }}
diff --git a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
index f7b11e660c..3d9323a42c 100644
--- a/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
+++ b/upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/cilium/manifest.yaml
@@ -70,7 +70,7 @@ spec:
     version: 1.17.0
   - id: k8s-1.12
     manifest: networking.cilium.io/k8s-1.12-v1.9.yaml
-    manifestHash: a0358ab8f634e6ce76b1c767c5da573e3645f3cc
+    manifestHash: 2831146cb6f181255c69a09d8e97cc406304a81a
     name: networking.cilium.io
     needsRollingUpdate: all
     selector: