diff --git a/.licensei.toml b/.licensei.toml
index 9a9bfaa50..280d44763 100644
--- a/.licensei.toml
+++ b/.licensei.toml
@@ -8,6 +8,7 @@ approved = [
ignored = [
"github.com/ghodss/yaml",
+ "github.com/waynz0r/protobuf",
"github.com/gogo/protobuf",
"google.golang.org/protobuf",
"sigs.k8s.io/yaml",
diff --git a/api/go.mod b/api/go.mod
index 2e2937b60..74b8fa0f5 100644
--- a/api/go.mod
+++ b/api/go.mod
@@ -3,7 +3,7 @@ module github.com/banzaicloud/istio-operator/api/v2
go 1.17
require (
- github.com/gogo/protobuf v1.3.2
+ github.com/waynz0r/protobuf v1.3.2-bzc
istio.io/api v0.0.0-20210420153121-f5a13670bedf
istio.io/gogo-genproto v0.0.0-20210113155706-4daf5697332f
k8s.io/api v0.20.2
@@ -13,12 +13,13 @@ require (
require (
github.com/go-logr/logr v0.2.0 // indirect
+ github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
- golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
- golang.org/x/text v0.3.4 // indirect
+ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
+ golang.org/x/text v0.3.6 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.3.0 // indirect
k8s.io/klog/v2 v2.4.0 // indirect
diff --git a/api/go.sum b/api/go.sum
index a0f7a1769..6af620e05 100644
--- a/api/go.sum
+++ b/api/go.sum
@@ -145,6 +145,8 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq
github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
@@ -152,8 +154,9 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM=
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
github.com/google/gofuzz v1.1.0 h1:Hsa8mG0dQ46ij8Sl2AYJDUv1oA9/d6Vk+3LG99Oe02g=
github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -193,6 +196,7 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/errcheck v1.6.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
@@ -290,10 +294,13 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
+github.com/waynz0r/protobuf v1.3.2-bzc h1:H2/fnV+jX6jqXM6Lg44ZjIibjLzO4lurEDGrceUtZ2E=
+github.com/waynz0r/protobuf v1.3.2-bzc/go.mod h1:gUzVe56rS+viQfZ+Y9FjXl0n5d5KmNvF7s/dcvluQxA=
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg=
go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM=
@@ -321,6 +328,7 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
golang.org/x/net v0.0.0-20170114055629-f2499483f923/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=
@@ -342,8 +350,9 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b h1:uwuIcX0g4Yl1NC5XAz37xsr2lTtcqevgzYNVt49waME=
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -354,6 +363,7 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/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-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -375,15 +385,20 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY=
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc=
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -403,6 +418,7 @@ golang.org/x/tools v0.0.0-20190920225731-5eefd052ad72/go.mod h1:b+2E5dAYhXwXZwtn
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -434,6 +450,8 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -481,7 +499,6 @@ k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
-k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
diff --git a/api/v1alpha1/common.go b/api/v1alpha1/common.go
index e72bec283..090ac907a 100644
--- a/api/v1alpha1/common.go
+++ b/api/v1alpha1/common.go
@@ -19,7 +19,7 @@ package v1alpha1
import (
"strconv"
- "github.com/gogo/protobuf/jsonpb"
+ "github.com/waynz0r/protobuf/jsonpb"
"k8s.io/apimachinery/pkg/api/resource"
"k8s.io/apimachinery/pkg/util/intstr"
)
diff --git a/api/v1alpha1/common.pb.go b/api/v1alpha1/common.pb.go
index 3e2aad3a2..ecc15e6dc 100644
--- a/api/v1alpha1/common.pb.go
+++ b/api/v1alpha1/common.pb.go
@@ -5,11 +5,11 @@ package v1alpha1
import (
fmt "fmt"
- _ "github.com/gogo/protobuf/gogoproto"
- proto "github.com/gogo/protobuf/proto"
- descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
- _ "github.com/gogo/protobuf/types"
- github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
+ _ "github.com/waynz0r/protobuf/gogoproto"
+ proto "github.com/waynz0r/protobuf/proto"
+ descriptor "github.com/waynz0r/protobuf/protoc-gen-gogo/descriptor"
+ _ "github.com/waynz0r/protobuf/types"
+ github_com_waynz0r_protobuf_types "github.com/waynz0r/protobuf/types"
io "io"
_ "istio.io/gogo-genproto/googleapis/google/api"
_ "k8s.io/api/apps/v1"
@@ -2617,7 +2617,7 @@ func (m *Service) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x72
}
if m.PublishNotReadyAddresses != nil {
- n21, err21 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.PublishNotReadyAddresses, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.PublishNotReadyAddresses):])
+ n21, err21 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.PublishNotReadyAddresses, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.PublishNotReadyAddresses):])
if err21 != nil {
return 0, err21
}
@@ -2785,7 +2785,7 @@ func (m *UnprotectedService) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x72
}
if m.PublishNotReadyAddresses != nil {
- n24, err24 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.PublishNotReadyAddresses, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.PublishNotReadyAddresses):])
+ n24, err24 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.PublishNotReadyAddresses, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.PublishNotReadyAddresses):])
if err24 != nil {
return 0, err24
}
@@ -3103,7 +3103,7 @@ func (m *Replicas) MarshalToSizedBuffer(dAtA []byte) (int, error) {
copy(dAtA[i:], m.XXX_unrecognized)
}
if m.TargetCPUUtilizationPercentage != nil {
- n28, err28 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*m.TargetCPUUtilizationPercentage, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32(*m.TargetCPUUtilizationPercentage):])
+ n28, err28 := github_com_waynz0r_protobuf_types.StdInt32MarshalTo(*m.TargetCPUUtilizationPercentage, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdInt32(*m.TargetCPUUtilizationPercentage):])
if err28 != nil {
return 0, err28
}
@@ -3113,7 +3113,7 @@ func (m *Replicas) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x22
}
if m.Max != nil {
- n29, err29 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*m.Max, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32(*m.Max):])
+ n29, err29 := github_com_waynz0r_protobuf_types.StdInt32MarshalTo(*m.Max, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdInt32(*m.Max):])
if err29 != nil {
return 0, err29
}
@@ -3123,7 +3123,7 @@ func (m *Replicas) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x1a
}
if m.Min != nil {
- n30, err30 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*m.Min, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32(*m.Min):])
+ n30, err30 := github_com_waynz0r_protobuf_types.StdInt32MarshalTo(*m.Min, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdInt32(*m.Min):])
if err30 != nil {
return 0, err30
}
@@ -3133,7 +3133,7 @@ func (m *Replicas) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x12
}
if m.Count != nil {
- n31, err31 := github_com_gogo_protobuf_types.StdInt32MarshalTo(*m.Count, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdInt32(*m.Count):])
+ n31, err31 := github_com_waynz0r_protobuf_types.StdInt32MarshalTo(*m.Count, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdInt32(*m.Count):])
if err31 != nil {
return 0, err31
}
@@ -3649,7 +3649,7 @@ func (m *Service) Size() (n int) {
n += 1 + sovCommon(uint64(m.HealthCheckNodePort))
}
if m.PublishNotReadyAddresses != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.PublishNotReadyAddresses)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.PublishNotReadyAddresses)
n += 1 + l + sovCommon(uint64(l))
}
if m.SessionAffinityConfig != nil {
@@ -3730,7 +3730,7 @@ func (m *UnprotectedService) Size() (n int) {
n += 1 + sovCommon(uint64(m.HealthCheckNodePort))
}
if m.PublishNotReadyAddresses != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.PublishNotReadyAddresses)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.PublishNotReadyAddresses)
n += 1 + l + sovCommon(uint64(l))
}
if m.SessionAffinityConfig != nil {
@@ -3846,19 +3846,19 @@ func (m *Replicas) Size() (n int) {
var l int
_ = l
if m.Count != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdInt32(*m.Count)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdInt32(*m.Count)
n += 1 + l + sovCommon(uint64(l))
}
if m.Min != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdInt32(*m.Min)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdInt32(*m.Min)
n += 1 + l + sovCommon(uint64(l))
}
if m.Max != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdInt32(*m.Max)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdInt32(*m.Max)
n += 1 + l + sovCommon(uint64(l))
}
if m.TargetCPUUtilizationPercentage != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdInt32(*m.TargetCPUUtilizationPercentage)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdInt32(*m.TargetCPUUtilizationPercentage)
n += 1 + l + sovCommon(uint64(l))
}
if m.XXX_unrecognized != nil {
@@ -6360,7 +6360,7 @@ func (m *Service) Unmarshal(dAtA []byte) error {
if m.PublishNotReadyAddresses == nil {
m.PublishNotReadyAddresses = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.PublishNotReadyAddresses, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.PublishNotReadyAddresses, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -6987,7 +6987,7 @@ func (m *UnprotectedService) Unmarshal(dAtA []byte) error {
if m.PublishNotReadyAddresses == nil {
m.PublishNotReadyAddresses = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.PublishNotReadyAddresses, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.PublishNotReadyAddresses, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -7791,7 +7791,7 @@ func (m *Replicas) Unmarshal(dAtA []byte) error {
if m.Count == nil {
m.Count = new(int32)
}
- if err := github_com_gogo_protobuf_types.StdInt32Unmarshal(m.Count, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdInt32Unmarshal(m.Count, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -7827,7 +7827,7 @@ func (m *Replicas) Unmarshal(dAtA []byte) error {
if m.Min == nil {
m.Min = new(int32)
}
- if err := github_com_gogo_protobuf_types.StdInt32Unmarshal(m.Min, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdInt32Unmarshal(m.Min, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -7863,7 +7863,7 @@ func (m *Replicas) Unmarshal(dAtA []byte) error {
if m.Max == nil {
m.Max = new(int32)
}
- if err := github_com_gogo_protobuf_types.StdInt32Unmarshal(m.Max, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdInt32Unmarshal(m.Max, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -7899,7 +7899,7 @@ func (m *Replicas) Unmarshal(dAtA []byte) error {
if m.TargetCPUUtilizationPercentage == nil {
m.TargetCPUUtilizationPercentage = new(int32)
}
- if err := github_com_gogo_protobuf_types.StdInt32Unmarshal(m.TargetCPUUtilizationPercentage, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdInt32Unmarshal(m.TargetCPUUtilizationPercentage, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
diff --git a/api/v1alpha1/common.pb.html b/api/v1alpha1/common.pb.html
index bac0654f8..fbfd19061 100644
--- a/api/v1alpha1/common.pb.html
+++ b/api/v1alpha1/common.pb.html
@@ -577,7 +577,7 @@ Service
-Yes
+No
|
@@ -640,7 +640,7 @@ Service
-Yes
+No
|
@@ -1120,7 +1120,7 @@ ServicePort
-Yes
+No
|
diff --git a/api/v1alpha1/common_deepcopy.gen.go b/api/v1alpha1/common_deepcopy.gen.go
index ad7669e5b..85f9e4bf2 100644
--- a/api/v1alpha1/common_deepcopy.gen.go
+++ b/api/v1alpha1/common_deepcopy.gen.go
@@ -5,10 +5,10 @@ package v1alpha1
import (
fmt "fmt"
- _ "github.com/gogo/protobuf/gogoproto"
- proto "github.com/gogo/protobuf/proto"
- _ "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
- _ "github.com/gogo/protobuf/types"
+ _ "github.com/waynz0r/protobuf/gogoproto"
+ proto "github.com/waynz0r/protobuf/proto"
+ _ "github.com/waynz0r/protobuf/protoc-gen-gogo/descriptor"
+ _ "github.com/waynz0r/protobuf/types"
_ "istio.io/gogo-genproto/googleapis/google/api"
_ "k8s.io/api/apps/v1"
_ "k8s.io/api/core/v1"
diff --git a/api/v1alpha1/common_json.gen.go b/api/v1alpha1/common_json.gen.go
index b2173918c..547df4e41 100644
--- a/api/v1alpha1/common_json.gen.go
+++ b/api/v1alpha1/common_json.gen.go
@@ -6,11 +6,11 @@ package v1alpha1
import (
bytes "bytes"
fmt "fmt"
- _ "github.com/gogo/protobuf/gogoproto"
- github_com_gogo_protobuf_jsonpb "github.com/gogo/protobuf/jsonpb"
- proto "github.com/gogo/protobuf/proto"
- _ "github.com/gogo/protobuf/protoc-gen-gogo/descriptor"
- _ "github.com/gogo/protobuf/types"
+ _ "github.com/waynz0r/protobuf/gogoproto"
+ github_com_waynz0r_protobuf_jsonpb "github.com/waynz0r/protobuf/jsonpb"
+ proto "github.com/waynz0r/protobuf/proto"
+ _ "github.com/waynz0r/protobuf/protoc-gen-gogo/descriptor"
+ _ "github.com/waynz0r/protobuf/types"
_ "istio.io/gogo-genproto/googleapis/google/api"
_ "k8s.io/api/apps/v1"
_ "k8s.io/api/core/v1"
@@ -222,6 +222,6 @@ func (this *IntOrString) UnmarshalJSON(b []byte) error {
}
var (
- CommonMarshaler = &github_com_gogo_protobuf_jsonpb.Marshaler{Int64Uint64asIntegers: true}
- CommonUnmarshaler = &github_com_gogo_protobuf_jsonpb.Unmarshaler{AllowUnknownFields: true}
+ CommonMarshaler = &github_com_waynz0r_protobuf_jsonpb.Marshaler{Int64Uint64asIntegers: true}
+ CommonUnmarshaler = &github_com_waynz0r_protobuf_jsonpb.Unmarshaler{AllowUnknownFields: true}
)
diff --git a/api/v1alpha1/istiocontrolplane.pb.go b/api/v1alpha1/istiocontrolplane.pb.go
index 279306f2f..99d2dd734 100644
--- a/api/v1alpha1/istiocontrolplane.pb.go
+++ b/api/v1alpha1/istiocontrolplane.pb.go
@@ -5,10 +5,10 @@ package v1alpha1
import (
fmt "fmt"
- _ "github.com/gogo/protobuf/gogoproto"
- proto "github.com/gogo/protobuf/proto"
- _ "github.com/gogo/protobuf/types"
- github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
+ _ "github.com/waynz0r/protobuf/gogoproto"
+ proto "github.com/waynz0r/protobuf/proto"
+ _ "github.com/waynz0r/protobuf/types"
+ github_com_waynz0r_protobuf_types "github.com/waynz0r/protobuf/types"
io "io"
v1alpha1 "istio.io/api/mesh/v1alpha1"
_ "istio.io/gogo-genproto/googleapis/google/api"
@@ -2493,7 +2493,7 @@ func (m *IstioControlPlaneSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x60
}
if m.WatchOneNamespace != nil {
- n6, err6 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.WatchOneNamespace, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.WatchOneNamespace):])
+ n6, err6 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.WatchOneNamespace, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.WatchOneNamespace):])
if err6 != nil {
return 0, err6
}
@@ -2575,7 +2575,7 @@ func (m *IstioControlPlaneSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x2a
}
if m.MountMtlsCerts != nil {
- n13, err13 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.MountMtlsCerts, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.MountMtlsCerts):])
+ n13, err13 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.MountMtlsCerts, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.MountMtlsCerts):])
if err13 != nil {
return 0, err13
}
@@ -2735,7 +2735,7 @@ func (m *MeshExpansionConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, err
dAtA[i] = 0x12
}
if m.Enabled != nil {
- n21, err21 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled):])
+ n21, err21 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled):])
if err21 != nil {
return 0, err21
}
@@ -2772,7 +2772,7 @@ func (m *MeshExpansionConfiguration_Istiod) MarshalToSizedBuffer(dAtA []byte) (i
copy(dAtA[i:], m.XXX_unrecognized)
}
if m.Expose != nil {
- n22, err22 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Expose, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Expose):])
+ n22, err22 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Expose, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Expose):])
if err22 != nil {
return 0, err22
}
@@ -2809,7 +2809,7 @@ func (m *MeshExpansionConfiguration_Webhook) MarshalToSizedBuffer(dAtA []byte) (
copy(dAtA[i:], m.XXX_unrecognized)
}
if m.Expose != nil {
- n23, err23 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Expose, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Expose):])
+ n23, err23 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Expose, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Expose):])
if err23 != nil {
return 0, err23
}
@@ -2846,7 +2846,7 @@ func (m *MeshExpansionConfiguration_ClusterServices) MarshalToSizedBuffer(dAtA [
copy(dAtA[i:], m.XXX_unrecognized)
}
if m.Expose != nil {
- n24, err24 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Expose, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Expose):])
+ n24, err24 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Expose, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Expose):])
if err24 != nil {
return 0, err24
}
@@ -2897,7 +2897,7 @@ func (m *MeshExpansionConfiguration_IstioMeshGatewayConfiguration) MarshalToSize
}
}
if m.RunAsRoot != nil {
- n25, err25 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.RunAsRoot, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.RunAsRoot):])
+ n25, err25 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.RunAsRoot, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.RunAsRoot):])
if err25 != nil {
return 0, err25
}
@@ -3090,7 +3090,7 @@ func (m *ProxyConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x42
}
if m.HoldApplicationUntilProxyStarts != nil {
- n31, err31 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.HoldApplicationUntilProxyStarts, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.HoldApplicationUntilProxyStarts):])
+ n31, err31 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.HoldApplicationUntilProxyStarts, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.HoldApplicationUntilProxyStarts):])
if err31 != nil {
return 0, err31
}
@@ -3119,7 +3119,7 @@ func (m *ProxyConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x20
}
if m.EnableCoreDump != nil {
- n32, err32 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.EnableCoreDump, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.EnableCoreDump):])
+ n32, err32 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.EnableCoreDump, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.EnableCoreDump):])
if err32 != nil {
return 0, err32
}
@@ -3129,7 +3129,7 @@ func (m *ProxyConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x1a
}
if m.Privileged != nil {
- n33, err33 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Privileged, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Privileged):])
+ n33, err33 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Privileged, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Privileged):])
if err33 != nil {
return 0, err33
}
@@ -3332,7 +3332,7 @@ func (m *CNIConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x22
}
if m.Chained != nil {
- n40, err40 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Chained, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Chained):])
+ n40, err40 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Chained, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Chained):])
if err40 != nil {
return 0, err40
}
@@ -3342,7 +3342,7 @@ func (m *CNIConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x12
}
if m.Enabled != nil {
- n41, err41 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled):])
+ n41, err41 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled):])
if err41 != nil {
return 0, err41
}
@@ -3400,7 +3400,7 @@ func (m *CNIConfiguration_RepairConfiguration) MarshalToSizedBuffer(dAtA []byte)
dAtA[i] = 0x22
}
if m.DeletePods != nil {
- n42, err42 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.DeletePods, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.DeletePods):])
+ n42, err42 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.DeletePods, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.DeletePods):])
if err42 != nil {
return 0, err42
}
@@ -3410,7 +3410,7 @@ func (m *CNIConfiguration_RepairConfiguration) MarshalToSizedBuffer(dAtA []byte)
dAtA[i] = 0x1a
}
if m.LabelPods != nil {
- n43, err43 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.LabelPods, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.LabelPods):])
+ n43, err43 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.LabelPods, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.LabelPods):])
if err43 != nil {
return 0, err43
}
@@ -3420,7 +3420,7 @@ func (m *CNIConfiguration_RepairConfiguration) MarshalToSizedBuffer(dAtA []byte)
dAtA[i] = 0x12
}
if m.Enabled != nil {
- n44, err44 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled):])
+ n44, err44 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled):])
if err44 != nil {
return 0, err44
}
@@ -3469,7 +3469,7 @@ func (m *CNIConfiguration_TaintConfiguration) MarshalToSizedBuffer(dAtA []byte)
dAtA[i] = 0x12
}
if m.Enabled != nil {
- n46, err46 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled):])
+ n46, err46 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled):])
if err46 != nil {
return 0, err46
}
@@ -3522,7 +3522,7 @@ func (m *CNIConfiguration_ResourceQuotas) MarshalToSizedBuffer(dAtA []byte) (int
dAtA[i] = 0x12
}
if m.Enabled != nil {
- n47, err47 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled):])
+ n47, err47 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled):])
if err47 != nil {
return 0, err47
}
@@ -3576,7 +3576,7 @@ func (m *IstiodConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x40
}
if m.EnableProtocolSniffingInbound != nil {
- n49, err49 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.EnableProtocolSniffingInbound, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.EnableProtocolSniffingInbound):])
+ n49, err49 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.EnableProtocolSniffingInbound, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.EnableProtocolSniffingInbound):])
if err49 != nil {
return 0, err49
}
@@ -3586,7 +3586,7 @@ func (m *IstiodConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x3a
}
if m.EnableProtocolSniffingOutbound != nil {
- n50, err50 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.EnableProtocolSniffingOutbound, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.EnableProtocolSniffingOutbound):])
+ n50, err50 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.EnableProtocolSniffingOutbound, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.EnableProtocolSniffingOutbound):])
if err50 != nil {
return 0, err50
}
@@ -3596,7 +3596,7 @@ func (m *IstiodConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x32
}
if m.TraceSampling != nil {
- n51, err51 := github_com_gogo_protobuf_types.StdFloatMarshalTo(*m.TraceSampling, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdFloat(*m.TraceSampling):])
+ n51, err51 := github_com_waynz0r_protobuf_types.StdFloatMarshalTo(*m.TraceSampling, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdFloat(*m.TraceSampling):])
if err51 != nil {
return 0, err51
}
@@ -3618,7 +3618,7 @@ func (m *IstiodConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x22
}
if m.EnableStatus != nil {
- n53, err53 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.EnableStatus, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.EnableStatus):])
+ n53, err53 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.EnableStatus, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.EnableStatus):])
if err53 != nil {
return 0, err53
}
@@ -3628,7 +3628,7 @@ func (m *IstiodConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x1a
}
if m.EnableAnalysis != nil {
- n54, err54 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.EnableAnalysis, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.EnableAnalysis):])
+ n54, err54 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.EnableAnalysis, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.EnableAnalysis):])
if err54 != nil {
return 0, err54
}
@@ -3677,7 +3677,7 @@ func (m *ExternalIstiodConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, er
copy(dAtA[i:], m.XXX_unrecognized)
}
if m.Enabled != nil {
- n56, err56 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled):])
+ n56, err56 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled):])
if err56 != nil {
return 0, err56
}
@@ -3753,7 +3753,7 @@ func (m *OperatorEndpointsConfiguration) MarshalToSizedBuffer(dAtA []byte) (int,
copy(dAtA[i:], m.XXX_unrecognized)
}
if m.Enabled != nil {
- n58, err58 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled):])
+ n58, err58 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled):])
if err58 != nil {
return 0, err58
}
@@ -3790,7 +3790,7 @@ func (m *TelemetryV2Configuration) MarshalToSizedBuffer(dAtA []byte) (int, error
copy(dAtA[i:], m.XXX_unrecognized)
}
if m.Enabled != nil {
- n59, err59 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled):])
+ n59, err59 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled):])
if err59 != nil {
return 0, err59
}
@@ -3827,7 +3827,7 @@ func (m *ProxyWasmConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error)
copy(dAtA[i:], m.XXX_unrecognized)
}
if m.Enabled != nil {
- n60, err60 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled):])
+ n60, err60 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled):])
if err60 != nil {
return 0, err60
}
@@ -3864,7 +3864,7 @@ func (m *PDBConfiguration) MarshalToSizedBuffer(dAtA []byte) (int, error) {
copy(dAtA[i:], m.XXX_unrecognized)
}
if m.Enabled != nil {
- n61, err61 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled):])
+ n61, err61 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.Enabled, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled):])
if err61 != nil {
return 0, err61
}
@@ -4098,7 +4098,7 @@ func (m *IstioControlPlaneSpec) Size() (n int) {
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.MountMtlsCerts != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.MountMtlsCerts)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.MountMtlsCerts)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.Istiod != nil {
@@ -4126,7 +4126,7 @@ func (m *IstioControlPlaneSpec) Size() (n int) {
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.WatchOneNamespace != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.WatchOneNamespace)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.WatchOneNamespace)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.JwtPolicy != 0 {
@@ -4211,7 +4211,7 @@ func (m *MeshExpansionConfiguration) Size() (n int) {
var l int
_ = l
if m.Enabled != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.Gateway != nil {
@@ -4243,7 +4243,7 @@ func (m *MeshExpansionConfiguration_Istiod) Size() (n int) {
var l int
_ = l
if m.Expose != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Expose)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Expose)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.XXX_unrecognized != nil {
@@ -4259,7 +4259,7 @@ func (m *MeshExpansionConfiguration_Webhook) Size() (n int) {
var l int
_ = l
if m.Expose != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Expose)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Expose)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.XXX_unrecognized != nil {
@@ -4275,7 +4275,7 @@ func (m *MeshExpansionConfiguration_ClusterServices) Size() (n int) {
var l int
_ = l
if m.Expose != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Expose)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Expose)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.XXX_unrecognized != nil {
@@ -4303,7 +4303,7 @@ func (m *MeshExpansionConfiguration_IstioMeshGatewayConfiguration) Size() (n int
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.RunAsRoot != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.RunAsRoot)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.RunAsRoot)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if len(m.K8SResourceOverlays) > 0 {
@@ -4361,11 +4361,11 @@ func (m *ProxyConfiguration) Size() (n int) {
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.Privileged != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Privileged)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Privileged)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.EnableCoreDump != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.EnableCoreDump)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.EnableCoreDump)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.LogLevel != 0 {
@@ -4380,7 +4380,7 @@ func (m *ProxyConfiguration) Size() (n int) {
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.HoldApplicationUntilProxyStarts != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.HoldApplicationUntilProxyStarts)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.HoldApplicationUntilProxyStarts)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.Lifecycle != nil {
@@ -4444,11 +4444,11 @@ func (m *CNIConfiguration) Size() (n int) {
var l int
_ = l
if m.Enabled != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.Chained != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Chained)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Chained)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
l = len(m.BinDir)
@@ -4512,15 +4512,15 @@ func (m *CNIConfiguration_RepairConfiguration) Size() (n int) {
var l int
_ = l
if m.Enabled != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.LabelPods != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.LabelPods)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.LabelPods)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.DeletePods != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.DeletePods)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.DeletePods)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
l = len(m.InitContainerName)
@@ -4548,7 +4548,7 @@ func (m *CNIConfiguration_TaintConfiguration) Size() (n int) {
var l int
_ = l
if m.Enabled != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.Container != nil {
@@ -4568,7 +4568,7 @@ func (m *CNIConfiguration_ResourceQuotas) Size() (n int) {
var l int
_ = l
if m.Enabled != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
l = len(m.Pods)
@@ -4598,11 +4598,11 @@ func (m *IstiodConfiguration) Size() (n int) {
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.EnableAnalysis != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.EnableAnalysis)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.EnableAnalysis)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.EnableStatus != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.EnableStatus)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.EnableStatus)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.ExternalIstiod != nil {
@@ -4610,15 +4610,15 @@ func (m *IstiodConfiguration) Size() (n int) {
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.TraceSampling != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdFloat(*m.TraceSampling)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdFloat(*m.TraceSampling)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.EnableProtocolSniffingOutbound != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.EnableProtocolSniffingOutbound)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.EnableProtocolSniffingOutbound)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.EnableProtocolSniffingInbound != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.EnableProtocolSniffingInbound)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.EnableProtocolSniffingInbound)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.CertProvider != 0 {
@@ -4641,7 +4641,7 @@ func (m *ExternalIstiodConfiguration) Size() (n int) {
var l int
_ = l
if m.Enabled != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.XXX_unrecognized != nil {
@@ -4673,7 +4673,7 @@ func (m *OperatorEndpointsConfiguration) Size() (n int) {
var l int
_ = l
if m.Enabled != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.XXX_unrecognized != nil {
@@ -4689,7 +4689,7 @@ func (m *TelemetryV2Configuration) Size() (n int) {
var l int
_ = l
if m.Enabled != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.XXX_unrecognized != nil {
@@ -4705,7 +4705,7 @@ func (m *ProxyWasmConfiguration) Size() (n int) {
var l int
_ = l
if m.Enabled != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.XXX_unrecognized != nil {
@@ -4721,7 +4721,7 @@ func (m *PDBConfiguration) Size() (n int) {
var l int
_ = l
if m.Enabled != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.Enabled)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.Enabled)
n += 1 + l + sovIstiocontrolplane(uint64(l))
}
if m.XXX_unrecognized != nil {
@@ -4981,7 +4981,7 @@ func (m *IstioControlPlaneSpec) Unmarshal(dAtA []byte) error {
if m.MountMtlsCerts == nil {
m.MountMtlsCerts = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.MountMtlsCerts, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.MountMtlsCerts, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -5233,7 +5233,7 @@ func (m *IstioControlPlaneSpec) Unmarshal(dAtA []byte) error {
if m.WatchOneNamespace == nil {
m.WatchOneNamespace = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.WatchOneNamespace, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.WatchOneNamespace, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -5836,7 +5836,7 @@ func (m *MeshExpansionConfiguration) Unmarshal(dAtA []byte) error {
if m.Enabled == nil {
m.Enabled = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -6067,7 +6067,7 @@ func (m *MeshExpansionConfiguration_Istiod) Unmarshal(dAtA []byte) error {
if m.Expose == nil {
m.Expose = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Expose, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Expose, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -6154,7 +6154,7 @@ func (m *MeshExpansionConfiguration_Webhook) Unmarshal(dAtA []byte) error {
if m.Expose == nil {
m.Expose = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Expose, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Expose, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -6241,7 +6241,7 @@ func (m *MeshExpansionConfiguration_ClusterServices) Unmarshal(dAtA []byte) erro
if m.Expose == nil {
m.Expose = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Expose, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Expose, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -6436,7 +6436,7 @@ func (m *MeshExpansionConfiguration_IstioMeshGatewayConfiguration) Unmarshal(dAt
if m.RunAsRoot == nil {
m.RunAsRoot = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.RunAsRoot, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.RunAsRoot, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -6755,7 +6755,7 @@ func (m *ProxyConfiguration) Unmarshal(dAtA []byte) error {
if m.Privileged == nil {
m.Privileged = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Privileged, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Privileged, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -6791,7 +6791,7 @@ func (m *ProxyConfiguration) Unmarshal(dAtA []byte) error {
if m.EnableCoreDump == nil {
m.EnableCoreDump = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.EnableCoreDump, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.EnableCoreDump, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -6910,7 +6910,7 @@ func (m *ProxyConfiguration) Unmarshal(dAtA []byte) error {
if m.HoldApplicationUntilProxyStarts == nil {
m.HoldApplicationUntilProxyStarts = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.HoldApplicationUntilProxyStarts, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.HoldApplicationUntilProxyStarts, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -7352,7 +7352,7 @@ func (m *CNIConfiguration) Unmarshal(dAtA []byte) error {
if m.Enabled == nil {
m.Enabled = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -7388,7 +7388,7 @@ func (m *CNIConfiguration) Unmarshal(dAtA []byte) error {
if m.Chained == nil {
m.Chained = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Chained, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Chained, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -7843,7 +7843,7 @@ func (m *CNIConfiguration_RepairConfiguration) Unmarshal(dAtA []byte) error {
if m.Enabled == nil {
m.Enabled = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -7879,7 +7879,7 @@ func (m *CNIConfiguration_RepairConfiguration) Unmarshal(dAtA []byte) error {
if m.LabelPods == nil {
m.LabelPods = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.LabelPods, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.LabelPods, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -7915,7 +7915,7 @@ func (m *CNIConfiguration_RepairConfiguration) Unmarshal(dAtA []byte) error {
if m.DeletePods == nil {
m.DeletePods = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.DeletePods, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.DeletePods, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -8098,7 +8098,7 @@ func (m *CNIConfiguration_TaintConfiguration) Unmarshal(dAtA []byte) error {
if m.Enabled == nil {
m.Enabled = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -8221,7 +8221,7 @@ func (m *CNIConfiguration_ResourceQuotas) Unmarshal(dAtA []byte) error {
if m.Enabled == nil {
m.Enabled = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -8408,7 +8408,7 @@ func (m *IstiodConfiguration) Unmarshal(dAtA []byte) error {
if m.EnableAnalysis == nil {
m.EnableAnalysis = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.EnableAnalysis, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.EnableAnalysis, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -8444,7 +8444,7 @@ func (m *IstiodConfiguration) Unmarshal(dAtA []byte) error {
if m.EnableStatus == nil {
m.EnableStatus = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.EnableStatus, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.EnableStatus, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -8516,7 +8516,7 @@ func (m *IstiodConfiguration) Unmarshal(dAtA []byte) error {
if m.TraceSampling == nil {
m.TraceSampling = new(float32)
}
- if err := github_com_gogo_protobuf_types.StdFloatUnmarshal(m.TraceSampling, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdFloatUnmarshal(m.TraceSampling, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -8552,7 +8552,7 @@ func (m *IstiodConfiguration) Unmarshal(dAtA []byte) error {
if m.EnableProtocolSniffingOutbound == nil {
m.EnableProtocolSniffingOutbound = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.EnableProtocolSniffingOutbound, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.EnableProtocolSniffingOutbound, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -8588,7 +8588,7 @@ func (m *IstiodConfiguration) Unmarshal(dAtA []byte) error {
if m.EnableProtocolSniffingInbound == nil {
m.EnableProtocolSniffingInbound = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.EnableProtocolSniffingInbound, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.EnableProtocolSniffingInbound, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -8730,7 +8730,7 @@ func (m *ExternalIstiodConfiguration) Unmarshal(dAtA []byte) error {
if m.Enabled == nil {
m.Enabled = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -8904,7 +8904,7 @@ func (m *OperatorEndpointsConfiguration) Unmarshal(dAtA []byte) error {
if m.Enabled == nil {
m.Enabled = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -8991,7 +8991,7 @@ func (m *TelemetryV2Configuration) Unmarshal(dAtA []byte) error {
if m.Enabled == nil {
m.Enabled = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -9078,7 +9078,7 @@ func (m *ProxyWasmConfiguration) Unmarshal(dAtA []byte) error {
if m.Enabled == nil {
m.Enabled = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@@ -9165,7 +9165,7 @@ func (m *PDBConfiguration) Unmarshal(dAtA []byte) error {
if m.Enabled == nil {
m.Enabled = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.Enabled, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
diff --git a/api/v1alpha1/istiocontrolplane.pb.html b/api/v1alpha1/istiocontrolplane.pb.html
index fbe347bde..24feed18e 100644
--- a/api/v1alpha1/istiocontrolplane.pb.html
+++ b/api/v1alpha1/istiocontrolplane.pb.html
@@ -29,7 +29,7 @@ IstioControlPlaneSpec
-Yes
+No
|
@@ -46,7 +46,7 @@ IstioControlPlaneSpec
-Yes
+No
|
@@ -1944,7 +1944,7 @@ Service
-Yes
+No
|
@@ -2007,7 +2007,7 @@ Service
-Yes
+No
|
diff --git a/api/v1alpha1/istiocontrolplane_deepcopy.gen.go b/api/v1alpha1/istiocontrolplane_deepcopy.gen.go
index 2c0cdb215..2fb07b1e4 100644
--- a/api/v1alpha1/istiocontrolplane_deepcopy.gen.go
+++ b/api/v1alpha1/istiocontrolplane_deepcopy.gen.go
@@ -5,9 +5,9 @@ package v1alpha1
import (
fmt "fmt"
- _ "github.com/gogo/protobuf/gogoproto"
- proto "github.com/gogo/protobuf/proto"
- _ "github.com/gogo/protobuf/types"
+ _ "github.com/waynz0r/protobuf/gogoproto"
+ proto "github.com/waynz0r/protobuf/proto"
+ _ "github.com/waynz0r/protobuf/types"
_ "istio.io/api/mesh/v1alpha1"
_ "istio.io/gogo-genproto/googleapis/google/api"
_ "k8s.io/api/core/v1"
diff --git a/api/v1alpha1/istiocontrolplane_json.gen.go b/api/v1alpha1/istiocontrolplane_json.gen.go
index a38cb752f..13d4c117d 100644
--- a/api/v1alpha1/istiocontrolplane_json.gen.go
+++ b/api/v1alpha1/istiocontrolplane_json.gen.go
@@ -6,10 +6,10 @@ package v1alpha1
import (
bytes "bytes"
fmt "fmt"
- _ "github.com/gogo/protobuf/gogoproto"
- github_com_gogo_protobuf_jsonpb "github.com/gogo/protobuf/jsonpb"
- proto "github.com/gogo/protobuf/proto"
- _ "github.com/gogo/protobuf/types"
+ _ "github.com/waynz0r/protobuf/gogoproto"
+ github_com_waynz0r_protobuf_jsonpb "github.com/waynz0r/protobuf/jsonpb"
+ proto "github.com/waynz0r/protobuf/proto"
+ _ "github.com/waynz0r/protobuf/types"
_ "istio.io/api/mesh/v1alpha1"
_ "istio.io/gogo-genproto/googleapis/google/api"
_ "k8s.io/api/core/v1"
@@ -297,6 +297,6 @@ func (this *StatusChecksums) UnmarshalJSON(b []byte) error {
}
var (
- IstiocontrolplaneMarshaler = &github_com_gogo_protobuf_jsonpb.Marshaler{Int64Uint64asIntegers: true}
- IstiocontrolplaneUnmarshaler = &github_com_gogo_protobuf_jsonpb.Unmarshaler{AllowUnknownFields: true}
+ IstiocontrolplaneMarshaler = &github_com_waynz0r_protobuf_jsonpb.Marshaler{Int64Uint64asIntegers: true}
+ IstiocontrolplaneUnmarshaler = &github_com_waynz0r_protobuf_jsonpb.Unmarshaler{AllowUnknownFields: true}
)
diff --git a/api/v1alpha1/istiomesh.pb.go b/api/v1alpha1/istiomesh.pb.go
index 1c9daad41..4b4de8395 100644
--- a/api/v1alpha1/istiomesh.pb.go
+++ b/api/v1alpha1/istiomesh.pb.go
@@ -5,9 +5,9 @@ package v1alpha1
import (
fmt "fmt"
- _ "github.com/gogo/protobuf/gogoproto"
- proto "github.com/gogo/protobuf/proto"
- _ "github.com/gogo/protobuf/types"
+ _ "github.com/waynz0r/protobuf/gogoproto"
+ proto "github.com/waynz0r/protobuf/proto"
+ _ "github.com/waynz0r/protobuf/types"
io "io"
v1alpha1 "istio.io/api/mesh/v1alpha1"
_ "istio.io/gogo-genproto/googleapis/google/api"
diff --git a/api/v1alpha1/istiomesh_deepcopy.gen.go b/api/v1alpha1/istiomesh_deepcopy.gen.go
index d991a37c2..0ae1f337a 100644
--- a/api/v1alpha1/istiomesh_deepcopy.gen.go
+++ b/api/v1alpha1/istiomesh_deepcopy.gen.go
@@ -5,9 +5,9 @@ package v1alpha1
import (
fmt "fmt"
- _ "github.com/gogo/protobuf/gogoproto"
- proto "github.com/gogo/protobuf/proto"
- _ "github.com/gogo/protobuf/types"
+ _ "github.com/waynz0r/protobuf/gogoproto"
+ proto "github.com/waynz0r/protobuf/proto"
+ _ "github.com/waynz0r/protobuf/types"
_ "istio.io/api/mesh/v1alpha1"
_ "istio.io/gogo-genproto/googleapis/google/api"
_ "k8s.io/api/core/v1"
diff --git a/api/v1alpha1/istiomesh_json.gen.go b/api/v1alpha1/istiomesh_json.gen.go
index c26380029..62e3d7665 100644
--- a/api/v1alpha1/istiomesh_json.gen.go
+++ b/api/v1alpha1/istiomesh_json.gen.go
@@ -6,10 +6,10 @@ package v1alpha1
import (
bytes "bytes"
fmt "fmt"
- _ "github.com/gogo/protobuf/gogoproto"
- github_com_gogo_protobuf_jsonpb "github.com/gogo/protobuf/jsonpb"
- proto "github.com/gogo/protobuf/proto"
- _ "github.com/gogo/protobuf/types"
+ _ "github.com/waynz0r/protobuf/gogoproto"
+ github_com_waynz0r_protobuf_jsonpb "github.com/waynz0r/protobuf/jsonpb"
+ proto "github.com/waynz0r/protobuf/proto"
+ _ "github.com/waynz0r/protobuf/types"
_ "istio.io/api/mesh/v1alpha1"
_ "istio.io/gogo-genproto/googleapis/google/api"
_ "k8s.io/api/core/v1"
@@ -44,6 +44,6 @@ func (this *IstioMeshStatus) UnmarshalJSON(b []byte) error {
}
var (
- IstiomeshMarshaler = &github_com_gogo_protobuf_jsonpb.Marshaler{Int64Uint64asIntegers: true}
- IstiomeshUnmarshaler = &github_com_gogo_protobuf_jsonpb.Unmarshaler{AllowUnknownFields: true}
+ IstiomeshMarshaler = &github_com_waynz0r_protobuf_jsonpb.Marshaler{Int64Uint64asIntegers: true}
+ IstiomeshUnmarshaler = &github_com_waynz0r_protobuf_jsonpb.Unmarshaler{AllowUnknownFields: true}
)
diff --git a/api/v1alpha1/istiomeshgateway.pb.go b/api/v1alpha1/istiomeshgateway.pb.go
index f101bc1d5..dc7797f82 100644
--- a/api/v1alpha1/istiomeshgateway.pb.go
+++ b/api/v1alpha1/istiomeshgateway.pb.go
@@ -5,10 +5,10 @@ package v1alpha1
import (
fmt "fmt"
- _ "github.com/gogo/protobuf/gogoproto"
- proto "github.com/gogo/protobuf/proto"
- _ "github.com/gogo/protobuf/types"
- github_com_gogo_protobuf_types "github.com/gogo/protobuf/types"
+ _ "github.com/waynz0r/protobuf/gogoproto"
+ proto "github.com/waynz0r/protobuf/proto"
+ _ "github.com/waynz0r/protobuf/types"
+ github_com_waynz0r_protobuf_types "github.com/waynz0r/protobuf/types"
io "io"
_ "istio.io/gogo-genproto/googleapis/google/api"
_ "k8s.io/api/core/v1"
@@ -399,7 +399,7 @@ func (m *IstioMeshGatewaySpec) MarshalToSizedBuffer(dAtA []byte) (int, error) {
dAtA[i] = 0x20
}
if m.RunAsRoot != nil {
- n2, err2 := github_com_gogo_protobuf_types.StdBoolMarshalTo(*m.RunAsRoot, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdBool(*m.RunAsRoot):])
+ n2, err2 := github_com_waynz0r_protobuf_types.StdBoolMarshalTo(*m.RunAsRoot, dAtA[i-github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.RunAsRoot):])
if err2 != nil {
return 0, err2
}
@@ -543,7 +543,7 @@ func (m *IstioMeshGatewaySpec) Size() (n int) {
n += 1 + l + sovIstiomeshgateway(uint64(l))
}
if m.RunAsRoot != nil {
- l = github_com_gogo_protobuf_types.SizeOfStdBool(*m.RunAsRoot)
+ l = github_com_waynz0r_protobuf_types.SizeOfStdBool(*m.RunAsRoot)
n += 1 + l + sovIstiomeshgateway(uint64(l))
}
if m.Type != 0 {
@@ -745,7 +745,7 @@ func (m *IstioMeshGatewaySpec) Unmarshal(dAtA []byte) error {
if m.RunAsRoot == nil {
m.RunAsRoot = new(bool)
}
- if err := github_com_gogo_protobuf_types.StdBoolUnmarshal(m.RunAsRoot, dAtA[iNdEx:postIndex]); err != nil {
+ if err := github_com_waynz0r_protobuf_types.StdBoolUnmarshal(m.RunAsRoot, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
diff --git a/api/v1alpha1/istiomeshgateway.pb.html b/api/v1alpha1/istiomeshgateway.pb.html
index 2a782458b..dfdbc0971 100644
--- a/api/v1alpha1/istiomeshgateway.pb.html
+++ b/api/v1alpha1/istiomeshgateway.pb.html
@@ -39,7 +39,7 @@ IstioMeshGatewaySpec
-Yes
+No
|
@@ -62,7 +62,7 @@ IstioMeshGatewaySpec
-Yes
+No
|
@@ -73,7 +73,7 @@ IstioMeshGatewaySpec
-Yes
+No
|
@@ -464,7 +464,7 @@ Service
-Yes
+No
|
@@ -527,7 +527,7 @@ Service
-Yes
+No
|
diff --git a/api/v1alpha1/istiomeshgateway_deepcopy.gen.go b/api/v1alpha1/istiomeshgateway_deepcopy.gen.go
index 6e665e08c..60a7bcb31 100644
--- a/api/v1alpha1/istiomeshgateway_deepcopy.gen.go
+++ b/api/v1alpha1/istiomeshgateway_deepcopy.gen.go
@@ -5,9 +5,9 @@ package v1alpha1
import (
fmt "fmt"
- _ "github.com/gogo/protobuf/gogoproto"
- proto "github.com/gogo/protobuf/proto"
- _ "github.com/gogo/protobuf/types"
+ _ "github.com/waynz0r/protobuf/gogoproto"
+ proto "github.com/waynz0r/protobuf/proto"
+ _ "github.com/waynz0r/protobuf/types"
_ "istio.io/gogo-genproto/googleapis/google/api"
_ "k8s.io/api/core/v1"
math "math"
diff --git a/api/v1alpha1/istiomeshgateway_json.gen.go b/api/v1alpha1/istiomeshgateway_json.gen.go
index 4a8013bf9..077fec85c 100644
--- a/api/v1alpha1/istiomeshgateway_json.gen.go
+++ b/api/v1alpha1/istiomeshgateway_json.gen.go
@@ -6,10 +6,10 @@ package v1alpha1
import (
bytes "bytes"
fmt "fmt"
- _ "github.com/gogo/protobuf/gogoproto"
- github_com_gogo_protobuf_jsonpb "github.com/gogo/protobuf/jsonpb"
- proto "github.com/gogo/protobuf/proto"
- _ "github.com/gogo/protobuf/types"
+ _ "github.com/waynz0r/protobuf/gogoproto"
+ github_com_waynz0r_protobuf_jsonpb "github.com/waynz0r/protobuf/jsonpb"
+ proto "github.com/waynz0r/protobuf/proto"
+ _ "github.com/waynz0r/protobuf/types"
_ "istio.io/gogo-genproto/googleapis/google/api"
_ "k8s.io/api/core/v1"
math "math"
@@ -54,6 +54,6 @@ func (this *IstioMeshGatewayStatus) UnmarshalJSON(b []byte) error {
}
var (
- IstiomeshgatewayMarshaler = &github_com_gogo_protobuf_jsonpb.Marshaler{Int64Uint64asIntegers: true}
- IstiomeshgatewayUnmarshaler = &github_com_gogo_protobuf_jsonpb.Unmarshaler{AllowUnknownFields: true}
+ IstiomeshgatewayMarshaler = &github_com_waynz0r_protobuf_jsonpb.Marshaler{Int64Uint64asIntegers: true}
+ IstiomeshgatewayUnmarshaler = &github_com_waynz0r_protobuf_jsonpb.Unmarshaler{AllowUnknownFields: true}
)
diff --git a/build/buf.gen.yaml b/build/buf.gen.yaml
index af92fd05f..69543e841 100644
--- a/build/buf.gen.yaml
+++ b/build/buf.gen.yaml
@@ -3,13 +3,13 @@ version: v1beta1
plugins:
- name: gogofast
out: .
- opt: plugins=grpc,paths=source_relative,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/struct.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgoogle/rpc/status.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/rpc/code.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/rpc/error_details.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/api/field_behavior.proto=istio.io/gogo-genproto/googleapis/google/api
+ opt: plugins=grpc,paths=source_relative,Mgogoproto/gogo.proto=github.com/waynz0r/protobuf/gogoproto,Mgoogle/protobuf/any.proto=github.com/waynz0r/protobuf/types,Mgoogle/protobuf/descriptor.proto=github.com/waynz0r/protobuf/protoc-gen-gogo/descriptor,Mgoogle/protobuf/duration.proto=github.com/waynz0r/protobuf/types,Mgoogle/protobuf/struct.proto=github.com/waynz0r/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/waynz0r/protobuf/types,Mgoogle/protobuf/wrappers.proto=github.com/waynz0r/protobuf/types,Mgoogle/rpc/status.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/rpc/code.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/rpc/error_details.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/api/field_behavior.proto=istio.io/gogo-genproto/googleapis/google/api
- name: deepcopy
out: .
- opt: paths=source_relative,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/struct.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgoogle/rpc/status.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/rpc/code.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/rpc/error_details.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/api/field_behavior.proto=istio.io/gogo-genproto/googleapis/google/api
+ opt: paths=source_relative,Mgogoproto/gogo.proto=github.com/waynz0r/protobuf/gogoproto,Mgoogle/protobuf/any.proto=github.com/waynz0r/protobuf/types,Mgoogle/protobuf/descriptor.proto=github.com/waynz0r/protobuf/protoc-gen-gogo/descriptor,Mgoogle/protobuf/duration.proto=github.com/waynz0r/protobuf/types,Mgoogle/protobuf/struct.proto=github.com/waynz0r/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/waynz0r/protobuf/types,Mgoogle/protobuf/wrappers.proto=github.com/waynz0r/protobuf/types,Mgoogle/rpc/status.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/rpc/code.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/rpc/error_details.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/api/field_behavior.proto=istio.io/gogo-genproto/googleapis/google/api
- name: jsonshim
out: .
- opt: paths=source_relative,Mgogoproto/gogo.proto=github.com/gogo/protobuf/gogoproto,Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/descriptor.proto=github.com/gogo/protobuf/protoc-gen-gogo/descriptor,Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/struct.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types,Mgoogle/protobuf/wrappers.proto=github.com/gogo/protobuf/types,Mgoogle/rpc/status.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/rpc/code.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/rpc/error_details.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/api/field_behavior.proto=istio.io/gogo-genproto/googleapis/google/api
+ opt: paths=source_relative,Mgogoproto/gogo.proto=github.com/waynz0r/protobuf/gogoproto,Mgoogle/protobuf/any.proto=github.com/waynz0r/protobuf/types,Mgoogle/protobuf/descriptor.proto=github.com/waynz0r/protobuf/protoc-gen-gogo/descriptor,Mgoogle/protobuf/duration.proto=github.com/waynz0r/protobuf/types,Mgoogle/protobuf/struct.proto=github.com/waynz0r/protobuf/types,Mgoogle/protobuf/timestamp.proto=github.com/waynz0r/protobuf/types,Mgoogle/protobuf/wrappers.proto=github.com/waynz0r/protobuf/types,Mgoogle/rpc/status.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/rpc/code.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/rpc/error_details.proto=istio.io/gogo-genproto/googleapis/google/rpc,Mgoogle/api/field_behavior.proto=istio.io/gogo-genproto/googleapis/google/api
- name: docs
out: .
opt: warnings=false,per_file=true,mode=html_fragment_with_front_matter
diff --git a/controllers/istiocontrolplane_controller.go b/controllers/istiocontrolplane_controller.go
index 83b8f8716..f6fc90195 100644
--- a/controllers/istiocontrolplane_controller.go
+++ b/controllers/istiocontrolplane_controller.go
@@ -28,7 +28,7 @@ import (
"emperror.dev/errors"
"github.com/go-logr/logr"
- "github.com/gogo/protobuf/jsonpb"
+ "github.com/waynz0r/protobuf/jsonpb"
"istio.io/api/mesh/v1alpha1"
istionetworkingv1alpha3 "istio.io/client-go/pkg/apis/networking/v1alpha3"
istiosecurityv1beta1 "istio.io/client-go/pkg/apis/security/v1beta1"
diff --git a/go.mod b/go.mod
index d95e15609..5057f4975 100644
--- a/go.mod
+++ b/go.mod
@@ -3,32 +3,24 @@ module github.com/banzaicloud/istio-operator/v2
go 1.17
require (
- cloud.google.com/go v0.60.0 // indirect
emperror.dev/errors v0.8.0
- github.com/Masterminds/semver v1.5.0 // indirect
+ github.com/Masterminds/semver/v3 v3.1.1
github.com/Masterminds/sprig v2.22.0+incompatible
github.com/banzaicloud/cluster-registry v0.0.7
github.com/banzaicloud/istio-operator/api/v2 v2.0.0
github.com/banzaicloud/k8s-objectmatcher v1.5.2
github.com/banzaicloud/operator-tools v0.26.1
- github.com/fatih/color v1.12.0 // indirect
github.com/go-logr/logr v0.4.0
github.com/gogo/protobuf v1.3.2
github.com/golang/protobuf v1.5.2
github.com/gonvenience/ytbx v1.4.2
- github.com/google/go-cmp v0.5.6 // indirect
- github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/homeport/dyff v1.4.3
github.com/imdario/mergo v0.3.12
github.com/kylelemons/godebug v1.1.0
- github.com/mattn/go-isatty v0.0.13 // indirect
- github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/onsi/ginkgo v1.16.4
github.com/onsi/gomega v1.14.0
- github.com/rogpeppe/go-internal v1.6.2 // indirect
- go.opencensus.io v0.22.4 // indirect
+ github.com/waynz0r/protobuf v1.3.2-bzc
go.uber.org/zap v1.18.1
- golang.org/x/tools v0.1.3 // indirect
istio.io/api v0.0.0-20210809175348-eff556fb5d8a
istio.io/client-go v1.11.0
k8s.io/api v0.21.3
@@ -39,13 +31,13 @@ require (
sigs.k8s.io/yaml v1.2.0
)
-require github.com/Masterminds/semver/v3 v3.1.1
-
require (
+ cloud.google.com/go v0.60.0 // indirect
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
github.com/BurntSushi/toml v0.3.1 // indirect
github.com/MakeNowJust/heredoc v1.0.0 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
+ github.com/Masterminds/semver v1.5.0 // indirect
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
github.com/Masterminds/squirrel v1.5.0 // indirect
github.com/Microsoft/go-winio v0.4.16 // indirect
@@ -72,6 +64,7 @@ require (
github.com/docker/go-units v0.4.0 // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
+ github.com/fatih/color v1.12.0 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-errors/errors v1.0.1 // indirect
@@ -88,12 +81,14 @@ require (
github.com/gonvenience/text v1.0.6 // indirect
github.com/gonvenience/wrap v1.1.0 // indirect
github.com/google/btree v1.0.0 // indirect
+ github.com/google/go-cmp v0.5.6 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/gosuri/uitable v0.0.4 // indirect
+ github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/iancoleman/orderedmap v0.2.0 // indirect
@@ -108,6 +103,8 @@ require (
github.com/mailru/easyjson v0.7.0 // indirect
github.com/mattn/go-ciede2000 v0.0.0-20170301095244-782e8c62fec3 // indirect
github.com/mattn/go-colorable v0.1.8 // indirect
+ github.com/mattn/go-isatty v0.0.13 // indirect
+ github.com/mattn/go-runewidth v0.0.9 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/mitchellh/copystructure v1.1.1 // indirect
github.com/mitchellh/go-ps v1.0.0 // indirect
@@ -131,6 +128,7 @@ require (
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
+ github.com/rogpeppe/go-internal v1.6.2 // indirect
github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351 // indirect
github.com/russross/blackfriday v1.5.2 // indirect
github.com/sergi/go-diff v1.2.0 // indirect
@@ -150,14 +148,15 @@ require (
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
+ go.opencensus.io v0.22.4 // indirect
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
- golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 // indirect
+ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
- golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
+ golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
@@ -185,9 +184,4 @@ require (
sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
)
-replace (
- github.com/banzaicloud/istio-operator/api/v2 => ./api
-
- // needs a fork to support int64/uint64 marshalling to integers
- github.com/gogo/protobuf => github.com/waynz0r/protobuf v1.3.3-0.20210811122234-64636cae0910
-)
+replace github.com/banzaicloud/istio-operator/api/v2 => ./api
diff --git a/go.sum b/go.sum
index aed67e183..28fa35e71 100644
--- a/go.sum
+++ b/go.sum
@@ -398,6 +398,12 @@ github.com/godror/godror v0.13.3/go.mod h1:2ouUT4kdhUBk7TAkHWD4SN0CdI0pgEQbo8FVH
github.com/gofrs/flock v0.7.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
github.com/gogo/googleapis v1.1.0/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0=
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -580,7 +586,10 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/errcheck v1.6.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
@@ -925,8 +934,8 @@ github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 h1:JwtAtb
github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74/go.mod h1:RmMWU37GKR2s6pgrIEB4ixgpVCt/cf7dnJv3fuH1J1c=
github.com/wayneashleyberry/terminal-dimensions v1.0.0 h1:LawtS1nqKjAfqrmKOzkcrDLAjSzh38lEhC401JPjQVA=
github.com/wayneashleyberry/terminal-dimensions v1.0.0/go.mod h1:PW2XrtV6KmKOPhuf7wbtcmw1/IFnC39mryRET2XbxeE=
-github.com/waynz0r/protobuf v1.3.3-0.20210811122234-64636cae0910 h1:USK8UCHlf1voJ4u9rLI6Ot4WwXk3aPXIDz9q+PDrjpo=
-github.com/waynz0r/protobuf v1.3.3-0.20210811122234-64636cae0910/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/waynz0r/protobuf v1.3.2-bzc h1:H2/fnV+jX6jqXM6Lg44ZjIibjLzO4lurEDGrceUtZ2E=
+github.com/waynz0r/protobuf v1.3.2-bzc/go.mod h1:gUzVe56rS+viQfZ+Y9FjXl0n5d5KmNvF7s/dcvluQxA=
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
@@ -942,7 +951,7 @@ github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43 h1:+lm10QQTNSBd8DVTNGHx7o/IKu9HYDvLMffDhbyLccI=
github.com/yvasiyarov/go-metrics v0.0.0-20140926110328-57bccd1ccd43/go.mod h1:aX5oPXxHm3bOH+xeAttToC8pqch2ScQN/JoXYupl6xs=
github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 h1:hlE8//ciYMztlGpl/VA+Zm1AcTPHYkHJPbHqE6WJUXE=
@@ -1087,9 +1096,9 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 h1:DzZ89McO9/gWPsQXS/FVKAlG02ZjaQ6AlZRBimEYOd0=
golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1172,13 +1181,12 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c h1:F1jZWGFhYfh0Ci55sIpILtKKK8p3i2/krTr0H1rg74I=
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d h1:SZxvLBoTP5yHO3Frd4z4vrF+DBX9vMVanchswa69toE=
@@ -1199,9 +1207,11 @@ golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxb
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac h1:7zkz7BUtwNFFqcowJ+RIgu2MaV/MapERkDIy+mwPyjs=
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20181011042414-1f849cf54d09/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190125232054-d66bd3c5d5a6/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -1255,8 +1265,8 @@ golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f/go.mod h1:EkVYQZoAsY45+roY
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.3 h1:L69ShwSZEyCsLKoAxDKeMvLDZkumEe8gXUZAjab0tX8=
-golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ=
+golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/internal/util/template.go b/internal/util/template.go
index 8bec12497..0f2f3fdf5 100644
--- a/internal/util/template.go
+++ b/internal/util/template.go
@@ -24,8 +24,8 @@ import (
"text/template"
"github.com/Masterminds/sprig"
- "github.com/gogo/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
+ "github.com/waynz0r/protobuf/jsonpb"
"sigs.k8s.io/yaml"
)
diff --git a/pkg/util/util.go b/pkg/util/util.go
index a3629b107..dc123a171 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -20,8 +20,8 @@ import (
"encoding/json"
"github.com/go-logr/logr"
- "github.com/gogo/protobuf/jsonpb"
"github.com/imdario/mergo"
+ "github.com/waynz0r/protobuf/jsonpb"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"istio.io/api/mesh/v1alpha1"
diff --git a/scripts/download-deps.sh b/scripts/download-deps.sh
index 5ed7b82a7..d0e98ea9c 100755
--- a/scripts/download-deps.sh
+++ b/scripts/download-deps.sh
@@ -4,9 +4,9 @@ set -euo pipefail
code_generator_version=v0.22.0
controller_gen_version=v0.6.2
-istio_deps_version=v1.11.0-bzc.2
+istio_deps_version=v1.11.4-bzc.1
istio_tools_replacement_module_name=github.com/waynz0r/istio-tools
-gogo_protobuf_version=v1.3.2
+gogo_protobuf_version=v1.3.2-bzc
yq_version=3.4.1
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
@@ -56,7 +56,7 @@ ensure-binary-version cue-gen ${istio_deps_version} "istio.io/tools" "/cmd/cue-g
ensure-binary-version protoc-gen-deepcopy ${istio_deps_version} "istio.io/tools" "/cmd/protoc-gen-deepcopy" "${istio_tools_replacement_module_name}"
ensure-binary-version protoc-gen-jsonshim ${istio_deps_version} "istio.io/tools" "/cmd/protoc-gen-jsonshim" "${istio_tools_replacement_module_name}"
ensure-binary-version protoc-gen-docs ${istio_deps_version} "istio.io/tools" "/cmd/protoc-gen-docs" "${istio_tools_replacement_module_name}"
-ensure-binary-version protoc-gen-gogofast ${gogo_protobuf_version} "github.com/gogo" "/protobuf/protoc-gen-gogofast"
+ensure-binary-version protoc-gen-gogofast ${gogo_protobuf_version} "github.com/waynz0r" "/protobuf/protoc-gen-gogofast"
ensure-binary-version yq ${yq_version} "github.com/mikefarah/yq" "/v3"
go mod tidy