···

       
1
       
1
       
-
       
From dfb6e2797e7c9166c8dd3dc0d87a4d91474244c7 Mon Sep 17 00:00:00 2001

     

       
1
       
1
       
+
       
From 640d11fae5bcf1fa8c1a54facbe168a256cacc1b Mon Sep 17 00:00:00 2001

     

       
2
       
2
       
 
       
From: Morgan Helton <mhelton@gmail.com>

     

       
3
       
3
       
 
       
Date: Sun, 26 May 2024 12:17:01 -0500

     

       
4
       
4
       
 
       
Subject: [PATCH] envoy: allow specification of external binary

     
···

       
8
       
8
       
 
       
 1 file changed, 16 insertions(+), 4 deletions(-)

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
diff --git a/pkg/envoy/envoy.go b/pkg/envoy/envoy.go

     

       
11
       
11
       
-
       
index 8224f364..bb8b6506 100644

     

       
11
       
11
       
+
       
index 85c725629..4a726a44b 100644

     

       
12
       
12
       
 
       
--- a/pkg/envoy/envoy.go

     

       
13
       
13
       
 
       
+++ b/pkg/envoy/envoy.go

     

       
14
       
14
       
 
       
@@ -8,9 +8,9 @@ import (

     
···

       
21
       
21
       
 
       
-	"path"

     

       
22
       
22
       
 
       
 	"path/filepath"

     

       
23
       
23
       
 
       
 	"regexp"

     

       
24
       
24
       
-
       
 	"strconv"

     

       
25
       
25
       
-
       
@@ -35,8 +35,17 @@ import (

     

       
24
       
24
       
+
       
 	"runtime"

     

       
25
       
25
       
+
       
@@ -36,8 +36,17 @@ import (

     

       
26
       
26
       
 
       
 

     

       
27
       
27
       
 
       
 const (

     

       
28
       
28
       
 
       
 	configFileName = "envoy-config.yaml"

     
···

       
40
       
40
       
 
       
 // A Server is a pomerium proxy implemented via envoy.

     

       
41
       
41
       
 
       
 type Server struct {

     

       
42
       
42
       
 
       
 	ServerOptions

     

       
43
       
43
       
-
       
@@ -94,14 +103,17 @@ func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Buil

     

       
43
       
43
       
+
       
@@ -95,14 +104,17 @@ func NewServer(ctx context.Context, src config.Source, builder *envoyconfig.Buil

     

       
44
       
44
       
 
       
 		log.Ctx(ctx).Debug().Err(err).Msg("couldn't preserve RLIMIT_NOFILE before starting Envoy")

     

       
45
       
45
       
 
       
 	}

     

       
46
       
46
       
 
       
 

     
···

       
62
       
62
       
 
       
 		grpcPort:      src.GetConfig().GRPCPort,

     

       
63
       
63
       
 
       
 		httpPort:      src.GetConfig().HTTPPort,

     

       
64
       
64
       
 
       
-- 

     

       
65
       
65
       
-
       
2.48.1

     

       
65
       
65
       
+
       
2.49.0

     

       
66
       
66
       
 
       


     

···

       
1
       
1
       
 
       
{

     

       
2
       
2
       
-
       
  buildGo123Module,

     

       
2
       
2
       
+
       
  buildGoModule,

     

       
3
       
3
       
 
       
  fetchFromGitHub,

     

       
4
       
4
       
 
       
  lib,

     

       
5
       
5
       
 
       
  envoy,

     
···

       
17
       
17
       
 
       
    mapAttrsToList

     

       
18
       
18
       
 
       
    ;

     

       
19
       
19
       
 
       
in

     

       
20
       
20
       
-
       
buildGo123Module rec {

     

       
20
       
20
       
+
       
buildGoModule rec {

     

       
21
       
21
       
 
       
  pname = "pomerium";

     

       
22
       
22
       
-
       
  version = "0.29.4";

     

       
22
       
22
       
+
       
  version = "0.30.3";

     

       
23
       
23
       
 
       
  src = fetchFromGitHub {

     

       
24
       
24
       
 
       
    owner = "pomerium";

     

       
25
       
25
       
 
       
    repo = "pomerium";

     

       
26
       
26
       
 
       
    rev = "v${version}";

     

       
27
       
27
       
-
       
    hash = "sha256-Oj/wC3rr7CAw2iB0H8yUvzv5VCEIo8kc5sZrxFX6NrI=";

     

       
27
       
27
       
+
       
    hash = "sha256-Rjv4GjyUs9sH+P5kYimxFnE2SBosEWbc7PbKIaVFxsI=";

     

       
28
       
28
       
 
       
  };

     

       
29
       
29
       
 
       


     

       
30
       
30
       
-
       
  vendorHash = "sha256-K9LcGvANajoVKEDIswahD0mT5845qGZzafmWMKkVn8Q=";

     

       
30
       
30
       
+
       
  vendorHash = "sha256-+SvKF54rkBY2wBZOYKuIV30BVqRqICuiPya+HApne1s=";

     

       
31
       
31
       
 
       


     

       
32
       
32
       
 
       
  ui = mkYarnPackage {

     

       
33
       
33
       
 
       
    inherit version;

     

···

       
1
       
1
       
-
       
1fqb1bcsg0k6xazr6v19jav11fl99mm3p9w53hl5xflb974m2lg0

     

       
1
       
1
       
+
       
07zzvqfinl7qqmwh00izvfc0xch2rjr4s8b1ca9ay26krd4d4sap