Skip to content

Commit

Permalink
Bump go control plane (#9)
Browse files Browse the repository at this point in the history 
* got tests passing and removed gogo
* remove .idea
  • Loading branch information
@EItanya @soloio-bulldozer
EItanya authored and soloio-bulldozer[bot] committed Nov 25, 2019
1 parent c0c3485 commit e0d812e
Show file tree
Hide file tree
Showing 6 changed files with 84 additions and 30 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
vendor/
tmp/_output/
target/
target/
.idea
16 changes: 9 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
module github.com/solo-io/envoy-operator

go 1.13

require (
github.com/PuerkitoBio/purell v1.1.0
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578
github.com/davecgh/go-spew v1.1.0
github.com/emicklei/go-restful v2.7.0+incompatible
github.com/envoyproxy/go-control-plane v0.0.0-20180404041657-469a90e97a00
github.com/envoyproxy/go-control-plane v0.9.0
github.com/ghodss/yaml v1.0.0
github.com/go-openapi/jsonpointer v0.0.0-20180322222829-3a0015ad55fa
github.com/go-openapi/jsonreference v0.0.0-20180322222742-3fb327e6747d
Expand All @@ -14,7 +16,7 @@ require (
github.com/gogo/googleapis v1.0.0
github.com/gogo/protobuf v1.0.0
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/protobuf v1.1.0
github.com/golang/protobuf v1.3.2
github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf
github.com/googleapis/gnostic v0.1.0
Expand All @@ -33,12 +35,12 @@ require (
github.com/peterbourgon/diskv v2.0.1+incompatible
github.com/sirupsen/logrus v1.0.5
github.com/spf13/pflag v1.0.1
golang.org/x/crypto v0.0.0-20180502184808-8b1d31080a76
golang.org/x/net v0.0.0-20180502164142-640f4622ab69
golang.org/x/sys v0.0.0-20180501092740-78d5f264b493
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
golang.org/x/net v0.0.0-20190311183353-d8887717615a
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a
golang.org/x/text v0.3.0
google.golang.org/genproto v0.0.0-20180427144745-86e600f69ee4
google.golang.org/grpc v1.11.3
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55
google.golang.org/grpc v1.23.0
gopkg.in/inf.v0 v0.9.1
gopkg.in/yaml.v2 v2.2.1
k8s.io/api v0.0.0-20180127130940-acf347b865f2
Expand Down
47 changes: 47 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,22 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/PuerkitoBio/purell v1.1.0 h1:rmGxhojJlM0tuKtfdvliR84CFHljx9ag64t2xmVkjK4=
github.com/PuerkitoBio/purell v1.1.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/emicklei/go-restful v2.7.0+incompatible h1:DLOt75KPGt7LnFiqlmQGKImiR+updEs3F5/wrYO9P5k=
github.com/emicklei/go-restful v2.7.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
github.com/envoyproxy/go-control-plane v0.0.0-20180404041657-469a90e97a00 h1:gsruLsLtO/FCYV1+MaqMpFp5xHDrlPbiv1X8EpzIw14=
github.com/envoyproxy/go-control-plane v0.0.0-20180404041657-469a90e97a00/go.mod h1:SBwIajubJHhxtWwsL9s8ss4safvEdbitLhGGK48rN6g=
github.com/envoyproxy/go-control-plane v0.9.0 h1:67WMNTvGrl7V1dWdKCeTwxDr7nio9clKoTlLhwIPnT4=
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-openapi/jsonpointer v0.0.0-20180322222829-3a0015ad55fa h1:hr8WVDjg4JKtQptZpzyb196TmruCs7PIsdJz8KAOZp8=
Expand All @@ -24,10 +33,15 @@ github.com/gogo/protobuf v1.0.0 h1:2jyBKDKU/8v3v2xVR2PtiWQviFUyiaGk2rpfyFT8rTM=
github.com/gogo/protobuf v1.0.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
github.com/golang/protobuf v1.1.0 h1:0iH4Ffd/meGoXqF2lSAhZHt8X+cPgkfn/cb6Cce5Vpc=
github.com/golang/protobuf v1.1.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a h1:ZJu5NB1Bk5ms4vw0Xu4i+jD32SE9jQXyfnOvwhHqlT0=
github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
github.com/googleapis/gnostic v0.1.0 h1:rVsPeBmXbYv4If/cumu1AzZPwV58q433hvONV1UEZoI=
Expand Down Expand Up @@ -57,27 +71,60 @@ github.com/operator-framework/operator-sdk v0.0.5/go.mod h1:iVyukRkam5JZa8AnjYf+
github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c/go.mod h1:HUpKUBZnpzkdx0kD/+Yfuft+uD3zHGtXF/XJB14TUr4=
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
github.com/sirupsen/logrus v1.0.5 h1:8c8b5uO0zS4X6RPl/sd1ENwSkIc0/H2PaHxE3udaE8I=
github.com/sirupsen/logrus v1.0.5/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
github.com/spf13/pflag v1.0.1 h1:aCvUg6QPl3ibpQUxyLkrEkCHtPqYJL4x9AuhqVqFis4=
github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
golang.org/x/crypto v0.0.0-20180502184808-8b1d31080a76 h1:gh+YIg3AmkQF6G2X99IpoDDQVDJVOm72RF2fkAoA8iw=
golang.org/x/crypto v0.0.0-20180502184808-8b1d31080a76/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/net v0.0.0-20180502164142-640f4622ab69 h1:+Ybm3UzSfPpp+Hlr62ZTCtbC9DmCKX61f0r74+peGts=
golang.org/x/net v0.0.0-20180502164142-640f4622ab69/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180501092740-78d5f264b493 h1:IdoM71H+6PmWKfe808vA3uKntXqEtc9yMa7A8TxcVVg=
golang.org/x/sys v0.0.0-20180501092740-78d5f264b493/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/genproto v0.0.0-20180427144745-86e600f69ee4 h1:0rk3/gV3HbvCeUzVMhdxV3TEVKMVPDnayjN7sYRmcxY=
google.golang.org/genproto v0.0.0-20180427144745-86e600f69ee4/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/grpc v1.11.3 h1:yy64MFk0j8qZbdXVA0MaSE+s/+6nCUdiyf1uNSjAz0c=
google.golang.org/grpc v1.11.3/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.23.0 h1:AzbTB6ux+okLTzP8Ru1Xs41C303zdcfEht7MQnYJt5A=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
k8s.io/api v0.0.0-20180127130940-acf347b865f2 h1:tKttsdYar5HhU8Ps0R5lelrd4YTZ84urwTOg9q4JcEk=
k8s.io/api v0.0.0-20180127130940-acf347b865f2/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
k8s.io/apimachinery v0.0.0-20180126010752-19e3f5aa3adc h1:+YMPfU/2f9LMz0Sy68+JodreTTgo9PNSpkLw3PakNbs=
Expand Down
14 changes: 7 additions & 7 deletions pkg/downward/transform.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"io/ioutil"
"os"

"github.com/gogo/protobuf/types"
structpb "github.com/golang/protobuf/ptypes/struct"

envoy_config_v2 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2"
"github.com/gogo/protobuf/jsonpb"
"github.com/golang/protobuf/jsonpb"
yaml "gopkg.in/yaml.v2"
)

Expand Down Expand Up @@ -95,13 +95,13 @@ func TransformConfigTemplatesWithApi(bootstrapConfig *envoy_config_v2.Bootstrap,

return nil
}
func transformValue(interpolate func(*string) error, v *types.Value) error {
func transformValue(interpolate func(*string) error, v *structpb.Value) error {
switch v := v.Kind.(type) {
case (*types.Value_StringValue):
case (*structpb.Value_StringValue):
return interpolate(&v.StringValue)
case (*types.Value_StructValue):
case (*structpb.Value_StructValue):
return transformStruct(interpolate, v.StructValue)
case (*types.Value_ListValue):
case (*structpb.Value_ListValue):
for _, val := range v.ListValue.Values {
if err := transformValue(interpolate, val); err != nil {
return err
Expand All @@ -111,7 +111,7 @@ func transformValue(interpolate func(*string) error, v *types.Value) error {
return nil
}

func transformStruct(interpolate func(*string) error, s *types.Struct) error {
func transformStruct(interpolate func(*string) error, s *structpb.Struct) error {
if s == nil {
return nil
}
Expand Down
10 changes: 5 additions & 5 deletions pkg/downward/transform_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

envoy_api_v2_core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
envoy_config_v2 "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2"
"github.com/gogo/protobuf/types"
structpb "github.com/golang/protobuf/ptypes/struct"
api "github.com/solo-io/envoy-operator/pkg/apis/envoy/v1alpha1"
kube "github.com/solo-io/envoy-operator/pkg/kube"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -77,10 +77,10 @@ var _ = Describe("Transform", func() {
})

It("should transform metadata", func() {
bootstrapConfig.Node.Metadata = &types.Struct{
Fields: map[string]*types.Value{
bootstrapConfig.Node.Metadata = &structpb.Struct{
Fields: map[string]*structpb.Value{
"foo": {
Kind: &types.Value_StringValue{
Kind: &structpb.Value_StringValue{
StringValue: "{{.PodName}}",
},
},
Expand All @@ -89,7 +89,7 @@ var _ = Describe("Transform", func() {

err := TransformConfigTemplatesWithApi(bootstrapConfig, api)
Expect(err).NotTo(HaveOccurred())
Expect(bootstrapConfig.Node.Metadata.Fields["foo"].Kind.(*types.Value_StringValue).StringValue).To(Equal("Test"))
Expect(bootstrapConfig.Node.Metadata.Fields["foo"].Kind.(*structpb.Value_StringValue).StringValue).To(Equal("Test"))
})
})
})
24 changes: 14 additions & 10 deletions pkg/kube/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package kube

import (
"path/filepath"
"time"

"github.com/gogo/protobuf/jsonpb"
"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/ptypes/duration"

envoy_api_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2"
envoy_api_v2_auth "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
Expand All @@ -15,12 +15,13 @@ import (
"k8s.io/api/core/v1"
)

func controlPlaneCluster(e *api.Envoy, tlsSecret *v1.Secret) envoy_api_v2.Cluster {
func controlPlaneCluster(e *api.Envoy, tlsSecret *v1.Secret) *envoy_api_v2.Cluster {
var ret envoy_api_v2.Cluster
ret.Name = "ads-control-plane"
ret.Http2ProtocolOptions = &envoy_api_v2_core.Http2ProtocolOptions{}
ret.Type = envoy_api_v2.Cluster_STRICT_DNS
ret.ConnectTimeout = 5 * time.Second
ret.ConnectTimeout = &duration.Duration{
Seconds: 5,
}
ret.Hosts = []*envoy_api_v2_core.Address{{
Address: &envoy_api_v2_core.Address_SocketAddress{
SocketAddress: &envoy_api_v2_core.SocketAddress{
Expand All @@ -43,8 +44,10 @@ func controlPlaneCluster(e *api.Envoy, tlsSecret *v1.Secret) envoy_api_v2.Cluste
// create client tls context
ret.TlsContext = &envoy_api_v2_auth.UpstreamTlsContext{
CommonTlsContext: &envoy_api_v2_auth.CommonTlsContext{
ValidationContext: &envoy_api_v2_auth.CertificateValidationContext{
TrustedCa: toDataSource(TLSCAFile),
ValidationContextType: &envoy_api_v2_auth.CommonTlsContext_ValidationContext{
ValidationContext: &envoy_api_v2_auth.CertificateValidationContext{
TrustedCa: toDataSource(TLSCAFile),
},
},
},
Sni: e.Spec.ADSServer,
Expand All @@ -62,7 +65,7 @@ func controlPlaneCluster(e *api.Envoy, tlsSecret *v1.Secret) envoy_api_v2.Cluste
}
// TODO setup TLS

return ret
return &ret
}

func hasKey(secret *v1.Secret) bool {
Expand Down Expand Up @@ -93,7 +96,7 @@ func GenerateEnvoyConfig(e *api.Envoy, tlsSecret *v1.Secret) (string, error) {
}

bootstrapConfig.StaticResources = &envoy_config_v2.Bootstrap_StaticResources{
Clusters: []envoy_api_v2.Cluster{controlPlaneCluster(e, tlsSecret)},
Clusters: []*envoy_api_v2.Cluster{controlPlaneCluster(e, tlsSecret)},
}
bootstrapConfig.DynamicResources = &envoy_config_v2.Bootstrap_DynamicResources{
AdsConfig: &envoy_api_v2_core.ApiConfigSource{
Expand All @@ -117,9 +120,10 @@ func GenerateEnvoyConfig(e *api.Envoy, tlsSecret *v1.Secret) (string, error) {
},
},
}
bootstrapConfig.Admin = &envoy_config_v2.Admin{}
bootstrapConfig.Admin.AccessLogPath = "/dev/stderr"
if e.Spec.AdminPort != 0 {
bootstrapConfig.Admin.Address = envoy_api_v2_core.Address{
bootstrapConfig.Admin.Address = &envoy_api_v2_core.Address{
Address: &envoy_api_v2_core.Address_SocketAddress{
SocketAddress: &envoy_api_v2_core.SocketAddress{
Address: "0.0.0.0",
Expand Down

0 comments on commit e0d812e

Please sign in to comment.