Created
July 8, 2021 05:24
-
-
Save kainz/38f949019a44ea4b9e47fcd24fc06b0f to your computer and use it in GitHub Desktop.
build loop fix for http_config conntrack in golang-git-hub-prometheus-common (needs to be worked into a build profile and probably alternate tag conditional build)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/debian/patches/0004-Disable-Conntrack-For-Loop-Break.patch b/debian/patches/0004-Disable-Conntrack-For-Loop-Break.patch | |
new file mode 100644 | |
index 0000000..5e3d203 | |
--- /dev/null | |
+++ b/debian/patches/0004-Disable-Conntrack-For-Loop-Break.patch | |
@@ -0,0 +1,26 @@ | |
+diff --git a/config/http_config.go b/config/http_config.go | |
+index 4dd8875..38a50dd 100644 | |
+--- a/config/http_config.go | |
++++ b/config/http_config.go | |
+@@ -28,7 +28,7 @@ import ( | |
+ "sync" | |
+ "time" | |
+ | |
+- "github.com/mwitkow/go-conntrack" | |
++ //"github.com/mwitkow/go-conntrack" // removing temporarily to break build loop | |
+ "golang.org/x/net/http2" | |
+ "gopkg.in/yaml.v2" | |
+ ) | |
+@@ -167,10 +167,10 @@ func NewRoundTripperFromConfig(cfg HTTPClientConfig, name string, disableKeepAli | |
+ IdleConnTimeout: 5 * time.Minute, | |
+ TLSHandshakeTimeout: 10 * time.Second, | |
+ ExpectContinueTimeout: 1 * time.Second, | |
+- DialContext: conntrack.NewDialContextFunc( | |
++ /* DialContext: conntrack.NewDialContextFunc( | |
+ conntrack.DialWithTracing(), | |
+ conntrack.DialWithName(name), | |
+- ), | |
++ ), // temporary to break build loop */ | |
+ } | |
+ if enableHTTP2 { | |
+ // HTTP/2 support is golang has many problematic cornercases where |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment