diff --git a/Makefile b/Makefile index d40539214..b24ea47f4 100644 --- a/Makefile +++ b/Makefile @@ -18,9 +18,9 @@ HELM_CHART_REL_TAG ?= chart/istio-operator/${CHART_VERSION} GOLANGCI_VERSION = 1.45.2 LICENSEI_VERSION = 0.7.0 -ENVTEST_K8S_VERSION = 1.24.2 +ENVTEST_K8S_VERSION = 1.26.0 KUSTOMIZE_VERSION = 4.1.2 -ISTIO_VERSION = 1.16.1 +ISTIO_VERSION = 1.17.1 BUF_VERSION = 1.7.0 PATH := $(PATH):$(PWD)/bin diff --git a/README.md b/README.md index f35c85786..840231dd6 100644 --- a/README.md +++ b/README.md @@ -82,12 +82,12 @@ istio-operator-controller-manager-6f764787c-rbnht 2/2 Running 0 Deploy the [Istio control plane sample](config/samples/servicemesh_v1alpha1_istiocontrolplane.yaml) to the `istio-system` namespace ``` $ kubectl -n istio-system apply -f config/samples/servicemesh_v1alpha1_istiocontrolplane.yaml -istiocontrolplane.servicemesh.cisco.com/icp-v116x-sample created +istiocontrolplane.servicemesh.cisco.com/icp-v117x-sample created ``` Label the namespace, where you would like to enable sidecar injection for your pods. The label should consist of the name of the deployed IstioControlPlane and the namespace where it is deployed. ``` -$ kubectl label namespace demoapp istio.io/rev=icp-v116x-sample.istio-system +$ kubectl label namespace demoapp istio.io/rev=icp-v117x-sample.istio-system namespace/demoapp labeled ``` diff --git a/api/go.mod b/api/go.mod index df58ff654..ef692c18c 100644 --- a/api/go.mod +++ b/api/go.mod @@ -5,28 +5,28 @@ go 1.18 require ( github.com/golang/protobuf v1.5.2 google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03 - google.golang.org/protobuf v1.28.0 + google.golang.org/protobuf v1.28.1 istio.io/api v0.0.0-20221208070204-0528cb6ce63b - k8s.io/api v0.24.2 - k8s.io/apimachinery v0.24.2 - sigs.k8s.io/controller-runtime v0.12.3 + k8s.io/api v0.26.1 + k8s.io/apimachinery v0.26.1 + sigs.k8s.io/controller-runtime v0.14.4 ) require ( - github.com/go-logr/logr v1.2.0 // indirect + github.com/go-logr/logr v1.2.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/google/gofuzz v1.1.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect - golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e // indirect - golang.org/x/text v0.3.7 // indirect + golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect + golang.org/x/text v0.5.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/klog/v2 v2.60.1 // indirect - k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect - sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect + k8s.io/klog/v2 v2.80.1 // indirect + k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect + sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) // needs a fork to support istio operator v2 api int64/uint64 marshalling to integers diff --git a/api/go.sum b/api/go.sum index ece8e4adb..aac103f08 100644 --- a/api/go.sum +++ b/api/go.sum @@ -1,12 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= -github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= @@ -16,107 +11,61 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= -github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= -github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= 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/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= 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.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= 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= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/luciferinlove/protobuf v0.0.0-20220913214010-c63936d75066 h1:BQKOM2ATglKs0TQ55cJ/PDzqKjpzJ8P8UANBeifLHdY= github.com/luciferinlove/protobuf v0.0.0-20220913214010-c63936d75066/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= -github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= -github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= -github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/onsi/ginkgo/v2 v2.6.0 h1:9t9b9vRUbFq3C4qKFCGkVuq/fIHji802N1nrtkh1mNc= +github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= -github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= -github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= 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= go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= @@ -127,24 +76,19 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx 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-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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/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/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e h1:TsQ7F31D3bUCLeqPT0u+yjp1guoArKaNKmCr22PYgTQ= -golang.org/x/net v0.0.0-20220624214902-1bab6f366d9e/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 h1:Frnccbp+ok2GkUS2tC84yAq/U9Vg+0sIO7aRL3T4Xnc= +golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -153,47 +97,33 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/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-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/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-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220627191245-f75cf1eec38b h1:2n253B2r0pYSmEV+UNCQoPfU/FiaizQEK5Gu4Bq4JE8= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/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.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM= +golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/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-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= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= 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.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= 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= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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= @@ -201,7 +131,6 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03 h1:W70HjnmXFJm+8RNjOpIDYW2nKsSi/af0VvIZUtYkwuU= google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -213,57 +142,39 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= 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.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= 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= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= 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= istio.io/api v0.0.0-20221208070204-0528cb6ce63b h1:pVcDWtdJYwrI79dLtj4x9tO3uF3o5Ye+Xd+KOlVnyqQ= istio.io/api v0.0.0-20221208070204-0528cb6ce63b/go.mod h1:hQkF0Q19MCmfOTre/Sg4KvrwwETq45oaFplnBm2p4j8= -k8s.io/api v0.24.2 h1:g518dPU/L7VRLxWfcadQn2OnsiGWVOadTLpdnqgY2OI= -k8s.io/api v0.24.2/go.mod h1:AHqbSkTm6YrQ0ObxjO3Pmp/ubFF/KuM7jU+3khoBsOg= -k8s.io/apimachinery v0.24.2 h1:5QlH9SL2C8KMcrNJPor+LbXVTaZRReml7svPEh4OKDM= -k8s.io/apimachinery v0.24.2/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= -k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= -k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= -k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio= -sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0= -sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= -sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= -sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= -sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= +k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ= +k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg= +k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ= +k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= +k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= +k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y= +k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/controller-runtime v0.14.4 h1:Kd/Qgx5pd2XUL08eOV2vwIq3L9GhIbJ5Nxengbd4/0M= +sigs.k8s.io/controller-runtime v0.14.4/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0= +sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= +sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= diff --git a/api/v1alpha1/istiocontrolplane.gen.json b/api/v1alpha1/istiocontrolplane.gen.json index 2cb6881db..fca39ddc7 100644 --- a/api/v1alpha1/istiocontrolplane.gen.json +++ b/api/v1alpha1/istiocontrolplane.gen.json @@ -199,9 +199,6 @@ "$ref": "#/components/schemas/istio.mesh.v1alpha1.Certificate" } }, - "thriftConfig": { - "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ThriftConfig" - }, "serviceSettings": { "type": "array", "items": { @@ -422,7 +419,8 @@ ], "properties": { "lightstep": { - "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider" + "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider", + "deprecated": true } } }, @@ -566,7 +564,8 @@ ], "properties": { "lightstep": { - "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider" + "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider", + "deprecated": true } } }, @@ -710,7 +709,8 @@ ], "properties": { "lightstep": { - "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider" + "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider", + "deprecated": true } } }, @@ -841,7 +841,8 @@ "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.EnvoyTcpGrpcV3LogProvider" }, "istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider": { - "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider" + "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider", + "deprecated": true }, "istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.OpenCensusAgentTracingProvider": { "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.OpenCensusAgentTracingProvider" @@ -953,19 +954,6 @@ "TLSV1_3" ] }, - "istio.mesh.v1alpha1.MeshConfig.ThriftConfig": { - "type": "object", - "properties": { - "rateLimitUrl": { - "description": "Specify thrift rate limit service URL. If pilot has thrift protocol support enabled, this will enable the rate limit service for destinations that have matching rate limit configurations.", - "type": "string" - }, - "rateLimitTimeout": { - "description": "Specify thrift rate limit service timeout, in milliseconds. Default is `50ms`", - "type": "string" - } - } - }, "istio.mesh.v1alpha1.PrivateKeyProvider": { "description": "PrivateKeyProvider defines private key configuration for gateways and sidecars. This can be configured mesh wide or individual per-workload basis.", "type": "object", @@ -982,6 +970,16 @@ "$ref": "#/components/schemas/istio.mesh.v1alpha1.PrivateKeyProvider.CryptoMb" } } + }, + { + "required": [ + "qat" + ], + "properties": { + "qat": { + "$ref": "#/components/schemas/istio.mesh.v1alpha1.PrivateKeyProvider.QAT" + } + } } ] } @@ -995,12 +993,25 @@ "$ref": "#/components/schemas/istio.mesh.v1alpha1.PrivateKeyProvider.CryptoMb" } } + }, + { + "required": [ + "qat" + ], + "properties": { + "qat": { + "$ref": "#/components/schemas/istio.mesh.v1alpha1.PrivateKeyProvider.QAT" + } + } } ] }, "istio.mesh.v1alpha1.PrivateKeyProvider.CryptoMb": { "$ref": "#/components/schemas/istio.mesh.v1alpha1.PrivateKeyProvider.CryptoMb" }, + "istio.mesh.v1alpha1.PrivateKeyProvider.QAT": { + "$ref": "#/components/schemas/istio.mesh.v1alpha1.PrivateKeyProvider.QAT" + }, "istio.mesh.v1alpha1.ProxyConfig": { "description": "ProxyConfig defines variables for individual Envoy instances. This can be configured on a per-workload basis as well as by the mesh-wide defaults. To set the mesh wide defaults, configure the `defaultConfig` section of `meshConfig`. For example: ``` meshConfig: defaultConfig: discoveryAddress: istiod:15012 ``` This can also be configured on a per-workload basis by configuring the `proxy.istio.io/config` annotation on the pod. For example: ``` annotations: proxy.istio.io/config: | discoveryAddress: istiod:15012 ``` If both are configured, the two are merged with per field semantics; the field set in annotation will fully replace the field from mesh config defaults. This is different than a deep merge provided by protobuf. For example, `\"tracing\": { \"sampling\": 5 }` would completely override a setting configuring a tracing provider such as `\"tracing\": { \"zipkin\": { \"address\": \"...\" } }`. Note: fields in ProxyConfig are not dynamically configured; changes will require restart of workloads to take effect.", "type": "object", @@ -1031,10 +1042,6 @@ "description": "The time in seconds that Envoy will drain connections during a hot restart. MUST be \u003e=1s (e.g., _1s/1m/1h_) Default drain duration is `45s`.", "type": "string" }, - "parentShutdownDuration": { - "description": "The time in seconds that Envoy will wait before shutting down the parent process during a hot restart. MUST be \u003e=1s (e.g., `1s/1m/1h`). MUST BE greater than `drain_duration` parameter. Default shutdown duration is `60s`.", - "type": "string" - }, "discoveryAddress": { "description": "Address of the discovery service exposing xDS with mTLS connection. The inject configuration may override this value.", "type": "string" @@ -1580,7 +1587,7 @@ "type": "string" }, "subjectAltNames": { - "description": "A list of alternate names to verify the subject identity in the certificate. If specified, the proxy will verify that the server certificate's subject alt name matches one of the specified values. If specified, this list overrides the value of subject_alt_names from the ServiceEntry. If unspecified, automatic validation of upstream presented certificate for new upstream connections will be done based on the downstream HTTP host/authority header, provided `VERIFY_CERT_AT_CLIENT` and `ENABLE_AUTO_SNI` environmental variables are set to `true`.", + "description": "A list of alternate names to verify the subject identity in the certificate. If specified, the proxy will verify that the server certificate's subject alt name matches one of the specified values. If specified, this list overrides the value of subject_alt_names from the ServiceEntry. If unspecified, automatic validation of upstream presented certificate for new upstream connections will be done based on the downstream HTTP host/authority header, provided `VERIFY_CERTIFICATE_AT_CLIENT` and `ENABLE_AUTO_SNI` environmental variables are set to `true`.", "type": "array", "items": { "type": "string" diff --git a/api/v1alpha1/istiomesh.gen.json b/api/v1alpha1/istiomesh.gen.json index a9215a3b2..345131ced 100644 --- a/api/v1alpha1/istiomesh.gen.json +++ b/api/v1alpha1/istiomesh.gen.json @@ -199,9 +199,6 @@ "$ref": "#/components/schemas/istio.mesh.v1alpha1.Certificate" } }, - "thriftConfig": { - "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ThriftConfig" - }, "serviceSettings": { "type": "array", "items": { @@ -422,7 +419,8 @@ ], "properties": { "lightstep": { - "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider" + "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider", + "deprecated": true } } }, @@ -566,7 +564,8 @@ ], "properties": { "lightstep": { - "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider" + "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider", + "deprecated": true } } }, @@ -710,7 +709,8 @@ ], "properties": { "lightstep": { - "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider" + "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider", + "deprecated": true } } }, @@ -841,7 +841,8 @@ "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.EnvoyTcpGrpcV3LogProvider" }, "istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider": { - "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider" + "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.LightstepTracingProvider", + "deprecated": true }, "istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.OpenCensusAgentTracingProvider": { "$ref": "#/components/schemas/istio.mesh.v1alpha1.MeshConfig.ExtensionProvider.OpenCensusAgentTracingProvider" @@ -953,19 +954,6 @@ "TLSV1_3" ] }, - "istio.mesh.v1alpha1.MeshConfig.ThriftConfig": { - "type": "object", - "properties": { - "rateLimitUrl": { - "description": "Specify thrift rate limit service URL. If pilot has thrift protocol support enabled, this will enable the rate limit service for destinations that have matching rate limit configurations.", - "type": "string" - }, - "rateLimitTimeout": { - "description": "Specify thrift rate limit service timeout, in milliseconds. Default is `50ms`", - "type": "string" - } - } - }, "istio.mesh.v1alpha1.PrivateKeyProvider": { "description": "PrivateKeyProvider defines private key configuration for gateways and sidecars. This can be configured mesh wide or individual per-workload basis.", "type": "object", @@ -982,6 +970,16 @@ "$ref": "#/components/schemas/istio.mesh.v1alpha1.PrivateKeyProvider.CryptoMb" } } + }, + { + "required": [ + "qat" + ], + "properties": { + "qat": { + "$ref": "#/components/schemas/istio.mesh.v1alpha1.PrivateKeyProvider.QAT" + } + } } ] } @@ -995,12 +993,25 @@ "$ref": "#/components/schemas/istio.mesh.v1alpha1.PrivateKeyProvider.CryptoMb" } } + }, + { + "required": [ + "qat" + ], + "properties": { + "qat": { + "$ref": "#/components/schemas/istio.mesh.v1alpha1.PrivateKeyProvider.QAT" + } + } } ] }, "istio.mesh.v1alpha1.PrivateKeyProvider.CryptoMb": { "$ref": "#/components/schemas/istio.mesh.v1alpha1.PrivateKeyProvider.CryptoMb" }, + "istio.mesh.v1alpha1.PrivateKeyProvider.QAT": { + "$ref": "#/components/schemas/istio.mesh.v1alpha1.PrivateKeyProvider.QAT" + }, "istio.mesh.v1alpha1.ProxyConfig": { "description": "ProxyConfig defines variables for individual Envoy instances. This can be configured on a per-workload basis as well as by the mesh-wide defaults. To set the mesh wide defaults, configure the `defaultConfig` section of `meshConfig`. For example: ``` meshConfig: defaultConfig: discoveryAddress: istiod:15012 ``` This can also be configured on a per-workload basis by configuring the `proxy.istio.io/config` annotation on the pod. For example: ``` annotations: proxy.istio.io/config: | discoveryAddress: istiod:15012 ``` If both are configured, the two are merged with per field semantics; the field set in annotation will fully replace the field from mesh config defaults. This is different than a deep merge provided by protobuf. For example, `\"tracing\": { \"sampling\": 5 }` would completely override a setting configuring a tracing provider such as `\"tracing\": { \"zipkin\": { \"address\": \"...\" } }`. Note: fields in ProxyConfig are not dynamically configured; changes will require restart of workloads to take effect.", "type": "object", @@ -1031,10 +1042,6 @@ "description": "The time in seconds that Envoy will drain connections during a hot restart. MUST be \u003e=1s (e.g., _1s/1m/1h_) Default drain duration is `45s`.", "type": "string" }, - "parentShutdownDuration": { - "description": "The time in seconds that Envoy will wait before shutting down the parent process during a hot restart. MUST be \u003e=1s (e.g., `1s/1m/1h`). MUST BE greater than `drain_duration` parameter. Default shutdown duration is `60s`.", - "type": "string" - }, "discoveryAddress": { "description": "Address of the discovery service exposing xDS with mTLS connection. The inject configuration may override this value.", "type": "string" @@ -1580,7 +1587,7 @@ "type": "string" }, "subjectAltNames": { - "description": "A list of alternate names to verify the subject identity in the certificate. If specified, the proxy will verify that the server certificate's subject alt name matches one of the specified values. If specified, this list overrides the value of subject_alt_names from the ServiceEntry. If unspecified, automatic validation of upstream presented certificate for new upstream connections will be done based on the downstream HTTP host/authority header, provided `VERIFY_CERT_AT_CLIENT` and `ENABLE_AUTO_SNI` environmental variables are set to `true`.", + "description": "A list of alternate names to verify the subject identity in the certificate. If specified, the proxy will verify that the server certificate's subject alt name matches one of the specified values. If specified, this list overrides the value of subject_alt_names from the ServiceEntry. If unspecified, automatic validation of upstream presented certificate for new upstream connections will be done based on the downstream HTTP host/authority header, provided `VERIFY_CERTIFICATE_AT_CLIENT` and `ENABLE_AUTO_SNI` environmental variables are set to `true`.", "type": "array", "items": { "type": "string" diff --git a/build/fixup_structs/main.go b/build/fixup_structs/main.go index 90e8825a6..798554c56 100644 --- a/build/fixup_structs/main.go +++ b/build/fixup_structs/main.go @@ -76,7 +76,7 @@ var ( regexJSONTagIllegal = regexp.MustCompile(`json\:"_`) ) -//nolint: gocognit +// nolint: gocognit func main() { var filePath string diff --git a/config/crd/bases/istio-operator-crds.gen.yaml b/config/crd/bases/istio-operator-crds.gen.yaml index 963e49ed6..67b23c5a6 100644 --- a/config/crd/bases/istio-operator-crds.gen.yaml +++ b/config/crd/bases/istio-operator-crds.gen.yaml @@ -6,7 +6,7 @@ metadata: "helm.sh/resource-policy": keep name: istiocontrolplanes.servicemesh.cisco.com labels: - resource.alpha.banzaicloud.io/revision: 1.16.1 + resource.alpha.banzaicloud.io/revision: 1.17.1 spec: group: servicemesh.cisco.com names: @@ -1964,22 +1964,29 @@ spec: type: string meshId: type: string - parentShutdownDuration: - type: string privateKeyProvider: oneOf: - not: anyOf: - required: - cryptomb + - required: + - qat - required: - cryptomb + - required: + - qat properties: cryptomb: properties: pollDelay: type: string type: object + qat: + properties: + pollDelay: + type: string + type: object type: object proxyAdminPort: format: int32 @@ -2342,7 +2349,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -2371,7 +2380,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -2402,7 +2413,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -2780,13 +2793,6 @@ spec: time: type: string type: object - thriftConfig: - properties: - rateLimitTimeout: - type: string - rateLimitUrl: - type: string - type: object trustDomain: type: string trustDomainAliases: @@ -8291,22 +8297,29 @@ spec: type: string meshId: type: string - parentShutdownDuration: - type: string privateKeyProvider: oneOf: - not: anyOf: - required: - cryptomb + - required: + - qat - required: - cryptomb + - required: + - qat properties: cryptomb: properties: pollDelay: type: string type: object + qat: + properties: + pollDelay: + type: string + type: object type: object proxyAdminPort: format: int32 @@ -8669,7 +8682,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -8698,7 +8713,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -8729,7 +8746,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -9107,13 +9126,6 @@ spec: time: type: string type: object - thriftConfig: - properties: - rateLimitTimeout: - type: string - rateLimitUrl: - type: string - type: object trustDomain: type: string trustDomainAliases: @@ -9147,7 +9159,7 @@ metadata: "helm.sh/resource-policy": keep name: peeristiocontrolplanes.servicemesh.cisco.com labels: - resource.alpha.banzaicloud.io/revision: 1.16.1 + resource.alpha.banzaicloud.io/revision: 1.17.1 spec: group: servicemesh.cisco.com names: @@ -11102,22 +11114,29 @@ spec: type: string meshId: type: string - parentShutdownDuration: - type: string privateKeyProvider: oneOf: - not: anyOf: - required: - cryptomb + - required: + - qat - required: - cryptomb + - required: + - qat properties: cryptomb: properties: pollDelay: type: string type: object + qat: + properties: + pollDelay: + type: string + type: object type: object proxyAdminPort: format: int32 @@ -11480,7 +11499,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -11509,7 +11530,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -11540,7 +11563,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -11918,13 +11943,6 @@ spec: time: type: string type: object - thriftConfig: - properties: - rateLimitTimeout: - type: string - rateLimitUrl: - type: string - type: object trustDomain: type: string trustDomainAliases: @@ -17429,22 +17447,29 @@ spec: type: string meshId: type: string - parentShutdownDuration: - type: string privateKeyProvider: oneOf: - not: anyOf: - required: - cryptomb + - required: + - qat - required: - cryptomb + - required: + - qat properties: cryptomb: properties: pollDelay: type: string type: object + qat: + properties: + pollDelay: + type: string + type: object type: object proxyAdminPort: format: int32 @@ -17807,7 +17832,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -17836,7 +17863,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -17867,7 +17896,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -18245,13 +18276,6 @@ spec: time: type: string type: object - thriftConfig: - properties: - rateLimitTimeout: - type: string - rateLimitUrl: - type: string - type: object trustDomain: type: string trustDomainAliases: @@ -18285,7 +18309,7 @@ metadata: "helm.sh/resource-policy": keep name: istiomeshes.servicemesh.cisco.com labels: - resource.alpha.banzaicloud.io/revision: 1.16.1 + resource.alpha.banzaicloud.io/revision: 1.17.1 spec: group: servicemesh.cisco.com names: @@ -18602,22 +18626,29 @@ spec: type: string meshId: type: string - parentShutdownDuration: - type: string privateKeyProvider: oneOf: - not: anyOf: - required: - cryptomb + - required: + - qat - required: - cryptomb + - required: + - qat properties: cryptomb: properties: pollDelay: type: string type: object + qat: + properties: + pollDelay: + type: string + type: object type: object proxyAdminPort: format: int32 @@ -18980,7 +19011,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -19009,7 +19042,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -19040,7 +19075,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -19418,13 +19455,6 @@ spec: time: type: string type: object - thriftConfig: - properties: - rateLimitTimeout: - type: string - rateLimitUrl: - type: string - type: object trustDomain: type: string trustDomainAliases: @@ -19463,7 +19493,7 @@ metadata: "helm.sh/resource-policy": keep name: istiomeshgateways.servicemesh.cisco.com labels: - resource.alpha.banzaicloud.io/revision: 1.16.1 + resource.alpha.banzaicloud.io/revision: 1.17.1 spec: group: servicemesh.cisco.com names: diff --git a/config/samples/servicemesh_v1alpha1_istiocontrolplane.yaml b/config/samples/servicemesh_v1alpha1_istiocontrolplane.yaml index 284d822df..d8545d3a7 100644 --- a/config/samples/servicemesh_v1alpha1_istiocontrolplane.yaml +++ b/config/samples/servicemesh_v1alpha1_istiocontrolplane.yaml @@ -1,9 +1,9 @@ apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioControlPlane metadata: - name: icp-v116x-sample + name: icp-v117x-sample spec: - version: 1.16.1 + version: 1.17.1 mode: ACTIVE meshID: mesh1 networkName: network1 @@ -18,7 +18,7 @@ spec: min: 1 max: 5 count: 1 - image: "gcr.io/istio-release/pilot:1.16.1" + image: "gcr.io/istio-release/pilot:1.17.1" resources: requests: cpu: 500m @@ -42,7 +42,7 @@ spec: operatorEndpoints: enabled: false proxy: - image: "gcr.io/istio-release/proxyv2:1.16.1" + image: "gcr.io/istio-release/proxyv2:1.17.1" privileged: false enableCoreDump: false logLevel: "WARNING" @@ -62,7 +62,7 @@ spec: excludeInboundPorts: "" excludeOutboundPorts: "" proxyInit: - image: "gcr.io/istio-release/proxyv2:1.16.1" + image: "gcr.io/istio-release/proxyv2:1.17.1" resources: limits: cpu: 2000m diff --git a/config/samples/servicemesh_v1alpha1_istiomeshgateway.yaml b/config/samples/servicemesh_v1alpha1_istiomeshgateway.yaml index 553955b46..20bc6a685 100644 --- a/config/samples/servicemesh_v1alpha1_istiomeshgateway.yaml +++ b/config/samples/servicemesh_v1alpha1_istiomeshgateway.yaml @@ -26,7 +26,7 @@ spec: runAsNonRoot: false runAsUser: 0 istioControlPlane: - name: icp-v116x-sample + name: icp-v117x-sample namespace: istio-system runAsRoot: true service: diff --git a/controllers/suite_test.go b/controllers/suite_test.go index f490dacc0..679f5e03f 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -26,7 +26,6 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" @@ -47,9 +46,7 @@ func TestAPIs(t *testing.T) { t.Parallel() RegisterFailHandler(Fail) - RunSpecsWithDefaultAndCustomReporters(t, - "Controller Suite", - []Reporter{printer.NewlineReporter{}}) + RunSpecs(t, "Controller Suite") } var _ = BeforeSuite(func(done Done) { diff --git a/controllers/version.go b/controllers/version.go index 56eb8ae85..bbfef4ea0 100644 --- a/controllers/version.go +++ b/controllers/version.go @@ -19,7 +19,7 @@ package controllers import "regexp" const ( - supportedIstioMinorVersionRegex = "^1\\.16(\\.[0-9]+)?(-.+)?$" + supportedIstioMinorVersionRegex = "^1\\.17(\\.[0-9]+)?(-.+)?$" ) func IsIstioVersionSupported(version string) bool { diff --git a/controllers/version_test.go b/controllers/version_test.go index 3914a3700..ac6a38ac8 100644 --- a/controllers/version_test.go +++ b/controllers/version_test.go @@ -25,20 +25,20 @@ import ( var _ = Describe("IsIstioVersionSupported()", func() { It("should deny unsupported versions", func() { - for _, version := range []string{"2.11", "2.11.1", "2.11.1-dev", "1.11", "1.11.1", "1.11.1-dev"} { + for _, version := range []string{"2.15", "2.15.3", "2.15.3-dev", "1.15", "1.15.3", "1.15.3-dev"} { Expect(controllers.IsIstioVersionSupported(version)).To(BeFalse(), "invalid: "+version) } }) - It("should accept all 1.16 versions", func() { - Expect(controllers.IsIstioVersionSupported("1.16")).To(BeTrue()) + It("should accept all 1.17 versions", func() { + Expect(controllers.IsIstioVersionSupported("1.17")).To(BeTrue()) }) - It("should accept all 1.16 versions with qualifier", func() { - Expect(controllers.IsIstioVersionSupported("1.16-dev")).To(BeTrue()) + It("should accept all 1.17 versions with qualifier", func() { + Expect(controllers.IsIstioVersionSupported("1.17-dev")).To(BeTrue()) }) It("should accept micro versions", func() { - Expect(controllers.IsIstioVersionSupported("1.16.1")).To(BeTrue()) + Expect(controllers.IsIstioVersionSupported("1.17.1")).To(BeTrue()) }) It("should accept micro versions with qualifier", func() { - Expect(controllers.IsIstioVersionSupported("1.16.1-dev")).To(BeTrue()) + Expect(controllers.IsIstioVersionSupported("1.17.1-dev")).To(BeTrue()) }) }) diff --git a/deploy/charts/istio-operator/Chart.yaml b/deploy/charts/istio-operator/Chart.yaml index 067aa387f..e4be4abce 100644 --- a/deploy/charts/istio-operator/Chart.yaml +++ b/deploy/charts/istio-operator/Chart.yaml @@ -11,5 +11,5 @@ icon: https://istio.io/latest/img/istio-whitelogo-bluebackground-framed.svg # Based on support status of Istio releases: https://istio.io/latest/docs/releases/supported-releases/#support-status-of-istio-releases kubeVersion: ">= 1.22.0-0 < 1.26.0-0" -version: 2.1.1 -appVersion: "v2.16.1" +version: 2.1.2 +appVersion: "v2.17.0" diff --git a/deploy/charts/istio-operator/README.md b/deploy/charts/istio-operator/README.md index 29c161533..766e99495 100644 --- a/deploy/charts/istio-operator/README.md +++ b/deploy/charts/istio-operator/README.md @@ -1,11 +1,11 @@ # Istio-operator chart -[Istio-operator](https://github.com/banzaicloud/istio-operator/tree/release-1.16) is a Kubernetes operator to deploy and manage [Istio](https://istio.io/) resources for a Kubernetes cluster. +[Istio-operator](https://github.com/banzaicloud/istio-operator/tree/release-1.17) is a Kubernetes operator to deploy and manage [Istio](https://istio.io/) resources for a Kubernetes cluster. ## Prerequisites - Helm3 -- Kubernetes 1.22.0 - 1.25.x +- Kubernetes 1.23.0 - 1.26.x ## Installing the chart @@ -33,7 +33,7 @@ The following table lists the configurable parameters of the Banzaicloud Istio O | Parameter | Description | Default | |------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------| | `image.repository` | Operator container image repository | `ghcr.io/banzaicloud/istio-operator` | -| `image.tag` | Operator container image tag | `v2.16.1` | +| `image.tag` | Operator container image tag | `v2.17.0` | | `image.pullPolicy` | Operator container image pull policy | `IfNotPresent` | | `replicaCount` | Operator deployment replica count | `1` | | `extraArgs` | Operator deployment arguments | `[]` | diff --git a/deploy/charts/istio-operator/crds/istio-operator-crds.gen.yaml b/deploy/charts/istio-operator/crds/istio-operator-crds.gen.yaml index 963e49ed6..67b23c5a6 100644 --- a/deploy/charts/istio-operator/crds/istio-operator-crds.gen.yaml +++ b/deploy/charts/istio-operator/crds/istio-operator-crds.gen.yaml @@ -6,7 +6,7 @@ metadata: "helm.sh/resource-policy": keep name: istiocontrolplanes.servicemesh.cisco.com labels: - resource.alpha.banzaicloud.io/revision: 1.16.1 + resource.alpha.banzaicloud.io/revision: 1.17.1 spec: group: servicemesh.cisco.com names: @@ -1964,22 +1964,29 @@ spec: type: string meshId: type: string - parentShutdownDuration: - type: string privateKeyProvider: oneOf: - not: anyOf: - required: - cryptomb + - required: + - qat - required: - cryptomb + - required: + - qat properties: cryptomb: properties: pollDelay: type: string type: object + qat: + properties: + pollDelay: + type: string + type: object type: object proxyAdminPort: format: int32 @@ -2342,7 +2349,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -2371,7 +2380,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -2402,7 +2413,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -2780,13 +2793,6 @@ spec: time: type: string type: object - thriftConfig: - properties: - rateLimitTimeout: - type: string - rateLimitUrl: - type: string - type: object trustDomain: type: string trustDomainAliases: @@ -8291,22 +8297,29 @@ spec: type: string meshId: type: string - parentShutdownDuration: - type: string privateKeyProvider: oneOf: - not: anyOf: - required: - cryptomb + - required: + - qat - required: - cryptomb + - required: + - qat properties: cryptomb: properties: pollDelay: type: string type: object + qat: + properties: + pollDelay: + type: string + type: object type: object proxyAdminPort: format: int32 @@ -8669,7 +8682,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -8698,7 +8713,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -8729,7 +8746,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -9107,13 +9126,6 @@ spec: time: type: string type: object - thriftConfig: - properties: - rateLimitTimeout: - type: string - rateLimitUrl: - type: string - type: object trustDomain: type: string trustDomainAliases: @@ -9147,7 +9159,7 @@ metadata: "helm.sh/resource-policy": keep name: peeristiocontrolplanes.servicemesh.cisco.com labels: - resource.alpha.banzaicloud.io/revision: 1.16.1 + resource.alpha.banzaicloud.io/revision: 1.17.1 spec: group: servicemesh.cisco.com names: @@ -11102,22 +11114,29 @@ spec: type: string meshId: type: string - parentShutdownDuration: - type: string privateKeyProvider: oneOf: - not: anyOf: - required: - cryptomb + - required: + - qat - required: - cryptomb + - required: + - qat properties: cryptomb: properties: pollDelay: type: string type: object + qat: + properties: + pollDelay: + type: string + type: object type: object proxyAdminPort: format: int32 @@ -11480,7 +11499,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -11509,7 +11530,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -11540,7 +11563,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -11918,13 +11943,6 @@ spec: time: type: string type: object - thriftConfig: - properties: - rateLimitTimeout: - type: string - rateLimitUrl: - type: string - type: object trustDomain: type: string trustDomainAliases: @@ -17429,22 +17447,29 @@ spec: type: string meshId: type: string - parentShutdownDuration: - type: string privateKeyProvider: oneOf: - not: anyOf: - required: - cryptomb + - required: + - qat - required: - cryptomb + - required: + - qat properties: cryptomb: properties: pollDelay: type: string type: object + qat: + properties: + pollDelay: + type: string + type: object type: object proxyAdminPort: format: int32 @@ -17807,7 +17832,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -17836,7 +17863,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -17867,7 +17896,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -18245,13 +18276,6 @@ spec: time: type: string type: object - thriftConfig: - properties: - rateLimitTimeout: - type: string - rateLimitUrl: - type: string - type: object trustDomain: type: string trustDomainAliases: @@ -18285,7 +18309,7 @@ metadata: "helm.sh/resource-policy": keep name: istiomeshes.servicemesh.cisco.com labels: - resource.alpha.banzaicloud.io/revision: 1.16.1 + resource.alpha.banzaicloud.io/revision: 1.17.1 spec: group: servicemesh.cisco.com names: @@ -18602,22 +18626,29 @@ spec: type: string meshId: type: string - parentShutdownDuration: - type: string privateKeyProvider: oneOf: - not: anyOf: - required: - cryptomb + - required: + - qat - required: - cryptomb + - required: + - qat properties: cryptomb: properties: pollDelay: type: string type: object + qat: + properties: + pollDelay: + type: string + type: object type: object proxyAdminPort: format: int32 @@ -18980,7 +19011,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -19009,7 +19042,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -19040,7 +19075,9 @@ spec: - envoyExtAuthzGrpc - required: - zipkin - - required: + - properties: + lightstep: {} + required: - lightstep - required: - datadog @@ -19418,13 +19455,6 @@ spec: time: type: string type: object - thriftConfig: - properties: - rateLimitTimeout: - type: string - rateLimitUrl: - type: string - type: object trustDomain: type: string trustDomainAliases: @@ -19463,7 +19493,7 @@ metadata: "helm.sh/resource-policy": keep name: istiomeshgateways.servicemesh.cisco.com labels: - resource.alpha.banzaicloud.io/revision: 1.16.1 + resource.alpha.banzaicloud.io/revision: 1.17.1 spec: group: servicemesh.cisco.com names: diff --git a/deploy/charts/istio-operator/values.yaml b/deploy/charts/istio-operator/values.yaml index 56068e08c..9098f2b20 100644 --- a/deploy/charts/istio-operator/values.yaml +++ b/deploy/charts/istio-operator/values.yaml @@ -1,6 +1,6 @@ image: repository: ghcr.io/banzaicloud/istio-operator - tag: "v2.16.1" + tag: "v2.17.0" pullPolicy: IfNotPresent replicaCount: 1 extraArgs: [] diff --git a/docs/multi-cluster-mesh/active-active/active-icp-1.yaml b/docs/multi-cluster-mesh/active-active/active-icp-1.yaml index 4c6529b3d..b7cbeb55a 100644 --- a/docs/multi-cluster-mesh/active-active/active-icp-1.yaml +++ b/docs/multi-cluster-mesh/active-active/active-icp-1.yaml @@ -1,12 +1,12 @@ apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioControlPlane metadata: - name: icp-v116x + name: icp-v117x namespace: istio-system annotations: controlplane.istio.servicemesh.cisco.com/namespace-injection-source: "true" spec: - version: 1.16.1 + version: 1.17.1 mode: ACTIVE networkName: network1 meshExpansion: diff --git a/docs/multi-cluster-mesh/active-active/active-icp-2.yaml b/docs/multi-cluster-mesh/active-active/active-icp-2.yaml index 2a0e06ac3..3822e3e08 100644 --- a/docs/multi-cluster-mesh/active-active/active-icp-2.yaml +++ b/docs/multi-cluster-mesh/active-active/active-icp-2.yaml @@ -1,10 +1,10 @@ apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioControlPlane metadata: - name: icp-v116x + name: icp-v117x namespace: istio-system spec: - version: 1.16.1 + version: 1.17.1 mode: ACTIVE networkName: network2 meshExpansion: diff --git a/docs/multi-cluster-mesh/active-active/demoapp-1.yaml b/docs/multi-cluster-mesh/active-active/demoapp-1.yaml index 3f9a8d9a7..e5b085f93 100644 --- a/docs/multi-cluster-mesh/active-active/demoapp-1.yaml +++ b/docs/multi-cluster-mesh/active-active/demoapp-1.yaml @@ -7,7 +7,7 @@ metadata: namespace: default spec: istioControlPlane: - name: icp-v116x + name: icp-v117x namespace: istio-system deployment: metadata: diff --git a/docs/multi-cluster-mesh/active-active/multi-cluster-active-active.md b/docs/multi-cluster-mesh/active-active/multi-cluster-active-active.md index 2da0f47a7..3d2455783 100644 --- a/docs/multi-cluster-mesh/active-active/multi-cluster-active-active.md +++ b/docs/multi-cluster-mesh/active-active/multi-cluster-active-active.md @@ -29,7 +29,7 @@ kubectl get -n=cluster-registry secret,cluster demo-active-2 -o yaml | pbcopy 1. Install istio operator in the `istio-system` namespace: ``` helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com -helm install --namespace=istio-system --create-namespace istio-operator-v116x banzaicloud-stable/istio-operator --set clusterRegistry.clusterAPI.enabled=true --set clusterRegistry.resourceSyncRules.enabled=true +helm install --namespace=istio-system --create-namespace istio-operator-v117x banzaicloud-stable/istio-operator --set clusterRegistry.clusterAPI.enabled=true --set clusterRegistry.resourceSyncRules.enabled=true ``` 2. Apply ACTIVE-1 `IstioControlPlane` Custom Resource to the `istio-system` namespace: ``` @@ -39,7 +39,7 @@ kubectl -n=istio-system apply -f docs/multi-cluster-mesh/active-active/active-ic 1. Install istio operator in the `istio-system` namespace: ``` helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com -helm install --namespace=istio-system --create-namespace istio-operator-v116x banzaicloud-stable/istio-operator --set clusterRegistry.clusterAPI.enabled=true --set clusterRegistry.resourceSyncRules.enabled=true +helm install --namespace=istio-system --create-namespace istio-operator-v117x banzaicloud-stable/istio-operator --set clusterRegistry.clusterAPI.enabled=true --set clusterRegistry.resourceSyncRules.enabled=true ``` 2. Apply ACTIVE-2 `IstioControlPlane` Custom Resource to the istio-system namespace: ``` @@ -50,7 +50,7 @@ kubectl -n=istio-system apply -f docs/multi-cluster-mesh/active-active/active-ic #### Active-1: Label the `default` namespace with the name and namespace of the Istio control plane. This will enable sidecar injection for the later deployed demo application. Deploy the demo application: ``` -kubectl label ns default istio.io/rev=icp-v116x.istio-system +kubectl label ns default istio.io/rev=icp-v117x.istio-system kubectl apply -f docs/multi-cluster-mesh/active-active/demoapp-1.yaml ``` #### Active-2: diff --git a/docs/multi-cluster-mesh/active-passive/active-icp.yaml b/docs/multi-cluster-mesh/active-passive/active-icp.yaml index 3d62fef9d..64f99af71 100644 --- a/docs/multi-cluster-mesh/active-passive/active-icp.yaml +++ b/docs/multi-cluster-mesh/active-passive/active-icp.yaml @@ -1,12 +1,12 @@ apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioControlPlane metadata: - name: icp-v116x + name: icp-v117x namespace: istio-system annotations: controlplane.istio.servicemesh.cisco.com/namespace-injection-source: "true" spec: - version: 1.16.1 + version: 1.17.1 mode: ACTIVE networkName: network1 meshExpansion: diff --git a/docs/multi-cluster-mesh/active-passive/demoapp-1.yaml b/docs/multi-cluster-mesh/active-passive/demoapp-1.yaml index 3f9a8d9a7..e5b085f93 100644 --- a/docs/multi-cluster-mesh/active-passive/demoapp-1.yaml +++ b/docs/multi-cluster-mesh/active-passive/demoapp-1.yaml @@ -7,7 +7,7 @@ metadata: namespace: default spec: istioControlPlane: - name: icp-v116x + name: icp-v117x namespace: istio-system deployment: metadata: diff --git a/docs/multi-cluster-mesh/active-passive/multi-cluster-active-passive.md b/docs/multi-cluster-mesh/active-passive/multi-cluster-active-passive.md index a89d395cb..36049c95b 100644 --- a/docs/multi-cluster-mesh/active-passive/multi-cluster-active-passive.md +++ b/docs/multi-cluster-mesh/active-passive/multi-cluster-active-passive.md @@ -29,7 +29,7 @@ kubectl get -n=cluster-registry secret,cluster demo-passive -o yaml | pbcopy 1. Install istio operator in the `istio-system` namespace: ``` helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com -helm install --namespace=istio-system --create-namespace istio-operator-v116x banzaicloud-stable/istio-operator --set clusterRegistry.clusterAPI.enabled=true --set clusterRegistry.resourceSyncRules.enabled=true +helm install --namespace=istio-system --create-namespace istio-operator-v117x banzaicloud-stable/istio-operator --set clusterRegistry.clusterAPI.enabled=true --set clusterRegistry.resourceSyncRules.enabled=true ``` 2. Apply ACTIVE `IstioControlPlane` Custom Resource to the `istio-system` namespace: ``` @@ -39,7 +39,7 @@ kubectl -n=istio-system apply -f docs/multi-cluster-mesh/active-passive/active-i 1. Install istio operator in the `istio-system` namespace: ``` helm repo add banzaicloud-stable https://kubernetes-charts.banzaicloud.com -helm install --namespace=istio-system --create-namespace istio-operator-v116x banzaicloud-stable/istio-operator --set clusterRegistry.clusterAPI.enabled=true --set clusterRegistry.resourceSyncRules.enabled=true +helm install --namespace=istio-system --create-namespace istio-operator-v117x banzaicloud-stable/istio-operator --set clusterRegistry.clusterAPI.enabled=true --set clusterRegistry.resourceSyncRules.enabled=true ``` 2. Apply PASSIVE `IstioControlPlane` Custom Resource to the istio-system namespace: ``` @@ -50,7 +50,7 @@ kubectl -n=istio-system apply -f docs/multi-cluster-mesh/active-passive/passive- #### Active: Label the `default` namespace with the name and namespace of the Istio control plane. This will enable sidecar injection for the later deployed demo application. Deploy the demo application: ``` -kubectl label ns default istio.io/rev=icp-v116x.istio-system +kubectl label ns default istio.io/rev=icp-v117x.istio-system kubectl apply -f docs/multi-cluster-mesh/active-passive/demoapp-1.yaml ``` #### Passive: diff --git a/docs/multi-cluster-mesh/active-passive/passive-icp.yaml b/docs/multi-cluster-mesh/active-passive/passive-icp.yaml index 2c2951488..07bf0e460 100644 --- a/docs/multi-cluster-mesh/active-passive/passive-icp.yaml +++ b/docs/multi-cluster-mesh/active-passive/passive-icp.yaml @@ -1,10 +1,10 @@ apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioControlPlane metadata: - name: icp-v116x + name: icp-v117x namespace: istio-system spec: - version: 1.16.1 + version: 1.17.1 mode: PASSIVE networkName: network2 meshExpansion: diff --git a/go.mod b/go.mod index 1159a4b74..86ed1333c 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/banzaicloud/istio-operator/v2 go 1.18 require ( - cloud.google.com/go v0.99.0 // indirect emperror.dev/errors v0.8.0 github.com/Masterminds/semver v1.5.0 // indirect github.com/Masterminds/sprig v2.22.0+incompatible @@ -12,11 +11,11 @@ require ( github.com/banzaicloud/operator-tools v0.28.2 github.com/cisco-open/cluster-registry-controller/api v0.1.9 github.com/fatih/color v1.13.0 // indirect - github.com/go-logr/logr v1.2.2 + github.com/go-logr/logr v1.2.3 github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.2 github.com/gonvenience/ytbx v1.4.4 - github.com/google/go-cmp v0.5.6 // indirect + github.com/google/go-cmp v0.5.9 // indirect github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect github.com/homeport/dyff v1.5.1 github.com/imdario/mergo v0.3.12 @@ -24,15 +23,15 @@ require ( github.com/mattn/go-isatty v0.0.14 // indirect github.com/mattn/go-runewidth v0.0.9 // indirect github.com/onsi/ginkgo v1.16.5 - github.com/onsi/gomega v1.19.0 - go.uber.org/zap v1.19.1 - istio.io/api v0.0.0-20221208070204-0528cb6ce63b - istio.io/client-go v1.16.1 - k8s.io/api v0.24.3 - k8s.io/apiextensions-apiserver v0.24.3 - k8s.io/apimachinery v0.24.3 - k8s.io/client-go v0.24.3 - sigs.k8s.io/controller-runtime v0.12.3 + github.com/onsi/gomega v1.24.1 + go.uber.org/zap v1.24.0 + istio.io/api v0.0.0-20230217221049-9d422bf48675 + istio.io/client-go v1.17.1 + k8s.io/api v0.26.1 + k8s.io/apiextensions-apiserver v0.26.1 + k8s.io/apimachinery v0.26.1 + k8s.io/client-go v0.26.1 + sigs.k8s.io/controller-runtime v0.14.4 sigs.k8s.io/yaml v1.3.0 ) @@ -41,7 +40,7 @@ require ( github.com/Masterminds/semver/v3 v3.1.1 github.com/hexops/gotextdiff v1.0.3 github.com/iancoleman/strcase v0.2.0 - google.golang.org/protobuf v1.28.0 + google.golang.org/protobuf v1.28.1 gotest.tools/v3 v3.0.3 ) @@ -58,8 +57,6 @@ require ( github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/sprig/v3 v3.2.2 // indirect github.com/Masterminds/squirrel v1.5.3 // indirect - github.com/PuerkitoBio/purell v1.1.1 // indirect - github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/briandowns/spinner v1.12.0 // indirect @@ -74,16 +71,17 @@ require ( github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-metrics v0.0.1 // indirect github.com/docker/go-units v0.4.0 // indirect - github.com/emicklei/go-restful/v3 v3.8.0 // indirect + github.com/emicklei/go-restful/v3 v3.9.0 // indirect github.com/evanphx/json-patch v5.6.0+incompatible // indirect + github.com/evanphx/json-patch/v5 v5.6.0 // indirect github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect - github.com/fsnotify/fsnotify v1.5.1 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/go-errors/errors v1.0.1 // indirect github.com/go-gorp/gorp/v3 v3.0.2 // indirect - github.com/go-logr/zapr v1.2.0 // indirect + github.com/go-logr/zapr v1.2.3 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect - github.com/go-openapi/jsonreference v0.19.5 // indirect + github.com/go-openapi/jsonreference v0.20.0 // indirect github.com/go-openapi/swag v0.19.14 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect @@ -101,7 +99,7 @@ require ( github.com/gosuri/uitable v0.0.4 // indirect github.com/huandu/xstrings v1.3.2 // indirect github.com/iancoleman/orderedmap v0.2.0 // indirect - github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/jmoiron/sqlx v1.3.5 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect @@ -122,7 +120,7 @@ require ( github.com/mitchellh/reflectwalk v1.0.2 // indirect github.com/moby/locker v1.0.1 // indirect github.com/moby/spdystream v0.2.0 // indirect - github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect + github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect @@ -132,17 +130,17 @@ require ( github.com/opencontainers/go-digest v1.0.0 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/prometheus/client_golang v1.12.1 // indirect - github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.32.1 // indirect - github.com/prometheus/procfs v0.7.3 // indirect + github.com/prometheus/client_golang v1.14.0 // indirect + github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/common v0.37.0 // indirect + github.com/prometheus/procfs v0.8.0 // indirect github.com/rubenv/sql-migrate v1.1.1 // indirect github.com/russross/blackfriday v1.5.2 // indirect github.com/sergi/go-diff v1.2.0 // indirect github.com/shopspring/decimal v1.2.0 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/spf13/cast v1.4.1 // indirect - github.com/spf13/cobra v1.4.0 // indirect + github.com/spf13/cobra v1.6.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/texttheater/golang-levenshtein v1.0.1 // indirect github.com/tidwall/gjson v1.9.3 // indirect @@ -157,35 +155,35 @@ require ( 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-20220525230936-793ad666bf5e // indirect - golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect - golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect - golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect - golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect - golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect - golang.org/x/text v0.3.7 // indirect - golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect + golang.org/x/crypto v0.1.0 // indirect + golang.org/x/net v0.4.0 // indirect + golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect + golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect + golang.org/x/sys v0.3.0 // indirect + golang.org/x/term v0.3.0 // indirect + golang.org/x/text v0.6.0 // indirect + golang.org/x/time v0.3.0 // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03 // indirect - google.golang.org/grpc v1.47.0 // indirect + google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 // indirect + google.golang.org/grpc v1.50.1 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect helm.sh/helm/v3 v3.9.4 // indirect - k8s.io/apiserver v0.24.3 // indirect + k8s.io/apiserver v0.26.1 // indirect k8s.io/cli-runtime v0.24.3 // indirect - k8s.io/component-base v0.24.3 // indirect - k8s.io/klog/v2 v2.60.1 // indirect - k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 // indirect + k8s.io/component-base v0.26.1 // indirect + k8s.io/klog/v2 v2.80.1 // indirect + k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect k8s.io/kubectl v0.24.3 // indirect - k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect + k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect oras.land/oras-go v1.2.0 // indirect - sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect + sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect sigs.k8s.io/kustomize/api v0.12.1 // indirect sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) replace github.com/banzaicloud/istio-operator/api/v2 => ./api diff --git a/go.sum b/go.sum index 37d85eab6..c4408b6e0 100644 --- a/go.sum +++ b/go.sum @@ -18,15 +18,6 @@ cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmW cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.99.0 h1:y/cM2iqGgGi5D5DQZl6D9STN/3dR/Vx5Mp8s752oJTY= -cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -81,13 +72,10 @@ github.com/Masterminds/squirrel v1.5.3/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA4 github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA= github.com/Microsoft/hcsshim v0.9.6 h1:VwnDOgLeoi2du6dAznfmspNqTiwczvjv4K7NxuY9jsY= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= -github.com/NYTimes/gziphandler v1.1.1/go.mod h1:n/CVRwUEOgIxrgPvAQhUUr9oeUtvrhMomdKFjzJNB0c= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.0.0/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= -github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tNFfI= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= github.com/PuerkitoBio/urlesc v0.0.0-20160726150825-5bd2802263f2/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= -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/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/OJnIp5u0s1SbQ8dVfLCZJsnvazdBP5hS4iRs= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -97,7 +85,6 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883 h1:bvNMNQO63//z+xNgfBlViaCIJKLlCJ6/fmUseuG0wVQ= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= @@ -118,7 +105,6 @@ github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+Ce github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/briandowns/spinner v1.12.0 h1:72O0PzqGJb6G3KgrcIOtL/JAGGZ5ptOMCn9cUHmqsmw= @@ -128,8 +114,6 @@ github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd h1:rFt+Y/IK1aEZ github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b h1:otBG+dV+YK+Soembjv71DPz3uX/V/6MMlSyD9JBQ6kQ= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0 h1:nvj0OLI3YqYXer/kZD8Ri1aaunCxIEsOst1BVJswV0o= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= @@ -145,28 +129,17 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= -github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= github.com/containerd/containerd v1.6.18 h1:qZbsLvmyu+Vlty0/Ex5xc0z2YtKpIsb5n45mAMI+2Ns= github.com/containerd/containerd v1.6.18/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-oidc v2.1.0+incompatible/go.mod h1:CgnwVTmzoESiwO9qyAFEMiHoZ1nMCKZlZ9V6mm3/LKc= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cppforlife/go-patch v0.2.0 h1:Y14MnCQjDlbw7WXT4k+u6DPAA9XnygN4BfrSpI/19RU= github.com/cppforlife/go-patch v0.2.0/go.mod h1:67a7aIi94FHDZdoeGSJRRFDp66l9MhaAG1yGxpUoFD8= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= @@ -178,8 +151,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE= github.com/denisenkom/go-mssqldb v0.9.0/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/distribution/distribution/v3 v3.0.0-20220526142353-ffbd94cbe269 h1:hbCT8ZPPMqefiAWD2ZKjn7ypokIGViTvBBg/ExLSdCk= github.com/docker/cli v20.10.17+incompatible h1:eO2KS7ZFeov5UJeaDmIs1NFEDRf32PaqRpvoEkKBy5M= github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= @@ -199,13 +170,12 @@ github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDD github.com/docker/libtrust v0.0.0-20150114040149-fa567046d9b1 h1:ZClxb8laGDf5arXfYcAtECDFgAgHklGI8CxgjHnXKJ4= github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153 h1:yUdfgN0XgIJw7foRItutHYUIhlcKzcSf5vDpdhQAKTc= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/emicklei/go-restful/v3 v3.8.0 h1:eCZ8ulSerjdAiaNpF7GxXIE7ZCMo1moN1qX+S609eVw= -github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE= +github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= @@ -213,7 +183,6 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= -github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= @@ -221,23 +190,24 @@ github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQL github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U= github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= +github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d h1:105gxyaGwCFad8crR9dcMQWvV9Hvulu6hwUh4tWPJnM= github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d/go.mod h1:ZZMPRZwes7CROmyNKgQzC3XPs6L/G2EJLHddWejkmf4= github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/felixge/httpsnoop v1.0.3 h1:s/nj+GCswXYzN5v2DpNMuMQYe+0DDwt5WVCU6CWBdXk= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/fvbommel/sortorder v1.0.1/go.mod h1:uk88iVf1ovNn1iLfgUVU2F9o5eO30ui720w+kxuqRs0= github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= -github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -251,24 +221,29 @@ github.com/go-gorp/gorp/v3 v3.0.2/go.mod h1:BJ3q1ejpV8cVALtcXvXaXyTOlMmJhWDxTmnc github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.2 h1:ahHml/yUpnlb96Rp8HCvtYVPY8ZYpxq3g7UYchIYwbs= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/zapr v1.2.0 h1:n4JnPI1T3Qq1SFEi/F8rwLrZERp2bso19PJZDB9dayk= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/zapr v1.2.0/go.mod h1:Qa4Bsj2Vb+FAVeAKsLD8RLQ+YRJB8YDmOAKxaBQf7Ro= +github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A= +github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg= github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= -github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM= github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg= +github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= +github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= @@ -292,14 +267,11 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godror/godror v0.24.2/go.mod h1:wZv/9vPiUib6tkoDl+AZ/QLf5YZgMravZ7jxH2eQWAE= github.com/gogo/protobuf v1.1.1/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/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -313,8 +285,6 @@ github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= -github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= -github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golangplus/testing v0.0.0-20180327235837-af21d9c3145e/go.mod h1:0AA//k/eakGydO4jKRoRL2j92ZKSzTgj9tclaCrvXHk= github.com/gomodule/redigo v1.8.2 h1:H5XSIre1MB5NbPYFp+i1NBbb5qN1W8Y8YAQoAYbkm8k= github.com/gonvenience/bunt v1.3.3 h1:a751qSbJIgWGbazGYr9hyuudOg7wMHh2m4JjE3tfURE= @@ -333,8 +303,6 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= -github.com/google/cel-go v0.10.1/go.mod h1:U7ayypeSkw23szu4GaQTPJGx66c20mx8JklMSxrmI1w= -github.com/google/cel-spec v0.6.0/go.mod h1:Nwjgxy5CbjlPrtCWjeDjUyKMl8w41YBYGjsyDdqk0xA= github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54= github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -348,8 +316,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= @@ -357,7 +325,6 @@ github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/ github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -369,9 +336,6 @@ github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= @@ -381,8 +345,6 @@ github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= -github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -395,10 +357,6 @@ github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA= github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= @@ -438,12 +396,12 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= +github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g= github.com/jmoiron/sqlx v1.3.5/go.mod h1:nRVWtLre0KfCLJvgxzCsLVMogSvQ1zNJtpYr2Ccp0mQ= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= @@ -461,7 +419,6 @@ github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7V github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= -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/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= @@ -497,7 +454,6 @@ github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/luciferinlove/protobuf v0.0.0-20220913214010-c63936d75066 h1:BQKOM2ATglKs0TQ55cJ/PDzqKjpzJ8P8UANBeifLHdY= github.com/luciferinlove/protobuf v0.0.0-20220913214010-c63936d75066/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= @@ -541,7 +497,6 @@ github.com/mitchellh/copystructure v1.0.0/go.mod h1:SNtv71yrdKgLRyLFxmLdkAbkKEFW github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc= github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg= github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= @@ -562,8 +517,9 @@ github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQ github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8= github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/sys/mountinfo v0.5.0 h1:2Ks8/r6lopsxWi9m58nlwjaeSzUX9iiL1vj5qB/9ObI= -github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= +github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI= +github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -585,7 +541,6 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLA github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.4/go.mod h1:zq6QwlOf5SlnkVbMSr5EoBv3636FWnp+qbPhuoO21uA= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -595,21 +550,19 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108 github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= -github.com/onsi/ginkgo/v2 v2.1.4 h1:GNapqRSid3zijZ9H77KrgVG4/8KqiyRsxcSxe+7ApXY= +github.com/onsi/ginkgo/v2 v2.6.0 h1:9t9b9vRUbFq3C4qKFCGkVuq/fIHji802N1nrtkh1mNc= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= -github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= +github.com/onsi/gomega v1.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E= +github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec= github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= 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= @@ -625,38 +578,35 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/poy/onpar v0.0.0-20190519213022-ee068f8ea4d1 h1:oL4IBbcqwhhNWh31bjOX8C/OCy0zs9906d/VUru+bqg= github.com/poy/onpar v0.0.0-20190519213022-ee068f8ea4d1/go.mod h1:nSbFQvMj97ZyhFRSJYtut+msi4sOY6zJDGCdSc+/rZU= -github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.1.0/go.mod h1:I1FGZT9+L76gKKOs5djB6ezCbFQP1xR9D75/vuwEF3g= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= +github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= +github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= @@ -677,32 +627,25 @@ github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeV github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= -github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/cobra v1.6.0 h1:42a0n6jwCot1pUmomAp4T7DeMD+20LFv4Q54pxLf2LI= +github.com/spf13/cobra v1.6.0/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= @@ -715,7 +658,7 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/texttheater/golang-levenshtein v1.0.1 h1:+cRNoVrfiwufQPhoMzB6N0Yf/Mqajr6t1lOv8GyGE2U= github.com/texttheater/golang-levenshtein v1.0.1/go.mod h1:PYAKrbF5sAiq9wd+H82hs7gNaen0CplQ9uvm6+enD/8= @@ -725,8 +668,6 @@ github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/virtuald/go-ordered-json v0.0.0-20170621173500-b18e6e673d74 h1:JwtAtbp7r/7QSyGz8mKUbYJBg2+6Cd7OjM8o/GNOcVo= 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= @@ -737,7 +678,6 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk= github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= @@ -753,18 +693,9 @@ github.com/yvasiyarov/gorelic v0.0.0-20141212073537-a9bba5b9ab50 h1:hlE8//ciYMzt github.com/yvasiyarov/newrelic_platform_go v0.0.0-20140908184405-b21fdbd4370f h1:ERexzlUfuTvpE74urLSbIQW0Z/6hF9t8U4NsJLaioAY= github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/client/v3 v3.5.0/go.mod h1:AIKXXVX/DQXtfTEqBryiLTUXwON+GuvO6Z7lLS/oTh0= -go.etcd.io/etcd/client/v3 v3.5.1/go.mod h1:OnjH4M8OnAotwaB2l9bVgZzRFKru7/ZMoS46OtKyd3Q= -go.etcd.io/etcd/pkg/v3 v3.5.0/go.mod h1:UzJGatBQ1lXChBkQF0AuAtkRQMYnHubxAEYIrC3MSsE= -go.etcd.io/etcd/raft/v3 v3.5.0/go.mod h1:UFOHSIvO/nKwd4lhkwabrTD3cqW5yVyYYf/KlD00Szc= -go.etcd.io/etcd/server/v3 v3.5.0/go.mod h1:3Ah5ruV+M+7RZr0+Y/5mNLwC+eQlni+mQmOVdCRJoS4= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -774,7 +705,6 @@ go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M= go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= go.opentelemetry.io/contrib v0.20.0/go.mod h1:G/EtFaa6qaN7+LxqfIAT3GiZa7Wv5DTBUzl5H4LY0Kc= -go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.20.0/go.mod h1:oVGt1LRbBOBq1A5BQLlUg9UaU/54aiHw8cgjV3aWZ/E= go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.20.0/go.mod h1:2AboqHi0CiIZU0qwhtUfCYD1GeUzvvIXWNkhDt7ZMG4= go.opentelemetry.io/otel v0.20.0/go.mod h1:Y3ugLH2oa81t5QO+Lty+zXf8zC9L26ax4Nzoxm/dooo= go.opentelemetry.io/otel/exporters/otlp v0.20.0/go.mod h1:YIieizyaN77rtLJra0buKiNBOm9XQfkPEKBeuhoMwAM= @@ -787,20 +717,16 @@ go.opentelemetry.io/otel/trace v0.20.0/go.mod h1:6GjCW8zgDjwGHGa6GkyeB8+/5vjT16g go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 h1:+FNtrFTmVw0YZGpBGX56XDee331t6JAXeK2bcyhLOOc= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= -go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.19.1 h1:ue41HOKd1vGURxrmeKIgELGb3jPW9DMUDGtsinblHwI= -go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI= +go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= +go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -815,8 +741,8 @@ golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e h1:T8NU3HyQ8ClP4SEE+KbFlg6n0NhuTsN4MyznaarGsZM= -golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.1.0 h1:MDRAIl0xIo9Io2xV565hzXHw3zVseKrJKodhohM5CjU= +golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -859,7 +785,6 @@ golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73r golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/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/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= @@ -890,21 +815,19 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= 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-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0= -golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU= +golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE= 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= @@ -918,11 +841,9 @@ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 h1:RerP+noqYHUQ8CMRcPlC2nvTa4dcBIjegkuWdcUDuqg= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b h1:clP8eMhB30EHdc0bd2Twtq6kgU7yl5ub2cQLSdrv1Dg= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= 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-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -934,14 +855,13 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f h1:Ax0t5p6N38Ga0dThY21weqDEyz2oklo4IvDkpigvkD8= -golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/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= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -982,7 +902,6 @@ golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -998,28 +917,23 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/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-20210514084401-e8d321eab015/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-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ= +golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.3.0 h1:qoo4akIqOcDME5bhc/NgxUdovd6BSS2uMsVjB56q1xI= +golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/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= @@ -1028,15 +942,15 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= 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= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44= golang.org/x/time v0.0.0-20220210224613-90d013bbcef8/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= +golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= 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= @@ -1093,17 +1007,13 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/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.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.10-0.20220218145154-897bd77cd717/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= 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= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= @@ -1129,15 +1039,6 @@ google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjR google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= 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/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1167,7 +1068,6 @@ google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= @@ -1179,7 +1079,6 @@ google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201102152239-715cce707fb0/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= @@ -1189,27 +1088,10 @@ google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03 h1:W70HjnmXFJm+8RNjOpIDYW2nKsSi/af0VvIZUtYkwuU= -google.golang.org/genproto v0.0.0-20220628213854-d9e0b6570c03/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= +google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55 h1:U1u4KB2kx6KR/aJDjQ97hZ15wQs8ZPvDcGcRynBhkvg= +google.golang.org/genproto v0.0.0-20221018160656-63c7b68cfc55/go.mod h1:45EK0dUbEZ2NHjCeAd2LXmyjAgGUGrpGROgjhC3ADck= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -1230,14 +1112,10 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= -google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= -google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8= -google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= +google.golang.org/grpc v1.50.1 h1:DS/BukOZWp8s6p4Dt/tOaJaTQyPyOoCcrjroHuCeLzY= +google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= 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= @@ -1246,8 +1124,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba 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= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw= -google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= 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= @@ -1259,14 +1137,9 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= -gopkg.in/square/go-jose.v2 v2.2.2/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -1293,55 +1166,61 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -istio.io/api v0.0.0-20221208070204-0528cb6ce63b h1:pVcDWtdJYwrI79dLtj4x9tO3uF3o5Ye+Xd+KOlVnyqQ= -istio.io/api v0.0.0-20221208070204-0528cb6ce63b/go.mod h1:hQkF0Q19MCmfOTre/Sg4KvrwwETq45oaFplnBm2p4j8= -istio.io/client-go v1.16.1 h1:xkCpqOL3KbuZINRcSlBqJzN+hB5Ov/Q1LsRpsyAkhI8= -istio.io/client-go v1.16.1/go.mod h1:NT96qrYnZ7AcuKnuknH/3GI+tv9Qm6VhC2ZX2vRaKeg= -k8s.io/api v0.24.3 h1:tt55QEmKd6L2k5DP6G/ZzdMQKvG5ro4H4teClqm0sTY= +istio.io/api v0.0.0-20230217221049-9d422bf48675 h1:dxHqYbJwurfq+x2OOG4WP+NkbyjURgcP9PQTsxh7HXM= +istio.io/api v0.0.0-20230217221049-9d422bf48675/go.mod h1:owGDRg9uqMob8CN1gxaOzk6nJxnbT8wrP7PmggpJHHY= +istio.io/client-go v1.17.1 h1:W0kQXYCzIluA/20zLzxeNF7bNMJXXArmGYRt/MIg2io= +istio.io/client-go v1.17.1/go.mod h1:mLTRYYFxHctzUbt8Iclgj+Sueq34+qC2ZEJTn6BxRuE= k8s.io/api v0.24.3/go.mod h1:elGR/XSZrS7z7cSZPzVWaycpJuGIw57j9b95/1PdJNI= -k8s.io/apiextensions-apiserver v0.24.3 h1:kyx+Tmro1qEsTUr07ZGQOfvTsF61yn+AxnxytBWq8As= -k8s.io/apiextensions-apiserver v0.24.3/go.mod h1:cL0xkmUefpYM4f6IuOau+6NMFEIh6/7wXe/O4vPVJ8A= +k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ= +k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg= +k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI= +k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM= k8s.io/apimachinery v0.19.2/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= -k8s.io/apimachinery v0.24.3 h1:hrFiNSA2cBZqllakVYyH/VyEh4B581bQRmqATJSeQTg= k8s.io/apimachinery v0.24.3/go.mod h1:82Bi4sCzVBdpYjyI4jY6aHX+YCUchUIrZrXKedjd2UM= -k8s.io/apiserver v0.24.3 h1:J8CKjUaZopT0hSgxjzUyp3T1GK78iixxOuFpEC0MI3k= -k8s.io/apiserver v0.24.3/go.mod h1:aXfwtIn4U27B7lYs5f2BKgz6DRbgWy+HJeYReN1jLJ8= +k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ= +k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= +k8s.io/apiserver v0.26.1 h1:6vmnAqCDO194SVCPU3MU8NcDgSqsUA62tBUSWrFXhsc= +k8s.io/apiserver v0.26.1/go.mod h1:wr75z634Cv+sifswE9HlAo5FQ7UoUauIICRlOE+5dCg= k8s.io/cli-runtime v0.24.3 h1:O9YvUHrDSCQUPlsqVmaqDrueqjpJ7IO6Yas9B6xGSoo= k8s.io/cli-runtime v0.24.3/go.mod h1:In84wauoMOqa7JDvDSXGbf8lTNlr70fOGpYlYfJtSqA= -k8s.io/client-go v0.24.3 h1:Nl1840+6p4JqkFWEW2LnMKU667BUxw03REfLAVhuKQY= k8s.io/client-go v0.24.3/go.mod h1:AAovolf5Z9bY1wIg2FZ8LPQlEdKHjLI7ZD4rw920BJw= +k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU= +k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE= k8s.io/code-generator v0.24.3/go.mod h1:dpVhs00hTuTdTY6jvVxvTFCk6gSMrtfRydbhZwHI15w= -k8s.io/component-base v0.24.3 h1:u99WjuHYCRJjS1xeLOx72DdRaghuDnuMgueiGMFy1ec= k8s.io/component-base v0.24.3/go.mod h1:bqom2IWN9Lj+vwAkPNOv2TflsP1PeVDIwIN0lRthxYY= +k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4= +k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU= k8s.io/component-helpers v0.24.3/go.mod h1:/1WNW8TfBOijQ1ED2uCHb4wtXYWDVNMqUll8h36iNVo= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/klog/v2 v2.60.1 h1:VW25q3bZx9uE3vvdL6M8ezOX79vA2Aq1nEWLqNQclHc= k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= +k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw= k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42/go.mod h1:Z/45zLw8lUo4wdiUkI+v/ImEGAvu3WatcZl3lPMR4Rk= -k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8 h1:yEQKdMCjzAOvGeiTwG4hO/hNVNtDOuUFvMUZ0OlaIzs= -k8s.io/kube-openapi v0.0.0-20220627174259-011e075b9cb8/go.mod h1:mbJ+NSUoAhuR14N0S63bPkh8MGVSo3VYSGZtH/mfMe0= +k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= +k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= k8s.io/kubectl v0.24.3 h1:PqY8ho/S/KuE2/hCC3Iee7X+lOtARYo0LQsNzvV/edE= k8s.io/kubectl v0.24.3/go.mod h1:PYLcvw96sC1NLbxZEDbdlOEd6/C76VIWjGmWV5QjSk0= k8s.io/metrics v0.24.3/go.mod h1:p1M0lhMySWfhISkSd3HEj8xIgrVnJTK3PPhFq2rA3To= k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= -k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc= k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y= +k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= oras.land/oras-go v1.2.0 h1:yoKosVIbsPoFMqAIFHTnrmOuafHal+J/r+I5bdbVWu4= oras.land/oras-go v1.2.0/go.mod h1:pFNs7oHp2dYsYMSS82HaX5l4mpnGO7hbpPN6EWH2ltc= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.30/go.mod h1:fEO7lRTdivWO2qYVCVG7dEADOMo/MLDCVr8So2g88Uw= -sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio= -sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0= -sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 h1:kDi4JBNAsJWfz1aEXhO8Jg87JJaPNLh5tIzYHgStQ9Y= +sigs.k8s.io/controller-runtime v0.14.4 h1:Kd/Qgx5pd2XUL08eOV2vwIq3L9GhIbJ5Nxengbd4/0M= +sigs.k8s.io/controller-runtime v0.14.4/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0= sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY= +sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= +sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= sigs.k8s.io/kustomize/api v0.11.4/go.mod h1:k+8RsqYbgpkIrJ4p9jcdPqe8DprLxFUUO0yNOq8C+xI= sigs.k8s.io/kustomize/api v0.12.1 h1:7YM7gW3kYBwtKvoY216ZzY+8hM+lV53LUayghNRJ0vM= sigs.k8s.io/kustomize/api v0.12.1/go.mod h1:y3JUhimkZkR6sbLNwfJHxvo1TCLwuwm14sCYnkH6S1s= @@ -1352,8 +1231,9 @@ sigs.k8s.io/kustomize/kyaml v0.13.9 h1:Qz53EAaFFANyNgyOEJbT/yoIHygK40/ZcvU3rgry2 sigs.k8s.io/kustomize/kyaml v0.13.9/go.mod h1:QsRbD0/KcU+wdk0/L0fIp2KLnohkVzs6fQ85/nOXac4= sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= -sigs.k8s.io/structured-merge-diff/v4 v4.2.1 h1:bKCqE9GvQ5tiVHn5rfn1r+yao3aLQEaLzkkmAkf+A6Y= sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= +sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= diff --git a/internal/assets/manifests/istio-cni/templates/daemonset.yaml b/internal/assets/manifests/istio-cni/templates/daemonset.yaml index e9de7a9cf..efdb6a0f2 100644 --- a/internal/assets/manifests/istio-cni/templates/daemonset.yaml +++ b/internal/assets/manifests/istio-cni/templates/daemonset.yaml @@ -75,6 +75,9 @@ spec: {{- if .Values.global.logging.level }} - --log_output_level={{ .Values.global.logging.level }} {{- end }} + {{- if .Values.global.logAsJson }} + - --log_as_json + {{- end}} env: {{- if .Values.cni.cniConfFileName }} # Name of the CNI config file to create. diff --git a/internal/assets/manifests/istio-cni/values.yaml b/internal/assets/manifests/istio-cni/values.yaml index cdff37f67..b3ea5ce37 100644 --- a/internal/assets/manifests/istio-cni/values.yaml +++ b/internal/assets/manifests/istio-cni/values.yaml @@ -110,6 +110,8 @@ global: logging: level: default:info,cni:info + logAsJson: false + # ImagePullSecrets for all ServiceAccount, list of secrets in the same namespace # to use for pulling any images in pods that reference this ServiceAccount. # For components that don't use ServiceAccounts (i.e. grafana, servicegraph, tracing) diff --git a/internal/assets/manifests/istio-discovery/resources/gateway-injection-template.yaml b/internal/assets/manifests/istio-discovery/resources/gateway-injection-template.yaml index 3c2cd5bf6..efd137f01 100644 --- a/internal/assets/manifests/istio-discovery/resources/gateway-injection-template.yaml +++ b/internal/assets/manifests/istio-discovery/resources/gateway-injection-template.yaml @@ -92,6 +92,10 @@ spec: value: "{{ $containers | join "," }}" - name: ISTIO_META_CLUSTER_ID value: "{{ valueOrDefault .Values.global.multiCluster.clusterName `Kubernetes` }}" + - name: ISTIO_META_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName - name: ISTIO_META_INTERCEPTION_MODE value: "{{ .ProxyConfig.InterceptionMode.String }}" {{- if .Values.global.network }} diff --git a/internal/assets/manifests/istio-discovery/resources/gen-istio.yaml b/internal/assets/manifests/istio-discovery/resources/gen-istio.yaml index a08ba4d2e..6c225259c 100644 --- a/internal/assets/manifests/istio-discovery/resources/gen-istio.yaml +++ b/internal/assets/manifests/istio-discovery/resources/gen-istio.yaml @@ -43,7 +43,7 @@ data: zipkin: address: zipkin.istio-system:9411 enablePrometheusMerge: true - rootNamespace: null + rootNamespace: istio-system trustDomain: cluster.local --- # Source: istio-discovery/templates/istiod-injector-configmap.yaml @@ -62,7 +62,11 @@ data: values: |- { "global": { + "autoscalingv2API": true, "caAddress": "", + "caName": "", + "certSigners": [], + "configCluster": false, "defaultPodDisruptionBudget": { "enabled": true }, @@ -109,6 +113,8 @@ data: "holdApplicationUntilProxyStarts": false, "image": "proxyv2", "includeIPRanges": "*", + "includeInboundPorts": "*", + "includeOutboundPorts": "", "logLevel": "warning", "privileged": false, "readinessFailureThreshold": 30, @@ -158,7 +164,8 @@ data: "address": "" } }, - "useMCP": false + "useMCP": false, + "variant": "" }, "revision": "", "sidecarInjectorWebhook": { @@ -168,8 +175,7 @@ data: "injectedAnnotations": {}, "neverInjectSelector": [], "rewriteAppHTTPProbe": true, - "templates": {}, - "useLegacySelectors": false + "templates": {} } } @@ -190,11 +196,40 @@ data: template: "{{ Template_Version_And_Istio_Version_Mismatched_Check_Installation }}" templates: sidecar: | + {{- define "resources" }} + {{- if or (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit`) }} + {{- if or (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory`) }} + requests: + {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU`) -}} + cpu: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU` }}" + {{ end }} + {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory`) -}} + memory: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory` }}" + {{ end }} + {{- end }} + {{- if or (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit`) }} + limits: + {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit`) -}} + cpu: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit` }}" + {{ end }} + {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit`) -}} + memory: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit` }}" + {{ end }} + {{- end }} + {{- else }} + {{- if .Values.global.proxy.resources }} + {{ toYaml .Values.global.proxy.resources | indent 6 }} + {{- end }} + {{- end }} + {{- end }} {{- $containers := list }} {{- range $index, $container := .Spec.Containers }}{{ if not (eq $container.Name "istio-proxy") }}{{ $containers = append $containers $container.Name }}{{end}}{{- end}} metadata: labels: security.istio.io/tlsMode: {{ index .ObjectMeta.Labels `security.istio.io/tlsMode` | default "istio" | quote }} + {{- if eq (index .ProxyConfig.ProxyMetadata "ISTIO_META_ENABLE_HBONE") "true" }} + networking.istio.io/tunnel: {{ index .ObjectMeta.Labels `networking.istio.io/tunnel` | default "http" | quote }} + {{- end }} service.istio.io/canonical-name: {{ index .ObjectMeta.Labels `service.istio.io/canonical-name` | default (index .ObjectMeta.Labels `app.kubernetes.io/name`) | default (index .ObjectMeta.Labels `app`) | default .DeploymentMeta.Name | quote }} service.istio.io/canonical-revision: {{ index .ObjectMeta.Labels `service.istio.io/canonical-revision` | default (index .ObjectMeta.Labels `app.kubernetes.io/version`) | default (index .ObjectMeta.Labels `version`) | default "latest" | quote }} istio.io/rev: {{ .Revision | default "default" | quote }} @@ -214,7 +249,7 @@ data: sidecar.istio.io/interceptionMode: "{{ annotation .ObjectMeta `sidecar.istio.io/interceptionMode` .ProxyConfig.InterceptionMode }}", {{ with annotation .ObjectMeta `traffic.sidecar.istio.io/includeOutboundIPRanges` .Values.global.proxy.includeIPRanges }}traffic.sidecar.istio.io/includeOutboundIPRanges: "{{.}}",{{ end }} {{ with annotation .ObjectMeta `traffic.sidecar.istio.io/excludeOutboundIPRanges` .Values.global.proxy.excludeIPRanges }}traffic.sidecar.istio.io/excludeOutboundIPRanges: "{{.}}",{{ end }} - traffic.sidecar.istio.io/includeInboundPorts: "{{ annotation .ObjectMeta `traffic.sidecar.istio.io/includeInboundPorts` `*` }}", + {{ with annotation .ObjectMeta `traffic.sidecar.istio.io/includeInboundPorts` .Values.global.proxy.includeInboundPorts }}traffic.sidecar.istio.io/includeInboundPorts: "{{.}}",{{ end }} traffic.sidecar.istio.io/excludeInboundPorts: "{{ excludeInboundPort (annotation .ObjectMeta `status.sidecar.istio.io/port` .Values.global.proxy.statusPort) (annotation .ObjectMeta `traffic.sidecar.istio.io/excludeInboundPorts` .Values.global.proxy.excludeInboundPorts) }}", {{ if or (isset .ObjectMeta.Annotations `traffic.sidecar.istio.io/includeOutboundPorts`) (ne (valueOrDefault .Values.global.proxy.includeOutboundPorts "") "") }} traffic.sidecar.istio.io/includeOutboundPorts: "{{ annotation .ObjectMeta `traffic.sidecar.istio.io/includeOutboundPorts` .Values.global.proxy.includeOutboundPorts }}", @@ -238,12 +273,12 @@ data: {{- if contains "/" (annotation .ObjectMeta `sidecar.istio.io/proxyImage` .Values.global.proxy_init.image) }} image: "{{ annotation .ObjectMeta `sidecar.istio.io/proxyImage` .Values.global.proxy_init.image }}" {{- else }} - image: "{{ .Values.global.hub }}/{{ .Values.global.proxy_init.image }}:{{ .Values.global.tag }}" + image: "{{ .ProxyImage }}" {{- end }} args: - istio-iptables - "-p" - - "15001" + - {{ .MeshConfig.ProxyListenPort | default "15001" | quote }} - "-z" - "15006" - "-u" @@ -255,7 +290,7 @@ data: - "-x" - "{{ annotation .ObjectMeta `traffic.sidecar.istio.io/excludeOutboundIPRanges` .Values.global.proxy.excludeIPRanges }}" - "-b" - - "{{ annotation .ObjectMeta `traffic.sidecar.istio.io/includeInboundPorts` `*` }}" + - "{{ annotation .ObjectMeta `traffic.sidecar.istio.io/includeInboundPorts` .Values.global.proxy.includeInboundPorts }}" - "-d" {{- if excludeInboundPort (annotation .ObjectMeta `status.sidecar.istio.io/port` .Values.global.proxy.statusPort) (annotation .ObjectMeta `traffic.sidecar.istio.io/excludeInboundPorts` .Values.global.proxy.excludeInboundPorts) }} - "15090,15021,{{ excludeInboundPort (annotation .ObjectMeta `status.sidecar.istio.io/port` .Values.global.proxy.statusPort) (annotation .ObjectMeta `traffic.sidecar.istio.io/excludeInboundPorts` .Values.global.proxy.excludeInboundPorts) }}" @@ -295,30 +330,7 @@ data: {{- end }} {{- end }} resources: - {{- if or (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit`) }} - {{- if or (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory`) }} - requests: - {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU`) -}} - cpu: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU` }}" - {{ end }} - {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory`) -}} - memory: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory` }}" - {{ end }} - {{- end }} - {{- if or (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit`) }} - limits: - {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit`) -}} - cpu: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit` }}" - {{ end }} - {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit`) -}} - memory: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit` }}" - {{ end }} - {{- end }} - {{- else }} - {{- if .Values.global.proxy.resources }} - {{ toYaml .Values.global.proxy.resources | indent 6 }} - {{- end }} - {{- end }} + {{ template "resources" . }} securityContext: allowPrivilegeEscalation: {{ .Values.global.proxy.privileged }} privileged: {{ .Values.global.proxy.privileged }} @@ -343,7 +355,7 @@ data: {{- end }} restartPolicy: Always {{ end -}} - {{- if eq .Values.global.proxy.enableCoreDump true }} + {{- if eq (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }} - name: enable-core-dump args: - -c @@ -353,10 +365,11 @@ data: {{- if contains "/" (annotation .ObjectMeta `sidecar.istio.io/proxyImage` .Values.global.proxy_init.image) }} image: "{{ annotation .ObjectMeta `sidecar.istio.io/proxyImage` .Values.global.proxy_init.image }}" {{- else }} - image: "{{ .Values.global.hub }}/{{ .Values.global.proxy_init.image }}:{{ .Values.global.tag }}" + image: "{{ .ProxyImage }}" {{- end }} {{with .Values.global.imagePullPolicy }}imagePullPolicy: "{{.}}"{{end}} - resources: {} + resources: + {{ template "resources" . }} securityContext: allowPrivilegeEscalation: true capabilities: @@ -375,7 +388,7 @@ data: {{- if contains "/" (annotation .ObjectMeta `sidecar.istio.io/proxyImage` .Values.global.proxy.image) }} image: "{{ annotation .ObjectMeta `sidecar.istio.io/proxyImage` .Values.global.proxy.image }}" {{- else }} - image: "{{ .Values.global.hub }}/{{ .Values.global.proxy.image }}:{{ .Values.global.tag }}" + image: "{{ .ProxyImage }}" {{- end }} ports: - containerPort: 15090 @@ -386,12 +399,6 @@ data: - sidecar - --domain - $(POD_NAMESPACE).svc.{{ .Values.global.proxy.clusterDomain }} - - --serviceCluster - {{ if ne "" (index .ObjectMeta.Labels "app") -}} - - "{{ index .ObjectMeta.Labels `app` }}.$(POD_NAMESPACE)" - {{ else -}} - - "{{ valueOrDefault .DeploymentMeta.Name `istio-proxy` }}.{{ valueOrDefault .DeploymentMeta.Namespace `default` }}" - {{ end -}} - --proxyLogLevel={{ annotation .ObjectMeta `sidecar.istio.io/logLevel` .Values.global.proxy.logLevel }} - --proxyComponentLogLevel={{ annotation .ObjectMeta `sidecar.istio.io/componentLogLevel` .Values.global.proxy.componentLogLevel }} - --log_output_level={{ annotation .ObjectMeta `sidecar.istio.io/agentLogLevel` .Values.global.logging.level }} @@ -401,9 +408,9 @@ data: {{- if .Values.global.logAsJson }} - --log_as_json {{- end }} - {{- if gt .ProxyConfig.Concurrency.GetValue 0 }} + {{- if gt .EstimatedConcurrency 0 }} - --concurrency - - "{{ .ProxyConfig.Concurrency.GetValue }}" + - "{{ .EstimatedConcurrency }}" {{- end -}} {{- if .Values.global.proxy.lifecycle }} lifecycle: @@ -451,14 +458,6 @@ data: valueFrom: fieldRef: fieldPath: status.hostIP - - name: CANONICAL_SERVICE - valueFrom: - fieldRef: - fieldPath: metadata.labels['service.istio.io/canonical-name'] - - name: CANONICAL_REVISION - valueFrom: - fieldRef: - fieldPath: metadata.labels['service.istio.io/canonical-revision'] - name: PROXY_CONFIG value: | {{ protoToJSON .ProxyConfig }} @@ -479,17 +478,16 @@ data: value: "{{ $containers | join "," }}" - name: ISTIO_META_CLUSTER_ID value: "{{ valueOrDefault .Values.global.multiCluster.clusterName `Kubernetes` }}" + - name: ISTIO_META_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName - name: ISTIO_META_INTERCEPTION_MODE value: "{{ or (index .ObjectMeta.Annotations `sidecar.istio.io/interceptionMode`) .ProxyConfig.InterceptionMode.String }}" {{- if .Values.global.network }} - name: ISTIO_META_NETWORK value: "{{ .Values.global.network }}" {{- end }} - {{ if .ObjectMeta.Annotations }} - - name: ISTIO_METAJSON_ANNOTATIONS - value: | - {{ toJSON .ObjectMeta.Annotations }} - {{ end }} {{- if .DeploymentMeta.Name }} - name: ISTIO_META_WORKLOAD_NAME value: "{{ .DeploymentMeta.Name }}" @@ -535,6 +533,20 @@ data: failureThreshold: {{ annotation .ObjectMeta `readiness.status.sidecar.istio.io/failureThreshold` .Values.global.proxy.readinessFailureThreshold }} {{ end -}} securityContext: + {{- if eq (index .ProxyConfig.ProxyMetadata "IPTABLES_TRACE_LOGGING") "true" }} + allowPrivilegeEscalation: true + capabilities: + add: + - NET_ADMIN + drop: + - ALL + privileged: true + readOnlyRootFilesystem: {{ ne (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }} + runAsGroup: 1337 + fsGroup: 1337 + runAsNonRoot: false + runAsUser: 0 + {{- else }} allowPrivilegeEscalation: {{ .Values.global.proxy.privileged }} capabilities: {{ if or (eq (annotation .ObjectMeta `sidecar.istio.io/interceptionMode` .ProxyConfig.InterceptionMode) `TPROXY`) (eq (annotation .ObjectMeta `sidecar.istio.io/capNetBindService` .Values.global.proxy.capNetBindService) `true`) -}} @@ -549,7 +561,7 @@ data: drop: - ALL privileged: {{ .Values.global.proxy.privileged }} - readOnlyRootFilesystem: {{ not .Values.global.proxy.enableCoreDump }} + readOnlyRootFilesystem: {{ ne (annotation .ObjectMeta `sidecar.istio.io/enableCoreDump` .Values.global.proxy.enableCoreDump) "true" }} runAsGroup: 1337 fsGroup: 1337 {{ if or (eq (annotation .ObjectMeta `sidecar.istio.io/interceptionMode` .ProxyConfig.InterceptionMode) `TPROXY`) (eq (annotation .ObjectMeta `sidecar.istio.io/capNetBindService` .Values.global.proxy.capNetBindService) `true`) -}} @@ -559,31 +571,9 @@ data: runAsNonRoot: true runAsUser: 1337 {{- end }} + {{- end }} resources: - {{- if or (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit`) }} - {{- if or (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory`) }} - requests: - {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU`) -}} - cpu: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU` }}" - {{ end }} - {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory`) -}} - memory: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory` }}" - {{ end }} - {{- end }} - {{- if or (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit`) }} - limits: - {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit`) -}} - cpu: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit` }}" - {{ end }} - {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit`) -}} - memory: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit` }}" - {{ end }} - {{- end }} - {{- else }} - {{- if .Values.global.proxy.resources }} - {{ toYaml .Values.global.proxy.resources | indent 6 }} - {{- end }} - {{- end }} + {{ template "resources" . }} volumeMounts: - name: workload-socket mountPath: /var/run/secrets/workload-spiffe-uds @@ -601,6 +591,10 @@ data: - mountPath: /var/run/secrets/istio name: istiod-ca-cert {{- end }} + {{- if eq .Values.global.pilotCertProvider "kubernetes" }} + - mountPath: /var/run/secrets/istio/kubernetes + name: kube-ca-cert + {{- end }} - mountPath: /var/lib/istio/data name: istio-data {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/bootstrapOverride`) }} @@ -666,16 +660,6 @@ data: - path: "annotations" fieldRef: fieldPath: metadata.annotations - - path: "cpu-limit" - resourceFieldRef: - containerName: istio-proxy - resource: limits.cpu - divisor: 1m - - path: "cpu-request" - resourceFieldRef: - containerName: istio-proxy - resource: requests.cpu - divisor: 1m {{- if eq .Values.global.jwtPolicy "third-party-jwt" }} - name: istio-token projected: @@ -690,6 +674,11 @@ data: configMap: name: istio-ca-root-cert {{- end }} + {{- if eq .Values.global.pilotCertProvider "kubernetes" }} + - name: kube-ca-cert + configMap: + name: kube-root-ca.crt + {{- end }} {{- if .Values.global.mountMtlsCerts }} # Use the key and cert mounted to /etc/certs/ for the in-cluster mTLS communications. - name: istio-certs @@ -719,7 +708,7 @@ data: - name: {{ . }} {{- end }} {{- end }} - {{- if eq (env "ENABLE_LEGACY_FSGROUP_INJECTION" "true") "true" }} + {{- if eq (env "ENABLE_LEGACY_FSGROUP_INJECTION" "false") "true" }} securityContext: fsGroup: 1337 {{- end }} @@ -743,23 +732,347 @@ data: {{- if contains "/" .Values.global.proxy.image }} image: "{{ annotation .ObjectMeta `sidecar.istio.io/proxyImage` .Values.global.proxy.image }}" {{- else }} - image: "{{ .Values.global.hub }}/{{ .Values.global.proxy.image }}:{{ .Values.global.tag }}" + image: "{{ .ProxyImage }}" {{- end }} ports: - containerPort: 15090 protocol: TCP - name: http-envoy-prom + name: http-envoy-prom + args: + - proxy + - router + - --domain + - $(POD_NAMESPACE).svc.{{ .Values.global.proxy.clusterDomain }} + - --proxyLogLevel={{ annotation .ObjectMeta `sidecar.istio.io/logLevel` .Values.global.proxy.logLevel }} + - --proxyComponentLogLevel={{ annotation .ObjectMeta `sidecar.istio.io/componentLogLevel` .Values.global.proxy.componentLogLevel }} + - --log_output_level={{ annotation .ObjectMeta `sidecar.istio.io/agentLogLevel` .Values.global.logging.level }} + {{- if .Values.global.sts.servicePort }} + - --stsPort={{ .Values.global.sts.servicePort }} + {{- end }} + {{- if .Values.global.logAsJson }} + - --log_as_json + {{- end }} + {{- if .Values.global.proxy.lifecycle }} + lifecycle: + {{ toYaml .Values.global.proxy.lifecycle | indent 6 }} + {{- end }} + env: + - name: JWT_POLICY + value: {{ .Values.global.jwtPolicy }} + - name: PILOT_CERT_PROVIDER + value: {{ .Values.global.pilotCertProvider }} + - name: CA_ADDR + {{- if .Values.global.caAddress }} + value: {{ .Values.global.caAddress }} + {{- else }} + value: istiod{{- if not (eq .Values.revision "") }}-{{ .Values.revision }}{{- end }}.{{ .Values.global.istioNamespace }}.svc:15012 + {{- end }} + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: INSTANCE_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: SERVICE_ACCOUNT + valueFrom: + fieldRef: + fieldPath: spec.serviceAccountName + - name: HOST_IP + valueFrom: + fieldRef: + fieldPath: status.hostIP + - name: PROXY_CONFIG + value: | + {{ protoToJSON .ProxyConfig }} + - name: ISTIO_META_POD_PORTS + value: |- + [ + {{- $first := true }} + {{- range $index1, $c := .Spec.Containers }} + {{- range $index2, $p := $c.Ports }} + {{- if (structToJSON $p) }} + {{if not $first}},{{end}}{{ structToJSON $p }} + {{- $first = false }} + {{- end }} + {{- end}} + {{- end}} + ] + - name: ISTIO_META_APP_CONTAINERS + value: "{{ $containers | join "," }}" + - name: ISTIO_META_CLUSTER_ID + value: "{{ valueOrDefault .Values.global.multiCluster.clusterName `Kubernetes` }}" + - name: ISTIO_META_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: ISTIO_META_INTERCEPTION_MODE + value: "{{ .ProxyConfig.InterceptionMode.String }}" + {{- if .Values.global.network }} + - name: ISTIO_META_NETWORK + value: "{{ .Values.global.network }}" + {{- end }} + {{- if .DeploymentMeta.Name }} + - name: ISTIO_META_WORKLOAD_NAME + value: "{{ .DeploymentMeta.Name }}" + {{ end }} + {{- if and .TypeMeta.APIVersion .DeploymentMeta.Name }} + - name: ISTIO_META_OWNER + value: kubernetes://apis/{{ .TypeMeta.APIVersion }}/namespaces/{{ valueOrDefault .DeploymentMeta.Namespace `default` }}/{{ toLower .TypeMeta.Kind}}s/{{ .DeploymentMeta.Name }} + {{- end}} + {{- if .Values.global.meshID }} + - name: ISTIO_META_MESH_ID + value: "{{ .Values.global.meshID }}" + {{- else if (valueOrDefault .MeshConfig.TrustDomain .Values.global.trustDomain) }} + - name: ISTIO_META_MESH_ID + value: "{{ (valueOrDefault .MeshConfig.TrustDomain .Values.global.trustDomain) }}" + {{- end }} + {{- with (valueOrDefault .MeshConfig.TrustDomain .Values.global.trustDomain) }} + - name: TRUST_DOMAIN + value: "{{ . }}" + {{- end }} + {{- range $key, $value := .ProxyConfig.ProxyMetadata }} + - name: {{ $key }} + value: "{{ $value }}" + {{- end }} + {{with .Values.global.imagePullPolicy }}imagePullPolicy: "{{.}}"{{end}} + readinessProbe: + httpGet: + path: /healthz/ready + port: 15021 + initialDelaySeconds: {{.Values.global.proxy.readinessInitialDelaySeconds }} + periodSeconds: {{ .Values.global.proxy.readinessPeriodSeconds }} + timeoutSeconds: 3 + failureThreshold: {{ .Values.global.proxy.readinessFailureThreshold }} + volumeMounts: + - name: workload-socket + mountPath: /var/run/secrets/workload-spiffe-uds + - name: credential-socket + mountPath: /var/run/secrets/credential-uds + {{- if eq .Values.global.caName "GkeWorkloadCertificate" }} + - name: gke-workload-certificate + mountPath: /var/run/secrets/workload-spiffe-credentials + readOnly: true + {{- else }} + - name: workload-certs + mountPath: /var/run/secrets/workload-spiffe-credentials + {{- end }} + {{- if eq .Values.global.pilotCertProvider "istiod" }} + - mountPath: /var/run/secrets/istio + name: istiod-ca-cert + {{- end }} + - mountPath: /var/lib/istio/data + name: istio-data + # SDS channel between istioagent and Envoy + - mountPath: /etc/istio/proxy + name: istio-envoy + {{- if eq .Values.global.jwtPolicy "third-party-jwt" }} + - mountPath: /var/run/secrets/tokens + name: istio-token + {{- end }} + {{- if .Values.global.mountMtlsCerts }} + # Use the key and cert mounted to /etc/certs/ for the in-cluster mTLS communications. + - mountPath: /etc/certs/ + name: istio-certs + readOnly: true + {{- end }} + - name: istio-podinfo + mountPath: /etc/istio/pod + volumes: + - emptyDir: {} + name: workload-socket + - emptyDir: {} + name: credential-socket + {{- if eq .Values.global.caName "GkeWorkloadCertificate" }} + - name: gke-workload-certificate + csi: + driver: workloadcertificates.security.cloud.google.com + {{- else}} + - emptyDir: {} + name: workload-certs + {{- end }} + # SDS channel between istioagent and Envoy + - emptyDir: + medium: Memory + name: istio-envoy + - name: istio-data + emptyDir: {} + - name: istio-podinfo + downwardAPI: + items: + - path: "labels" + fieldRef: + fieldPath: metadata.labels + - path: "annotations" + fieldRef: + fieldPath: metadata.annotations + {{- if eq .Values.global.jwtPolicy "third-party-jwt" }} + - name: istio-token + projected: + sources: + - serviceAccountToken: + path: istio-token + expirationSeconds: 43200 + audience: {{ .Values.global.sds.token.aud }} + {{- end }} + {{- if eq .Values.global.pilotCertProvider "istiod" }} + - name: istiod-ca-cert + configMap: + name: istio-ca-root-cert + {{- end }} + {{- if .Values.global.mountMtlsCerts }} + # Use the key and cert mounted to /etc/certs/ for the in-cluster mTLS communications. + - name: istio-certs + secret: + optional: true + {{ if eq .Spec.ServiceAccountName "" }} + secretName: istio.default + {{ else -}} + secretName: {{ printf "istio.%s" .Spec.ServiceAccountName }} + {{ end -}} + {{- end }} + {{- if .Values.global.imagePullSecrets }} + imagePullSecrets: + {{- range .Values.global.imagePullSecrets }} + - name: {{ . }} + {{- end }} + {{- end }} + {{- if eq (env "ENABLE_LEGACY_FSGROUP_INJECTION" "false") "true" }} + securityContext: + fsGroup: 1337 + {{- end }} + grpc-simple: | + metadata: + sidecar.istio.io/rewriteAppHTTPProbers: "false" + spec: + initContainers: + - name: grpc-bootstrap-init + image: busybox:1.28 + volumeMounts: + - mountPath: /var/lib/grpc/data/ + name: grpc-io-proxyless-bootstrap + env: + - name: INSTANCE_IP + valueFrom: + fieldRef: + fieldPath: status.podIP + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: ISTIO_NAMESPACE + value: | + {{ .Values.global.istioNamespace }} + command: + - sh + - "-c" + - |- + NODE_ID="sidecar~${INSTANCE_IP}~${POD_NAME}.${POD_NAMESPACE}~cluster.local" + SERVER_URI="dns:///istiod.${ISTIO_NAMESPACE}.svc:15010" + echo ' + { + "xds_servers": [ + { + "server_uri": "'${SERVER_URI}'", + "channel_creds": [{"type": "insecure"}], + "server_features" : ["xds_v3"] + } + ], + "node": { + "id": "'${NODE_ID}'", + "metadata": { + "GENERATOR": "grpc" + } + } + }' > /var/lib/grpc/data/bootstrap.json + containers: + {{- range $index, $container := .Spec.Containers }} + - name: {{ $container.Name }} + env: + - name: GRPC_XDS_BOOTSTRAP + value: /var/lib/grpc/data/bootstrap.json + - name: GRPC_GO_LOG_VERBOSITY_LEVEL + value: "99" + - name: GRPC_GO_LOG_SEVERITY_LEVEL + value: info + volumeMounts: + - mountPath: /var/lib/grpc/data/ + name: grpc-io-proxyless-bootstrap + {{- end }} + volumes: + - name: grpc-io-proxyless-bootstrap + emptyDir: {} + grpc-agent: | + {{- define "resources" }} + {{- if or (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit`) }} + {{- if or (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory`) }} + requests: + {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU`) -}} + cpu: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyCPU` }}" + {{ end }} + {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory`) -}} + memory: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyMemory` }}" + {{ end }} + {{- end }} + {{- if or (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit`) (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit`) }} + limits: + {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit`) -}} + cpu: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyCPULimit` }}" + {{ end }} + {{ if (isset .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit`) -}} + memory: "{{ index .ObjectMeta.Annotations `sidecar.istio.io/proxyMemoryLimit` }}" + {{ end }} + {{- end }} + {{- else }} + {{- if .Values.global.proxy.resources }} + {{ toYaml .Values.global.proxy.resources | indent 6 }} + {{- end }} + {{- end }} + {{- end }} + {{- $containers := list }} + {{- range $index, $container := .Spec.Containers }}{{ if not (eq $container.Name "istio-proxy") }}{{ $containers = append $containers $container.Name }}{{end}}{{- end}} + metadata: + labels: + {{/* security.istio.io/tlsMode: istio must be set by user, if gRPC is using mTLS initialization code. We can't set it automatically. */}} + service.istio.io/canonical-name: {{ index .ObjectMeta.Labels `service.istio.io/canonical-name` | default (index .ObjectMeta.Labels `app.kubernetes.io/name`) | default (index .ObjectMeta.Labels `app`) | default .DeploymentMeta.Name | quote }} + service.istio.io/canonical-revision: {{ index .ObjectMeta.Labels `service.istio.io/canonical-revision` | default (index .ObjectMeta.Labels `app.kubernetes.io/version`) | default (index .ObjectMeta.Labels `version`) | default "latest" | quote }} + annotations: { + {{- if ge (len $containers) 1 }} + {{- if not (isset .ObjectMeta.Annotations `kubectl.kubernetes.io/default-logs-container`) }} + kubectl.kubernetes.io/default-logs-container: "{{ index $containers 0 }}", + {{- end }} + {{- if not (isset .ObjectMeta.Annotations `kubectl.kubernetes.io/default-container`) }} + kubectl.kubernetes.io/default-container: "{{ index $containers 0 }}", + {{- end }} + {{- end }} + sidecar.istio.io/rewriteAppHTTPProbers: "false", + } + spec: + containers: + - name: istio-proxy + {{- if contains "/" (annotation .ObjectMeta `sidecar.istio.io/proxyImage` .Values.global.proxy.image) }} + image: "{{ annotation .ObjectMeta `sidecar.istio.io/proxyImage` .Values.global.proxy.image }}" + {{- else }} + image: "{{ .ProxyImage }}" + {{- end }} + ports: + - containerPort: 15020 + protocol: TCP + name: mesh-metrics args: - proxy - - router + - sidecar - --domain - $(POD_NAMESPACE).svc.{{ .Values.global.proxy.clusterDomain }} - - --serviceCluster - {{ if ne "" (index .ObjectMeta.Labels "app") -}} - - "{{ index .ObjectMeta.Labels `app` }}.$(POD_NAMESPACE)" - {{ else -}} - - "{{ valueOrDefault .DeploymentMeta.Name `istio-proxy` }}.{{ valueOrDefault .DeploymentMeta.Namespace `default` }}" - {{ end -}} - --proxyLogLevel={{ annotation .ObjectMeta `sidecar.istio.io/logLevel` .Values.global.proxy.logLevel }} - --proxyComponentLogLevel={{ annotation .ObjectMeta `sidecar.istio.io/componentLogLevel` .Values.global.proxy.componentLogLevel }} - --log_output_level={{ annotation .ObjectMeta `sidecar.istio.io/agentLogLevel` .Values.global.logging.level }} @@ -769,11 +1082,22 @@ data: {{- if .Values.global.logAsJson }} - --log_as_json {{- end }} - {{- if .Values.global.proxy.lifecycle }} lifecycle: - {{ toYaml .Values.global.proxy.lifecycle | indent 6 }} - {{- end }} + postStart: + exec: + command: + - pilot-agent + - wait + - --url=http://localhost:15020/healthz/ready env: + - name: ISTIO_META_GENERATOR + value: grpc + - name: OUTPUT_CERTS + value: /var/lib/istio/data + {{- if eq (env "PILOT_ENABLE_INBOUND_PASSTHROUGH" "true") "false" }} + - name: REWRITE_PROBE_LEGACY_LOCALHOST_DESTINATION + value: "true" + {{- end }} - name: JWT_POLICY value: {{ .Values.global.jwtPolicy }} - name: PILOT_CERT_PROVIDER @@ -804,14 +1128,6 @@ data: valueFrom: fieldRef: fieldPath: status.hostIP - - name: CANONICAL_SERVICE - valueFrom: - fieldRef: - fieldPath: metadata.labels['service.istio.io/canonical-name'] - - name: CANONICAL_REVISION - valueFrom: - fieldRef: - fieldPath: metadata.labels['service.istio.io/canonical-revision'] - name: PROXY_CONFIG value: | {{ protoToJSON .ProxyConfig }} @@ -832,17 +1148,14 @@ data: value: "{{ $containers | join "," }}" - name: ISTIO_META_CLUSTER_ID value: "{{ valueOrDefault .Values.global.multiCluster.clusterName `Kubernetes` }}" - - name: ISTIO_META_INTERCEPTION_MODE - value: "{{ .ProxyConfig.InterceptionMode.String }}" + - name: ISTIO_META_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName {{- if .Values.global.network }} - name: ISTIO_META_NETWORK value: "{{ .Values.global.network }}" {{- end }} - {{ if .ObjectMeta.Annotations }} - - name: ISTIO_METAJSON_ANNOTATIONS - value: | - {{ toJSON .ObjectMeta.Annotations }} - {{ end }} {{- if .DeploymentMeta.Name }} - name: ISTIO_META_WORKLOAD_NAME value: "{{ .DeploymentMeta.Name }}" @@ -866,20 +1179,26 @@ data: - name: {{ $key }} value: "{{ $value }}" {{- end }} + # grpc uses xds:/// to resolve – no need to resolve VIP + - name: ISTIO_META_DNS_CAPTURE + value: "false" + - name: DISABLE_ENVOY + value: "true" {{with .Values.global.imagePullPolicy }}imagePullPolicy: "{{.}}"{{end}} + {{ if ne (annotation .ObjectMeta `status.sidecar.istio.io/port` .Values.global.proxy.statusPort) `0` }} readinessProbe: httpGet: path: /healthz/ready - port: 15021 - initialDelaySeconds: {{.Values.global.proxy.readinessInitialDelaySeconds }} - periodSeconds: {{ .Values.global.proxy.readinessPeriodSeconds }} + port: 15020 + initialDelaySeconds: {{ annotation .ObjectMeta `readiness.status.sidecar.istio.io/initialDelaySeconds` .Values.global.proxy.readinessInitialDelaySeconds }} + periodSeconds: {{ annotation .ObjectMeta `readiness.status.sidecar.istio.io/periodSeconds` .Values.global.proxy.readinessPeriodSeconds }} timeoutSeconds: 3 - failureThreshold: {{ .Values.global.proxy.readinessFailureThreshold }} + failureThreshold: {{ annotation .ObjectMeta `readiness.status.sidecar.istio.io/failureThreshold` .Values.global.proxy.readinessFailureThreshold }} + resources: + {{ template "resources" . }} volumeMounts: - name: workload-socket mountPath: /var/run/secrets/workload-spiffe-uds - - name: credential-socket - mountPath: /var/run/secrets/credential-uds {{- if eq .Values.global.caName "GkeWorkloadCertificate" }} - name: gke-workload-certificate mountPath: /var/run/secrets/workload-spiffe-credentials @@ -894,9 +1213,9 @@ data: {{- end }} - mountPath: /var/lib/istio/data name: istio-data - # SDS channel between istioagent and Envoy + # UDS channel between istioagent and gRPC client for XDS/SDS - mountPath: /etc/istio/proxy - name: istio-envoy + name: istio-xds {{- if eq .Values.global.jwtPolicy "third-party-jwt" }} - mountPath: /var/run/secrets/tokens name: istio-token @@ -909,23 +1228,57 @@ data: {{- end }} - name: istio-podinfo mountPath: /etc/istio/pod + {{- end }} + {{- if isset .ObjectMeta.Annotations `sidecar.istio.io/userVolumeMount` }} + {{ range $index, $value := fromJSON (index .ObjectMeta.Annotations `sidecar.istio.io/userVolumeMount`) }} + - name: "{{ $index }}" + {{ toYaml $value | indent 6 }} + {{ end }} + {{- end }} + {{- range $index, $container := .Spec.Containers }} + {{ if not (eq $container.Name "istio-proxy") }} + - name: {{ $container.Name }} + env: + - name: "GRPC_XDS_EXPERIMENTAL_SECURITY_SUPPORT" + value: "true" + - name: "GRPC_XDS_BOOTSTRAP" + value: "/etc/istio/proxy/grpc-bootstrap.json" + volumeMounts: + - mountPath: /var/lib/istio/data + name: istio-data + # UDS channel between istioagent and gRPC client for XDS/SDS + - mountPath: /etc/istio/proxy + name: istio-xds + {{- if eq $.Values.global.caName "GkeWorkloadCertificate" }} + - name: gke-workload-certificate + mountPath: /var/run/secrets/workload-spiffe-credentials + readOnly: true + {{- else }} + - name: workload-certs + mountPath: /var/run/secrets/workload-spiffe-credentials + {{- end }} + {{- end }} + {{- end }} volumes: - - emptyDir: {} + - emptyDir: name: workload-socket - - emptyDir: {} - name: credential-socket {{- if eq .Values.global.caName "GkeWorkloadCertificate" }} - name: gke-workload-certificate csi: driver: workloadcertificates.security.cloud.google.com {{- else }} - - emptyDir: {} + - emptyDir: name: workload-certs {{- end }} + {{- if (isset .ObjectMeta.Annotations `sidecar.istio.io/bootstrapOverride`) }} + - name: custom-bootstrap-volume + configMap: + name: {{ annotation .ObjectMeta `sidecar.istio.io/bootstrapOverride` "" }} + {{- end }} # SDS channel between istioagent and Envoy - emptyDir: medium: Memory - name: istio-envoy + name: istio-xds - name: istio-data emptyDir: {} - name: istio-podinfo @@ -937,16 +1290,6 @@ data: - path: "annotations" fieldRef: fieldPath: metadata.annotations - - path: "cpu-limit" - resourceFieldRef: - containerName: istio-proxy - resource: limits.cpu - divisor: 1m - - path: "cpu-request" - resourceFieldRef: - containerName: istio-proxy - resource: requests.cpu - divisor: 1m {{- if eq .Values.global.jwtPolicy "third-party-jwt" }} - name: istio-token projected: @@ -972,17 +1315,291 @@ data: secretName: {{ printf "istio.%s" .Spec.ServiceAccountName }} {{ end -}} {{- end }} + {{- if isset .ObjectMeta.Annotations `sidecar.istio.io/userVolume` }} + {{range $index, $value := fromJSON (index .ObjectMeta.Annotations `sidecar.istio.io/userVolume`) }} + - name: "{{ $index }}" + {{ toYaml $value | indent 4 }} + {{ end }} + {{ end }} {{- if .Values.global.imagePullSecrets }} imagePullSecrets: {{- range .Values.global.imagePullSecrets }} - name: {{ . }} {{- end }} {{- end }} - {{- if eq (env "ENABLE_LEGACY_FSGROUP_INJECTION" "true") "true" }} + {{- if eq (env "ENABLE_LEGACY_FSGROUP_INJECTION" "false") "true" }} securityContext: fsGroup: 1337 {{- end }} --- +# Source: istio-discovery/templates/clusterrole.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: istiod-clusterrole-istio-system + labels: + app: istiod + release: istio +rules: + # sidecar injection controller + - apiGroups: ["admissionregistration.k8s.io"] + resources: ["mutatingwebhookconfigurations"] + verbs: ["get", "list", "watch", "update", "patch"] + + # configuration validation webhook controller + - apiGroups: ["admissionregistration.k8s.io"] + resources: ["validatingwebhookconfigurations"] + verbs: ["get", "list", "watch", "update"] + + # istio configuration + # removing CRD permissions can break older versions of Istio running alongside this control plane (https://github.com/istio/istio/issues/29382) + # please proceed with caution + - apiGroups: ["config.istio.io", "security.istio.io", "networking.istio.io", "authentication.istio.io", "rbac.istio.io", "telemetry.istio.io", "extensions.istio.io"] + verbs: ["get", "watch", "list"] + resources: ["*"] + - apiGroups: ["networking.istio.io"] + verbs: [ "get", "watch", "list", "update", "patch", "create", "delete" ] + resources: [ "workloadentries" ] + - apiGroups: ["networking.istio.io"] + verbs: [ "get", "watch", "list", "update", "patch", "create", "delete" ] + resources: [ "workloadentries/status" ] + + # auto-detect installed CRD definitions + - apiGroups: ["apiextensions.k8s.io"] + resources: ["customresourcedefinitions"] + verbs: ["get", "list", "watch"] + + # discovery and routing + - apiGroups: [""] + resources: ["pods", "nodes", "services", "namespaces", "endpoints"] + verbs: ["get", "list", "watch"] + - apiGroups: ["discovery.k8s.io"] + resources: ["endpointslices"] + verbs: ["get", "list", "watch"] + + # ingress controller + - apiGroups: ["networking.k8s.io"] + resources: ["ingresses", "ingressclasses"] + verbs: ["get", "list", "watch"] + - apiGroups: ["networking.k8s.io"] + resources: ["ingresses/status"] + verbs: ["*"] + + # required for CA's namespace controller + - apiGroups: [""] + resources: ["configmaps"] + verbs: ["create", "get", "list", "watch", "update"] + + # Istiod and bootstrap. + - apiGroups: ["certificates.k8s.io"] + resources: + - "certificatesigningrequests" + - "certificatesigningrequests/approval" + - "certificatesigningrequests/status" + verbs: ["update", "create", "get", "delete", "watch"] + - apiGroups: ["certificates.k8s.io"] + resources: + - "signers" + resourceNames: + - "kubernetes.io/legacy-unknown" + verbs: ["approve"] + + # Used by Istiod to verify the JWT tokens + - apiGroups: ["authentication.k8s.io"] + resources: ["tokenreviews"] + verbs: ["create"] + + # Used by Istiod to verify gateway SDS + - apiGroups: ["authorization.k8s.io"] + resources: ["subjectaccessreviews"] + verbs: ["create"] + + # Use for Kubernetes Service APIs + - apiGroups: ["networking.x-k8s.io", "gateway.networking.k8s.io"] + resources: ["*"] + verbs: ["get", "watch", "list"] + - apiGroups: ["networking.x-k8s.io", "gateway.networking.k8s.io"] + resources: ["*"] # TODO: should be on just */status but wildcard is not supported + verbs: ["update", "patch"] + - apiGroups: ["gateway.networking.k8s.io"] + resources: ["gatewayclasses"] + verbs: ["create", "update", "patch", "delete"] + + # Needed for multicluster secret reading, possibly ingress certs in the future + - apiGroups: [""] + resources: ["secrets"] + verbs: ["get", "watch", "list"] + + # Used for MCS serviceexport management + - apiGroups: ["multicluster.x-k8s.io"] + resources: ["serviceexports"] + verbs: [ "get", "watch", "list", "create", "delete"] + + # Used for MCS serviceimport management + - apiGroups: ["multicluster.x-k8s.io"] + resources: ["serviceimports"] + verbs: ["get", "watch", "list"] +--- +# Source: istio-discovery/templates/clusterrole.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: istiod-gateway-controller-istio-system + labels: + app: istiod + release: istio +rules: + - apiGroups: ["apps"] + verbs: [ "get", "watch", "list", "update", "patch", "create", "delete" ] + resources: [ "deployments" ] + - apiGroups: [""] + verbs: [ "get", "watch", "list", "update", "patch", "create", "delete" ] + resources: [ "services" ] + - apiGroups: [""] + verbs: [ "get", "watch", "list", "update", "patch", "create", "delete" ] + resources: [ "serviceaccounts"] +--- +# Source: istio-discovery/templates/reader-clusterrole.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +metadata: + name: istio-reader-clusterrole-istio-system + labels: + app: istio-reader + release: istio +rules: + - apiGroups: + - "config.istio.io" + - "security.istio.io" + - "networking.istio.io" + - "authentication.istio.io" + - "rbac.istio.io" + resources: ["*"] + verbs: ["get", "list", "watch"] + - apiGroups: [""] + resources: ["endpoints", "pods", "services", "nodes", "replicationcontrollers", "namespaces", "secrets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["networking.istio.io"] + verbs: [ "get", "watch", "list" ] + resources: [ "workloadentries" ] + - apiGroups: ["apiextensions.k8s.io"] + resources: ["customresourcedefinitions"] + verbs: ["get", "list", "watch"] + - apiGroups: ["discovery.k8s.io"] + resources: ["endpointslices"] + verbs: ["get", "list", "watch"] + - apiGroups: ["multicluster.x-k8s.io"] + resources: ["serviceexports"] + verbs: ["get", "list", "watch", "create", "delete"] + - apiGroups: ["multicluster.x-k8s.io"] + resources: ["serviceimports"] + verbs: ["get", "list", "watch"] + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get", "list", "watch"] + - apiGroups: ["authentication.k8s.io"] + resources: ["tokenreviews"] + verbs: ["create"] + - apiGroups: ["authorization.k8s.io"] + resources: ["subjectaccessreviews"] + verbs: ["create"] +--- +# Source: istio-discovery/templates/clusterrolebinding.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: istiod-clusterrole-istio-system + labels: + app: istiod + release: istio +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: istiod-clusterrole-istio-system +subjects: + - kind: ServiceAccount + name: istiod + namespace: istio-system +--- +# Source: istio-discovery/templates/clusterrolebinding.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: istiod-gateway-controller-istio-system + labels: + app: istiod + release: istio +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: istiod-gateway-controller-istio-system +subjects: +- kind: ServiceAccount + name: istiod + namespace: istio-system +--- +# Source: istio-discovery/templates/reader-clusterrolebinding.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: istio-reader-clusterrole-istio-system + labels: + app: istio-reader + release: istio +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: istio-reader-clusterrole-istio-system +subjects: + - kind: ServiceAccount + name: istio-reader-service-account + namespace: istio-system +--- +# Source: istio-discovery/templates/role.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: Role +metadata: + name: istiod + namespace: istio-system + labels: + app: istiod + release: istio +rules: +# permissions to verify the webhook is ready and rejecting +# invalid config. We use --server-dry-run so no config is persisted. +- apiGroups: ["networking.istio.io"] + verbs: ["create"] + resources: ["gateways"] + +# For storing CA secret +- apiGroups: [""] + resources: ["secrets"] + # TODO lock this down to istio-ca-cert if not using the DNS cert mesh config + verbs: ["create", "get", "watch", "list", "update", "delete"] + +# For status controller, so it can delete the distribution report configmap +- apiGroups: [""] + resources: ["configmaps"] + verbs: ["delete"] +--- +# Source: istio-discovery/templates/rolebinding.yaml +apiVersion: rbac.authorization.k8s.io/v1 +kind: RoleBinding +metadata: + name: istiod + namespace: istio-system + labels: + app: istiod + release: istio +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: Role + name: istiod +subjects: + - kind: ServiceAccount + name: istiod + namespace: istio-system +--- # Source: istio-discovery/templates/service.yaml apiVersion: v1 kind: Service @@ -1033,7 +1650,6 @@ spec: rollingUpdate: maxSurge: 100% maxUnavailable: 25% - type: RollingUpdate selector: matchLabels: app: istiod @@ -1082,7 +1698,7 @@ spec: timeoutSeconds: 5 env: - name: REVISION - value: default + value: "default" - name: JWT_POLICY value: third-party-jwt - name: PILOT_CERT_PROVIDER @@ -1121,6 +1737,8 @@ spec: cpu: 500m memory: 2048Mi securityContext: + allowPrivilegeEscalation: false + readOnlyRootFilesystem: true runAsUser: 1337 runAsGroup: 1337 runAsNonRoot: true @@ -1139,6 +1757,12 @@ spec: - name: istio-kubeconfig mountPath: /var/run/secrets/remote readOnly: true + - name: istio-csr-dns-cert + mountPath: /var/run/secrets/istiod/tls + readOnly: true + - name: istio-csr-ca-configmap + mountPath: /var/run/secrets/istiod/ca + readOnly: true volumes: # Technically not needed on this pod - but it helps debugging/testing SDS # Should be removed after everything works. @@ -1161,6 +1785,16 @@ spec: secret: secretName: istio-kubeconfig optional: true + # Optional: istio-csr dns pilot certs + - name: istio-csr-dns-cert + secret: + secretName: istiod-tls + optional: true + - name: istio-csr-ca-configmap + configMap: + name: istio-ca-root-cert + defaultMode: 420 + optional: true --- # Source: istio-discovery/templates/autoscale.yaml apiVersion: autoscaling/v2 @@ -1194,22 +1828,23 @@ spec: # Removed paths for legacy and default selectors since a revision tag # is inherently created from a specific revision --- -# Source: istio-discovery/templates/telemetryv2_1.15.yaml +# Source: istio-discovery/templates/telemetryv2_1.16.yaml # Note: http stats filter is wasm enabled only in sidecars. apiVersion: networking.istio.io/v1alpha3 kind: EnvoyFilter metadata: - name: stats-filter-1.15 + name: stats-filter-1.16 namespace: istio-system labels: istio.io/rev: default spec: + priority: -1 configPatches: - applyTo: HTTP_FILTER match: context: SIDECAR_OUTBOUND proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.16.*' listener: filterChain: filter: @@ -1243,7 +1878,7 @@ spec: match: context: SIDECAR_INBOUND proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.16.*' listener: filterChain: filter: @@ -1265,7 +1900,8 @@ spec: value: | { "debug": "false", - "stat_prefix": "istio" + "stat_prefix": "istio", + "disable_host_header_fallback": true } vm_config: vm_id: stats_inbound @@ -1277,7 +1913,7 @@ spec: match: context: GATEWAY proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.16.*' listener: filterChain: filter: @@ -1309,22 +1945,23 @@ spec: local: inline_string: envoy.wasm.stats --- -# Source: istio-discovery/templates/telemetryv2_1.15.yaml +# Source: istio-discovery/templates/telemetryv2_1.16.yaml # Note: tcp stats filter is wasm enabled only in sidecars. apiVersion: networking.istio.io/v1alpha3 kind: EnvoyFilter metadata: - name: tcp-stats-filter-1.15 + name: tcp-stats-filter-1.16 namespace: istio-system labels: istio.io/rev: default spec: + priority: -1 configPatches: - applyTo: NETWORK_FILTER match: context: SIDECAR_INBOUND proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.16.*' listener: filterChain: filter: @@ -1356,7 +1993,7 @@ spec: match: context: SIDECAR_OUTBOUND proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.16.*' listener: filterChain: filter: @@ -1388,7 +2025,7 @@ spec: match: context: GATEWAY proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.16.*' listener: filterChain: filter: @@ -1417,12 +2054,12 @@ spec: local: inline_string: "envoy.wasm.stats" --- -# Source: istiod/templates/telemetryv2_1.16.yaml +# Source: istio-discovery/templates/telemetryv2_1.17.yaml # Note: http stats filter is wasm enabled only in sidecars. apiVersion: networking.istio.io/v1alpha3 kind: EnvoyFilter metadata: - name: stats-filter-1.16 + name: stats-filter-1.17 namespace: istio-system labels: istio.io/rev: default @@ -1433,7 +2070,7 @@ spec: match: context: SIDECAR_OUTBOUND proxy: - proxyVersion: '^1\.16.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -1446,28 +2083,14 @@ spec: name: istio.stats typed_config: "@type": type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm + type_url: type.googleapis.com/stats.PluginConfig value: - config: - root_id: stats_outbound - configuration: - "@type": "type.googleapis.com/google.protobuf.StringValue" - value: | - { - "debug": "false", - "stat_prefix": "istio" - } - vm_config: - vm_id: stats_outbound - runtime: envoy.wasm.runtime.null - code: - local: - inline_string: envoy.wasm.stats + {} - applyTo: HTTP_FILTER match: context: SIDECAR_INBOUND proxy: - proxyVersion: '^1\.16.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -1480,29 +2103,22 @@ spec: name: istio.stats typed_config: "@type": type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm + type_url: type.googleapis.com/stats.PluginConfig value: - config: - root_id: stats_inbound - configuration: - "@type": "type.googleapis.com/google.protobuf.StringValue" - value: | + { { "debug": "false", "stat_prefix": "istio", - "disable_host_header_fallback": true - } - vm_config: - vm_id: stats_inbound - runtime: envoy.wasm.runtime.null - code: - local: - inline_string: envoy.wasm.stats + { + "debug": "false", + "stat_prefix": "istio", + "disable_host_header_fallback": true + } - applyTo: HTTP_FILTER match: context: GATEWAY proxy: - proxyVersion: '^1\.16.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -1515,31 +2131,24 @@ spec: name: istio.stats typed_config: "@type": type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm + type_url: type.googleapis.com/stats.PluginConfig value: - config: - root_id: stats_outbound - configuration: - "@type": "type.googleapis.com/google.protobuf.StringValue" - value: | + { { "debug": "false", "stat_prefix": "istio", - "disable_host_header_fallback": true - } - vm_config: - vm_id: stats_outbound - runtime: envoy.wasm.runtime.null - code: - local: - inline_string: envoy.wasm.stats + { + "debug": "false", + "stat_prefix": "istio", + "disable_host_header_fallback": true + } --- -# Source: istiod/templates/telemetryv2_1.16.yaml +# Source: istio-discovery/templates/telemetryv2_1.17.yaml # Note: tcp stats filter is wasm enabled only in sidecars. apiVersion: networking.istio.io/v1alpha3 kind: EnvoyFilter metadata: - name: tcp-stats-filter-1.16 + name: tcp-stats-filter-1.17 namespace: istio-system labels: istio.io/rev: default @@ -1550,7 +2159,7 @@ spec: match: context: SIDECAR_INBOUND proxy: - proxyVersion: '^1\.16.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -1561,28 +2170,14 @@ spec: name: istio.stats typed_config: "@type": type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm + type_url: type.googleapis.com/stats.PluginConfig value: - config: - root_id: stats_inbound - configuration: - "@type": "type.googleapis.com/google.protobuf.StringValue" - value: | - { - "debug": "false", - "stat_prefix": "istio" - } - vm_config: - vm_id: tcp_stats_inbound - runtime: envoy.wasm.runtime.null - code: - local: - inline_string: "envoy.wasm.stats" + {} - applyTo: NETWORK_FILTER match: context: SIDECAR_OUTBOUND proxy: - proxyVersion: '^1\.16.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -1593,28 +2188,14 @@ spec: name: istio.stats typed_config: "@type": type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm + type_url: type.googleapis.com/stats.PluginConfig value: - config: - root_id: stats_outbound - configuration: - "@type": "type.googleapis.com/google.protobuf.StringValue" - value: | - { - "debug": "false", - "stat_prefix": "istio" - } - vm_config: - vm_id: tcp_stats_outbound - runtime: envoy.wasm.runtime.null - code: - local: - inline_string: "envoy.wasm.stats" + {} - applyTo: NETWORK_FILTER match: context: GATEWAY proxy: - proxyVersion: '^1\.16.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -1625,23 +2206,9 @@ spec: name: istio.stats typed_config: "@type": type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm + type_url: type.googleapis.com/stats.PluginConfig value: - config: - root_id: stats_outbound - configuration: - "@type": "type.googleapis.com/google.protobuf.StringValue" - value: | - { - "debug": "false", - "stat_prefix": "istio" - } - vm_config: - vm_id: tcp_stats_outbound - runtime: envoy.wasm.runtime.null - code: - local: - inline_string: "envoy.wasm.stats" + {} --- # Source: istio-discovery/templates/mutatingwebhook.yaml apiVersion: admissionregistration.k8s.io/v1 @@ -1668,7 +2235,6 @@ webhooks: apiGroups: [""] apiVersions: ["v1"] resources: ["pods"] - scope: "*" failurePolicy: Fail admissionReviewVersions: ["v1beta1", "v1"] namespaceSelector: @@ -1698,7 +2264,6 @@ webhooks: apiGroups: [""] apiVersions: ["v1"] resources: ["pods"] - scope: "*" failurePolicy: Fail admissionReviewVersions: ["v1beta1", "v1"] namespaceSelector: @@ -1730,7 +2295,6 @@ webhooks: apiGroups: [""] apiVersions: ["v1"] resources: ["pods"] - scope: "*" failurePolicy: Fail admissionReviewVersions: ["v1beta1", "v1"] namespaceSelector: @@ -1758,7 +2322,6 @@ webhooks: apiGroups: [""] apiVersions: ["v1"] resources: ["pods"] - scope: "*" failurePolicy: Fail admissionReviewVersions: ["v1beta1", "v1"] namespaceSelector: diff --git a/internal/assets/manifests/istio-discovery/resources/grpc-agent.yaml b/internal/assets/manifests/istio-discovery/resources/grpc-agent.yaml index 5a6171545..9fc0b22b4 100644 --- a/internal/assets/manifests/istio-discovery/resources/grpc-agent.yaml +++ b/internal/assets/manifests/istio-discovery/resources/grpc-agent.yaml @@ -132,6 +132,10 @@ spec: value: "{{ $containers | join "," }}" - name: ISTIO_META_CLUSTER_ID value: "{{ valueOrDefault .Values.global.multiCluster.clusterName `Kubernetes` }}" + - name: ISTIO_META_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName {{- if .Values.global.network }} - name: ISTIO_META_NETWORK value: "{{ .Values.global.network }}" diff --git a/internal/assets/manifests/istio-discovery/resources/injection-template.yaml b/internal/assets/manifests/istio-discovery/resources/injection-template.yaml index fd6a4e7b9..cf22185ed 100644 --- a/internal/assets/manifests/istio-discovery/resources/injection-template.yaml +++ b/internal/assets/manifests/istio-discovery/resources/injection-template.yaml @@ -291,6 +291,10 @@ spec: value: "{{ $containers | join "," }}" - name: ISTIO_META_CLUSTER_ID value: "{{ valueOrDefault .Values.global.multiCluster.clusterName `Kubernetes` }}" + - name: ISTIO_META_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName - name: ISTIO_META_INTERCEPTION_MODE value: "{{ or (index .ObjectMeta.Annotations `sidecar.istio.io/interceptionMode`) .ProxyConfig.InterceptionMode.String }}" {{- if .Values.global.network }} diff --git a/internal/assets/manifests/istio-discovery/templates/clusterrole.yaml b/internal/assets/manifests/istio-discovery/templates/clusterrole.yaml index d647f8342..ae8a62a62 100644 --- a/internal/assets/manifests/istio-discovery/templates/clusterrole.yaml +++ b/internal/assets/manifests/istio-discovery/templates/clusterrole.yaml @@ -82,6 +82,9 @@ rules: - "signers" resourceNames: - "kubernetes.io/legacy-unknown" +{{- range .Values.global.certSigners }} + - {{ . | quote }} +{{- end }} verbs: ["approve"] # Used by Istiod to verify the JWT tokens diff --git a/internal/assets/manifests/istio-discovery/templates/revision-tags.yaml b/internal/assets/manifests/istio-discovery/templates/revision-tags.yaml index 304aa9865..bd5c46451 100644 --- a/internal/assets/manifests/istio-discovery/templates/revision-tags.yaml +++ b/internal/assets/manifests/istio-discovery/templates/revision-tags.yaml @@ -130,4 +130,5 @@ webhooks: {{- end }} {{- end }} +--- {{- end }} diff --git a/internal/assets/manifests/istio-discovery/templates/telemetryv2_1.15.yaml b/internal/assets/manifests/istio-discovery/templates/telemetryv2_1.17.yaml similarity index 64% rename from internal/assets/manifests/istio-discovery/templates/telemetryv2_1.15.yaml rename to internal/assets/manifests/istio-discovery/templates/telemetryv2_1.17.yaml index 707301d95..8e1a71818 100644 --- a/internal/assets/manifests/istio-discovery/templates/telemetryv2_1.15.yaml +++ b/internal/assets/manifests/istio-discovery/templates/telemetryv2_1.17.yaml @@ -5,7 +5,7 @@ apiVersion: networking.istio.io/v1alpha3 kind: EnvoyFilter metadata: - name: {{ include "name-with-revision" ( dict "name" "stats-filter-1.15" "context" $) }} + name: {{ include "name-with-revision" ( dict "name" "stats-filter-1.17" "context" $) }} {{- if .Values.meshConfig.rootNamespace }} namespace: {{ .Values.meshConfig.rootNamespace }} {{- else }} @@ -20,7 +20,7 @@ spec: match: context: SIDECAR_OUTBOUND proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -33,40 +33,18 @@ spec: name: istio.stats typed_config: "@type": type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm + type_url: type.googleapis.com/stats.PluginConfig value: - config: - root_id: stats_outbound - configuration: - "@type": "type.googleapis.com/google.protobuf.StringValue" - value: | - {{- if not .Values.telemetry.v2.prometheus.configOverride.outboundSidecar }} - { - "debug": "false", - "stat_prefix": "istio" - } - {{- else }} - {{ toJson .Values.telemetry.v2.prometheus.configOverride.outboundSidecar | indent 18 }} - {{- end }} - vm_config: - vm_id: stats_outbound - {{- if .Values.telemetry.v2.prometheus.wasmEnabled }} - runtime: envoy.wasm.runtime.v8 - allow_precompiled: true - code: - local: - filename: /etc/istio/extensions/stats-filter.compiled.wasm - {{- else }} - runtime: envoy.wasm.runtime.null - code: - local: - inline_string: envoy.wasm.stats - {{- end }} + {{- if not .Values.telemetry.v2.prometheus.configOverride.outboundSidecar }} + {} + {{- else }} + {{ toJson .Values.telemetry.v2.prometheus.configOverride.outboundSidecar | indent 18 }} + {{- end }} - applyTo: HTTP_FILTER match: context: SIDECAR_INBOUND proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -79,41 +57,20 @@ spec: name: istio.stats typed_config: "@type": type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm + type_url: type.googleapis.com/stats.PluginConfig value: - config: - root_id: stats_inbound - configuration: - "@type": "type.googleapis.com/google.protobuf.StringValue" - value: | - {{- if not .Values.telemetry.v2.prometheus.configOverride.inboundSidecar }} - { - "debug": "false", - "stat_prefix": "istio", - "disable_host_header_fallback": true - } - {{- else }} - {{ toJson .Values.telemetry.v2.prometheus.configOverride.inboundSidecar | indent 18 }} - {{- end }} - vm_config: - vm_id: stats_inbound - {{- if .Values.telemetry.v2.prometheus.wasmEnabled }} - runtime: envoy.wasm.runtime.v8 - allow_precompiled: true - code: - local: - filename: /etc/istio/extensions/stats-filter.compiled.wasm - {{- else }} - runtime: envoy.wasm.runtime.null - code: - local: - inline_string: envoy.wasm.stats - {{- end }} + {{- if not .Values.telemetry.v2.prometheus.configOverride.inboundSidecar }} + { + "disable_host_header_fallback": true + } + {{- else }} + {{ toJson .Values.telemetry.v2.prometheus.configOverride.inboundSidecar | indent 18 }} + {{- end }} - applyTo: HTTP_FILTER match: context: GATEWAY proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -126,42 +83,21 @@ spec: name: istio.stats typed_config: "@type": type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm + type_url: type.googleapis.com/stats.PluginConfig value: - config: - root_id: stats_outbound - configuration: - "@type": "type.googleapis.com/google.protobuf.StringValue" - value: | - {{- if not .Values.telemetry.v2.prometheus.configOverride.gateway }} - { - "debug": "false", - "stat_prefix": "istio", - "disable_host_header_fallback": true - } - {{- else }} - {{ toJson .Values.telemetry.v2.prometheus.configOverride.gateway | indent 18 }} - {{- end }} - vm_config: - vm_id: stats_outbound - {{- if .Values.telemetry.v2.prometheus.wasmEnabled }} - runtime: envoy.wasm.runtime.v8 - allow_precompiled: true - code: - local: - filename: /etc/istio/extensions/stats-filter.compiled.wasm - {{- else }} - runtime: envoy.wasm.runtime.null - code: - local: - inline_string: envoy.wasm.stats - {{- end }} + {{- if not .Values.telemetry.v2.prometheus.configOverride.gateway }} + { + "disable_host_header_fallback": true + } + {{- else }} + {{ toJson .Values.telemetry.v2.prometheus.configOverride.gateway | indent 18 }} + {{- end }} --- # Note: tcp stats filter is wasm enabled only in sidecars. apiVersion: networking.istio.io/v1alpha3 kind: EnvoyFilter metadata: - name: {{ include "name-with-revision" ( dict "name" "tcp-stats-filter-1.15" "context" $) }} + name: {{ include "name-with-revision" ( dict "name" "tcp-stats-filter-1.17" "context" $) }} {{- if .Values.meshConfig.rootNamespace }} namespace: {{ .Values.meshConfig.rootNamespace }} {{- else }} @@ -176,7 +112,7 @@ spec: match: context: SIDECAR_INBOUND proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -187,40 +123,18 @@ spec: name: istio.stats typed_config: "@type": type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm + type_url: type.googleapis.com/stats.PluginConfig value: - config: - root_id: stats_inbound - configuration: - "@type": "type.googleapis.com/google.protobuf.StringValue" - value: | - {{- if not .Values.telemetry.v2.prometheus.configOverride.inboundSidecar }} - { - "debug": "false", - "stat_prefix": "istio" - } - {{- else }} - {{ toJson .Values.telemetry.v2.prometheus.configOverride.inboundSidecar | indent 18 }} - {{- end }} - vm_config: - vm_id: tcp_stats_inbound - {{- if .Values.telemetry.v2.prometheus.wasmEnabled }} - runtime: envoy.wasm.runtime.v8 - allow_precompiled: true - code: - local: - filename: /etc/istio/extensions/stats-filter.compiled.wasm - {{- else }} - runtime: envoy.wasm.runtime.null - code: - local: - inline_string: "envoy.wasm.stats" - {{- end }} + {{- if not .Values.telemetry.v2.prometheus.configOverride.inboundSidecar }} + {} + {{- else }} + {{ toJson .Values.telemetry.v2.prometheus.configOverride.inboundSidecar | indent 18 }} + {{- end }} - applyTo: NETWORK_FILTER match: context: SIDECAR_OUTBOUND proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -231,40 +145,18 @@ spec: name: istio.stats typed_config: "@type": type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm + type_url: type.googleapis.com/stats.PluginConfig value: - config: - root_id: stats_outbound - configuration: - "@type": "type.googleapis.com/google.protobuf.StringValue" - value: | - {{- if not .Values.telemetry.v2.prometheus.configOverride.outboundSidecar }} - { - "debug": "false", - "stat_prefix": "istio" - } - {{- else }} - {{ toJson .Values.telemetry.v2.prometheus.configOverride.outboundSidecar | indent 18 }} - {{- end }} - vm_config: - vm_id: tcp_stats_outbound - {{- if .Values.telemetry.v2.prometheus.wasmEnabled }} - runtime: envoy.wasm.runtime.v8 - allow_precompiled: true - code: - local: - filename: /etc/istio/extensions/stats-filter.compiled.wasm - {{- else }} - runtime: envoy.wasm.runtime.null - code: - local: - inline_string: "envoy.wasm.stats" - {{- end }} + {{- if not .Values.telemetry.v2.prometheus.configOverride.outboundSidecar }} + {} + {{- else }} + {{ toJson .Values.telemetry.v2.prometheus.configOverride.outboundSidecar | indent 18 }} + {{- end }} - applyTo: NETWORK_FILTER match: context: GATEWAY proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -275,42 +167,20 @@ spec: name: istio.stats typed_config: "@type": type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm + type_url: type.googleapis.com/stats.PluginConfig value: - config: - root_id: stats_outbound - configuration: - "@type": "type.googleapis.com/google.protobuf.StringValue" - value: | - {{- if not .Values.telemetry.v2.prometheus.configOverride.gateway }} - { - "debug": "false", - "stat_prefix": "istio" - } - {{- else }} - {{ toJson .Values.telemetry.v2.prometheus.configOverride.gateway | indent 18 }} - {{- end }} - vm_config: - vm_id: tcp_stats_outbound - {{- if .Values.telemetry.v2.prometheus.wasmEnabled }} - runtime: envoy.wasm.runtime.v8 - allow_precompiled: true - code: - local: - filename: /etc/istio/extensions/stats-filter.compiled.wasm - {{- else }} - runtime: envoy.wasm.runtime.null - code: - local: - inline_string: "envoy.wasm.stats" - {{- end }} + {{- if not .Values.telemetry.v2.prometheus.configOverride.gateway }} + {} + {{- else }} + {{ toJson .Values.telemetry.v2.prometheus.configOverride.gateway | indent 18 }} + {{- end }} --- {{- end }} {{- if .Values.telemetry.v2.stackdriver.enabled }} apiVersion: networking.istio.io/v1alpha3 kind: EnvoyFilter metadata: - name: {{ include "name-with-revision" ( dict "name" "stackdriver-filter-1.15" "context" $) }} + name: {{ include "name-with-revision" ( dict "name" "stackdriver-filter-1.17" "context" $) }} {{- if .Values.meshConfig.rootNamespace }} namespace: {{ .Values.meshConfig.rootNamespace }} {{- else }} @@ -326,7 +196,7 @@ spec: match: context: SIDECAR_OUTBOUND proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -364,7 +234,7 @@ spec: match: context: SIDECAR_INBOUND proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -403,7 +273,7 @@ spec: match: context: GATEWAY proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -441,7 +311,7 @@ spec: apiVersion: networking.istio.io/v1alpha3 kind: EnvoyFilter metadata: - name: {{ include "name-with-revision" ( dict "name" "tcp-stackdriver-filter-1.15" "context" $) }} + name: {{ include "name-with-revision" ( dict "name" "tcp-stackdriver-filter-1.17" "context" $) }} {{- if .Values.meshConfig.rootNamespace }} namespace: {{ .Values.meshConfig.rootNamespace }} {{- else }} @@ -457,7 +327,7 @@ spec: match: context: SIDECAR_OUTBOUND proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -493,7 +363,7 @@ spec: match: context: SIDECAR_INBOUND proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -529,7 +399,7 @@ spec: match: context: GATEWAY proxy: - proxyVersion: '^1\.15.*' + proxyVersion: '^1\.17.*' listener: filterChain: filter: @@ -565,7 +435,7 @@ spec: apiVersion: networking.istio.io/v1alpha3 kind: EnvoyFilter metadata: - name: {{ include "name-with-revision" ( dict "name" "stackdriver-sampling-accesslog-filter-1.15" "context" $) }} + name: {{ include "name-with-revision" ( dict "name" "stackdriver-sampling-accesslog-filter-1.17" "context" $) }} {{- if .Values.meshConfig.rootNamespace }} namespace: {{ .Values.meshConfig.rootNamespace }} {{- else }} @@ -580,7 +450,7 @@ spec: match: context: SIDECAR_INBOUND proxy: - proxyVersion: '1\.15.*' + proxyVersion: '1\.17.*' listener: filterChain: filter: diff --git a/internal/assets/manifests/istio-discovery/templates/validatingwebhookconfiguration.yaml b/internal/assets/manifests/istio-discovery/templates/validatingwebhookconfiguration.yaml index 27b7e08a9..745fd4445 100644 --- a/internal/assets/manifests/istio-discovery/templates/validatingwebhookconfiguration.yaml +++ b/internal/assets/manifests/istio-discovery/templates/validatingwebhookconfiguration.yaml @@ -35,6 +35,9 @@ webhooks: - networking.istio.io - telemetry.istio.io - extensions.istio.io + {{- if .Values.base.validateGateway }} + - gateway.networking.k8s.io + {{- end }} apiVersions: - "*" resources: diff --git a/internal/assets/manifests/istio-discovery/values.yaml b/internal/assets/manifests/istio-discovery/values.yaml index 4e49322d3..e4d014838 100644 --- a/internal/assets/manifests/istio-discovery/values.yaml +++ b/internal/assets/manifests/istio-discovery/values.yaml @@ -220,6 +220,11 @@ global: distribution: official # Used to locate istiod. istioNamespace: istio-system + # List of cert-signers to allow "approve" action in the istio cluster role + # + # certSigners: + # - clusterissuers.cert-manager.io/istio-ca + certSigners: [] # enable pod disruption budget for the control plane, which is used to # ensure Istio control plane components are gradually upgraded or recovered. defaultPodDisruptionBudget: @@ -244,7 +249,7 @@ global: # Dev builds from prow are on gcr.io hub: istio # Default tag for Istio images. - tag: "1.16.1" + tag: "1.17.1" # Variant of the image to use. # Currently supported are: [debug, distroless] variant: "" @@ -533,6 +538,12 @@ global: base: # For istioctl usage to disable istio config crds in base enableIstioConfigCRDs: true + # If enabled, gateway-api types will be validated using the standard upstream validation logic. + # This is an alternative to deploying the standalone validation server the project provides. + # This is disabled by default, as the cluster may already have a validation server; while technically + # it works to have multiple redundant validations, this adds complexity and operational risks. + # Users should consider enabling this if they want full gateway-api validation but don't have other validation servers. + validateGateway: false istio_cni: enabled: false diff --git a/internal/components/base/base_test.go b/internal/components/base/base_test.go index 571ca1988..6aff5a882 100644 --- a/internal/components/base/base_test.go +++ b/internal/components/base/base_test.go @@ -60,7 +60,7 @@ func TestICPBaseResourceDump(t *testing.T) { reconciler.NativeReconcilerSetControllerRef(), }), logger.NewWithLogrLogger(logr.NewTestLogger(t)), - "1.16.1", + "1.17.1", ) dd, err := reconciler.GetManifest(icp) diff --git a/internal/components/base/testdata/icp-expected-values.yaml b/internal/components/base/testdata/icp-expected-values.yaml index d50def6b3..34e626b97 100644 --- a/internal/components/base/testdata/icp-expected-values.yaml +++ b/internal/components/base/testdata/icp-expected-values.yaml @@ -8,4 +8,4 @@ global: istioNamespace: istio-system istiod: enableAnalysis: false - revision: cp-v116x + revision: cp-v117x diff --git a/internal/components/base/testdata/icp-test-cr.yaml b/internal/components/base/testdata/icp-test-cr.yaml index c2000ae0d..04b07db42 100644 --- a/internal/components/base/testdata/icp-test-cr.yaml +++ b/internal/components/base/testdata/icp-test-cr.yaml @@ -1,8 +1,8 @@ apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioControlPlane metadata: - name: cp-v116x + name: cp-v117x namespace: istio-system spec: - version: "1.16.1" + version: "1.17.1" mode: ACTIVE diff --git a/internal/components/cni/testdata/icp-expected-resource-dump.yaml b/internal/components/cni/testdata/icp-expected-resource-dump.yaml index adc53b660..0c6ea437b 100644 --- a/internal/components/cni/testdata/icp-expected-resource-dump.yaml +++ b/internal/components/cni/testdata/icp-expected-resource-dump.yaml @@ -11,7 +11,7 @@ status: {} apiVersion: v1 kind: ResourceQuota metadata: - name: istio-cni-cp-v116x + name: istio-cni-cp-v117x namespace: istio-system spec: hard: @@ -39,32 +39,32 @@ data: "cni_bin_dir": "/home/kubernetes/bin", "exclude_namespaces": [ "smm-system" ], "include_namespaces": [ "smm-system" ], - "revision": "cp-v116x.istio-system" + "revision": "cp-v117x.istio-system" } } kind: ConfigMap metadata: labels: app: istio-cni - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-cni - name: istio-cni-cp-v116x + name: istio-cni-cp-v117x namespace: istio-system --- apiVersion: v1 data: config: |- - - name: istio-cni-cp-v116x - selector: app=istio-cni-node,istio.io/rev=cp-v116x.istio-system + - name: istio-cni-cp-v117x + selector: app=istio-cni-node,istio.io/rev=cp-v117x.istio-system namespace: istio-system kind: ConfigMap metadata: labels: app: istio-cni - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-cni - name: istio-cni-taint-cp-v116x + name: istio-cni-taint-cp-v117x namespace: istio-system --- @@ -76,9 +76,9 @@ kind: ServiceAccount metadata: labels: app: istio-cni - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-cni - name: istio-cni-cp-v116x + name: istio-cni-cp-v117x namespace: istio-system --- @@ -87,9 +87,9 @@ kind: ClusterRole metadata: labels: app: istio-cni - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-cni - name: istio-cni-cp-v116x-istio-system + name: istio-cni-cp-v117x-istio-system rules: - apiGroups: - "" @@ -106,9 +106,9 @@ kind: ClusterRole metadata: labels: app: istio-cni - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-cni - name: istio-cni-repair-cp-v116x-istio-system + name: istio-cni-repair-cp-v117x-istio-system rules: - apiGroups: - "" @@ -140,9 +140,9 @@ kind: ClusterRole metadata: labels: app: istio-cni - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-cni - name: istio-cni-taint-cp-v116x-istio-system + name: istio-cni-taint-cp-v117x-istio-system rules: - apiGroups: - "" @@ -186,16 +186,16 @@ kind: ClusterRoleBinding metadata: labels: app: istio-cni - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-cni - name: istio-cni-cp-v116x-istio-system + name: istio-cni-cp-v117x-istio-system roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: istio-cni-cp-v116x-istio-system + name: istio-cni-cp-v117x-istio-system subjects: - kind: ServiceAccount - name: istio-cni-cp-v116x + name: istio-cni-cp-v117x namespace: istio-system --- @@ -204,16 +204,16 @@ kind: ClusterRoleBinding metadata: labels: app: istio-cni - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-cni - name: istio-cni-repair-cp-v116x-istio-system + name: istio-cni-repair-cp-v117x-istio-system roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: istio-cni-repair-cp-v116x-istio-system + name: istio-cni-repair-cp-v117x-istio-system subjects: - kind: ServiceAccount - name: istio-cni-cp-v116x + name: istio-cni-cp-v117x namespace: istio-system --- @@ -221,16 +221,16 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: labels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system k8s-app: istio-cni-taint - name: istio-cni-taint-cp-v116x-istio-system + name: istio-cni-taint-cp-v117x-istio-system roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: istio-cni-taint-cp-v116x-istio-system + name: istio-cni-taint-cp-v117x-istio-system subjects: - kind: ServiceAccount - name: istio-cni-cp-v116x + name: istio-cni-cp-v117x namespace: istio-system --- @@ -239,7 +239,7 @@ kind: RoleBinding metadata: labels: app: istio-cni - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-cni name: istio-cni-psp namespace: istio-system @@ -249,7 +249,7 @@ roleRef: name: istio-cni-psp subjects: - kind: ServiceAccount - name: istio-cni-cp-v116x + name: istio-cni-cp-v117x namespace: istio-system --- @@ -261,9 +261,9 @@ metadata: labels: app: istio-cni-node daemonset-label: value - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-cni - name: istio-cni-node-cp-v116x + name: istio-cni-node-cp-v117x namespace: istio-system spec: selector: @@ -315,7 +315,7 @@ spec: valueFrom: configMapKeyRef: key: cni_network_config - name: istio-cni-cp-v116x + name: istio-cni-cp-v117x - name: CNI_NET_DIR value: /etc/cni/conf.d - name: CHAINED_CNI_PLUGIN @@ -404,7 +404,7 @@ spec: disktype: ssd kubernetes.io/os: linux priorityClassName: system-node-critical - serviceAccountName: istio-cni-cp-v116x + serviceAccountName: istio-cni-cp-v117x terminationGracePeriodSeconds: 5 tolerations: - effect: NoSchedule diff --git a/internal/components/cni/testdata/icp-expected-values.yaml b/internal/components/cni/testdata/icp-expected-values.yaml index 5bf02dd99..adf2cb0b3 100644 --- a/internal/components/cni/testdata/icp-expected-values.yaml +++ b/internal/components/cni/testdata/icp-expected-values.yaml @@ -1,4 +1,4 @@ -revision: cp-v116x +revision: cp-v117x cni: enabled: true chained: true diff --git a/internal/components/cni/testdata/icp-test-cr.yaml b/internal/components/cni/testdata/icp-test-cr.yaml index a154d6d13..1c478d54c 100644 --- a/internal/components/cni/testdata/icp-test-cr.yaml +++ b/internal/components/cni/testdata/icp-test-cr.yaml @@ -1,10 +1,10 @@ apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioControlPlane metadata: - name: cp-v116x + name: cp-v117x namespace: istio-system spec: - version: "1.16.1" + version: "1.17.1" mode: ACTIVE containerImageConfiguration: hub: gcr.io/istio-testing diff --git a/internal/components/discovery/testdata/icp-expected-resource-dump.yaml b/internal/components/discovery/testdata/icp-expected-resource-dump.yaml index bec23af88..595b4419e 100644 --- a/internal/components/discovery/testdata/icp-expected-resource-dump.yaml +++ b/internal/components/discovery/testdata/icp-expected-resource-dump.yaml @@ -14,16 +14,16 @@ metadata: labels: app: istiod istio: istiod - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-operator-discovery - name: istiod-cp-v116x + name: istiod-cp-v117x namespace: istio-system spec: maxUnavailable: 5 selector: matchLabels: app: istiod - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system --- apiVersion: v1 @@ -34,7 +34,7 @@ data: - pem: connectTimeout: 5s defaultConfig: - discoveryAddress: istiod-cp-v116x.istio-system.svc:15012 + discoveryAddress: istiod-cp-v117x.istio-system.svc:15012 meshId: mesh1 tracing: zipkin: @@ -55,9 +55,9 @@ kind: ConfigMap metadata: labels: istio: meshconfig - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-operator-discovery - name: istio-cp-v116x + name: istio-cp-v117x namespace: istio-system --- @@ -372,6 +372,10 @@ data: value: "{{ $containers | join "," }}" - name: ISTIO_META_CLUSTER_ID value: "{{ valueOrDefault .Values.global.multiCluster.clusterName `Kubernetes` }}" + - name: ISTIO_META_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName - name: ISTIO_META_INTERCEPTION_MODE value: "{{ or (index .ObjectMeta.Annotations `sidecar.istio.io/interceptionMode`) .ProxyConfig.InterceptionMode.String }}" {{- if .Values.global.network }} @@ -709,6 +713,10 @@ data: value: "{{ $containers | join "," }}" - name: ISTIO_META_CLUSTER_ID value: "{{ valueOrDefault .Values.global.multiCluster.clusterName `Kubernetes` }}" + - name: ISTIO_META_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName - name: ISTIO_META_INTERCEPTION_MODE value: "{{ .ProxyConfig.InterceptionMode.String }}" {{- if .Values.global.network }} @@ -1048,6 +1056,10 @@ data: value: "{{ $containers | join "," }}" - name: ISTIO_META_CLUSTER_ID value: "{{ valueOrDefault .Values.global.multiCluster.clusterName `Kubernetes` }}" + - name: ISTIO_META_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName {{- if .Values.global.network }} - name: ISTIO_META_NETWORK value: "{{ .Values.global.network }}" @@ -1264,6 +1276,7 @@ data: "global": { "caAddress": "localhost", "caName": "Citadel", + "certSigners": [], "configCluster": false, "configValidation": true, "defaultPodDisruptionBudget": { @@ -1411,7 +1424,7 @@ data: "chained": true, "enabled": true }, - "revision": "cp-v116x", + "revision": "cp-v117x", "sidecarInjectorWebhook": { "alwaysInjectSelector": [], "defaultTemplates": [ @@ -1437,9 +1450,9 @@ kind: ConfigMap metadata: labels: istio: sidecar-injector - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-operator-discovery - name: istio-sidecar-injector-cp-v116x + name: istio-sidecar-injector-cp-v117x namespace: istio-system --- @@ -1452,7 +1465,7 @@ metadata: labels: app: istio-reader release: istio-operator-discovery - name: istio-reader-cp-v116x + name: istio-reader-cp-v117x namespace: istio-system --- @@ -1465,7 +1478,7 @@ metadata: labels: app: istiod release: istio-operator-discovery - name: istiod-cp-v116x + name: istiod-cp-v117x namespace: istio-system --- @@ -1475,7 +1488,7 @@ metadata: labels: app: istio-reader release: istio-operator-discovery - name: istio-reader-cp-v116x-istio-system + name: istio-reader-cp-v117x-istio-system rules: - apiGroups: - config.istio.io @@ -1571,7 +1584,7 @@ metadata: labels: app: istiod release: istio-operator-discovery - name: istiod-cp-v116x-istio-system + name: istiod-cp-v117x-istio-system rules: - apiGroups: - admissionregistration.k8s.io @@ -1775,7 +1788,7 @@ metadata: labels: app: istiod release: istio-operator-discovery - name: istiod-gateway-controller-cp-v116x-istio-system + name: istiod-gateway-controller-cp-v117x-istio-system rules: - apiGroups: - apps @@ -1809,14 +1822,14 @@ metadata: labels: app: istio-reader release: istio-operator-discovery - name: istio-reader-cp-v116x-istio-system + name: istio-reader-cp-v117x-istio-system roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: istio-reader-cp-v116x-istio-system + name: istio-reader-cp-v117x-istio-system subjects: - kind: ServiceAccount - name: istio-reader-cp-v116x + name: istio-reader-cp-v117x namespace: istio-system --- @@ -1826,14 +1839,14 @@ metadata: labels: app: istiod release: istio-operator-discovery - name: istiod-cp-v116x-istio-system + name: istiod-cp-v117x-istio-system roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: istiod-cp-v116x-istio-system + name: istiod-cp-v117x-istio-system subjects: - kind: ServiceAccount - name: istiod-cp-v116x + name: istiod-cp-v117x namespace: istio-system --- @@ -1843,14 +1856,14 @@ metadata: labels: app: istiod release: istio-operator-discovery - name: istiod-gateway-controller-cp-v116x-istio-system + name: istiod-gateway-controller-cp-v117x-istio-system roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: istiod-gateway-controller-cp-v116x-istio-system + name: istiod-gateway-controller-cp-v117x-istio-system subjects: - kind: ServiceAccount - name: istiod-cp-v116x + name: istiod-cp-v117x namespace: istio-system --- @@ -1860,7 +1873,7 @@ metadata: labels: app: istiod release: istio-operator-discovery - name: istiod-cp-v116x + name: istiod-cp-v117x namespace: istio-system rules: - apiGroups: @@ -1894,15 +1907,15 @@ metadata: labels: app: istiod release: istio-operator-discovery - name: istiod-cp-v116x + name: istiod-cp-v117x namespace: istio-system roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: istiod-cp-v116x + name: istiod-cp-v117x subjects: - kind: ServiceAccount - name: istiod-cp-v116x + name: istiod-cp-v117x namespace: istio-system --- @@ -1912,9 +1925,9 @@ metadata: labels: app: istiod istio: istiod - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-operator-discovery - name: istiod-cp-v116x + name: istiod-cp-v117x namespace: istio-system spec: ports: @@ -1933,7 +1946,7 @@ spec: protocol: TCP selector: app: istiod - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system type: ClusterIP --- @@ -1945,17 +1958,17 @@ metadata: labels: app: istiod istio: istiod - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system label-added-by-overlay-patch: "true" release: istio-operator-discovery testlabel.banzaicloud.io/name: value - name: istiod-cp-v116x + name: istiod-cp-v117x namespace: istio-system spec: selector: matchLabels: app: istiod - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system strategy: rollingUpdate: maxSurge: 100% @@ -1971,7 +1984,7 @@ spec: labels: app: istiod istio: istiod - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system podlabel: podlabelvalue sidecar.istio.io/inject: "false" spec: @@ -2005,7 +2018,7 @@ spec: - 30m env: - name: REVISION - value: cp-v116x.istio-system + value: cp-v117x.istio-system - name: JWT_POLICY value: third-party-jwt - name: PILOT_CERT_PROVIDER @@ -2030,21 +2043,21 @@ spec: - name: CA_PROVIDER value: Citadel - name: ISTIOD_CUSTOM_HOST - value: istiod-cp-v116x.istio-system.svc + value: istiod-cp-v117x.istio-system.svc - name: PILOT_ENABLE_STATUS value: "true" - name: INJECTION_WEBHOOK_CONFIG_NAME - value: istio-sidecar-injector-cp-v116x-istio-system + value: istio-sidecar-injector-cp-v117x-istio-system - name: VALIDATION_WEBHOOK_CONFIG_NAME - value: istio-validator-cp-v116x-istio-system + value: istio-validator-cp-v117x-istio-system - name: LEADER_ELECTION_NAME_SUFFIX - value: -cp-v116x + value: -cp-v117x - name: CACERT_CONFIG_NAME - value: istio-ca-root-cert-cp-v116x + value: istio-ca-root-cert-cp-v117x - name: MESHCONFIG_CONFIGMAP_NAME - value: istio-cp-v116x + value: istio-cp-v117x - name: INJECTOR_CONFIGMAP_NAME - value: istio-sidecar-injector-cp-v116x + value: istio-sidecar-injector-cp-v117x - name: TEST_ENV value: test-env-value - name: PILOT_TRACE_SAMPLING @@ -2054,7 +2067,7 @@ spec: - name: PILOT_ENABLE_PROTOCOL_SNIFFING_FOR_INBOUND value: "false" - name: ISTIOD_ADDR - value: istiod-cp-v116x.istio-system.svc:15012 + value: istiod-cp-v117x.istio-system.svc:15012 - name: PILOT_ENABLE_ANALYSIS value: "false" - name: CLUSTER_ID @@ -2118,7 +2131,7 @@ spec: securityContext: fsGroup: 1337 runAsUser: 1337 - serviceAccountName: istiod-cp-v116x + serviceAccountName: istiod-cp-v117x tolerations: - effect: NoSchedule key: key1 @@ -2170,9 +2183,9 @@ kind: HorizontalPodAutoscaler metadata: labels: app: istiod - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-operator-discovery - name: istiod-cp-v116x + name: istiod-cp-v117x namespace: istio-system spec: maxReplicas: 5 @@ -2187,7 +2200,7 @@ spec: scaleTargetRef: apiVersion: apps/v1 kind: Deployment - name: istiod-cp-v116x + name: istiod-cp-v117x --- apiVersion: admissionregistration.k8s.io/v1 @@ -2196,16 +2209,16 @@ metadata: labels: app: istiod istio: istiod - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-operator-discovery - name: istio-validator-cp-v116x-istio-system + name: istio-validator-cp-v117x-istio-system webhooks: - admissionReviewVersions: - v1beta1 - v1 clientConfig: service: - name: istiod-cp-v116x + name: istiod-cp-v117x namespace: istio-system path: /validate failurePolicy: Ignore @@ -2215,7 +2228,7 @@ webhooks: - key: istio.io/rev operator: In values: - - cp-v116x.istio-system + - cp-v117x.istio-system rules: - apiGroups: - security.istio.io @@ -2238,16 +2251,16 @@ kind: MutatingWebhookConfiguration metadata: labels: app: sidecar-injector - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-operator-discovery - name: istio-sidecar-injector-cp-v116x-istio-system + name: istio-sidecar-injector-cp-v117x-istio-system webhooks: - admissionReviewVersions: - v1beta1 - v1 clientConfig: service: - name: istiod-cp-v116x + name: istiod-cp-v117x namespace: istio-system path: /inject port: 443 @@ -2258,7 +2271,7 @@ webhooks: - key: istio.io/rev operator: In values: - - cp-v116x.istio-system + - cp-v117x.istio-system - key: istio-injection operator: DoesNotExist objectSelector: @@ -2283,7 +2296,7 @@ webhooks: - v1 clientConfig: service: - name: istiod-cp-v116x + name: istiod-cp-v117x namespace: istio-system path: /inject port: 443 @@ -2304,7 +2317,7 @@ webhooks: - key: istio.io/rev operator: In values: - - cp-v116x.istio-system + - cp-v117x.istio-system rules: - apiGroups: - "" @@ -2322,8 +2335,8 @@ apiVersion: networking.istio.io/v1alpha3 kind: EnvoyFilter metadata: labels: - istio.io/rev: cp-v116x.istio-system - name: stats-filter-1.15-cp-v116x + istio.io/rev: cp-v117x.istio-system + name: stats-filter-1.16-cp-v117x namespace: istio-system spec: configPatches: @@ -2337,7 +2350,7 @@ spec: subFilter: name: envoy.filters.http.router proxy: - proxyVersion: ^1\.15.* + proxyVersion: ^1\.16.* patch: operation: INSERT_BEFORE value: @@ -2371,7 +2384,7 @@ spec: subFilter: name: envoy.filters.http.router proxy: - proxyVersion: ^1\.15.* + proxyVersion: ^1\.16.* patch: operation: INSERT_BEFORE value: @@ -2406,7 +2419,7 @@ spec: subFilter: name: envoy.filters.http.router proxy: - proxyVersion: ^1\.15.* + proxyVersion: ^1\.16.* patch: operation: INSERT_BEFORE value: @@ -2438,8 +2451,8 @@ apiVersion: networking.istio.io/v1alpha3 kind: EnvoyFilter metadata: labels: - istio.io/rev: cp-v116x.istio-system - name: stats-filter-1.16-cp-v116x + istio.io/rev: cp-v117x.istio-system + name: stats-filter-1.17-cp-v117x namespace: istio-system spec: configPatches: @@ -2453,30 +2466,15 @@ spec: subFilter: name: envoy.filters.http.router proxy: - proxyVersion: ^1\.16.* + proxyVersion: ^1\.17.* patch: operation: INSERT_BEFORE value: name: istio.stats typed_config: '@type': type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm - value: - config: - configuration: - '@type': type.googleapis.com/google.protobuf.StringValue - value: | - { - "debug": "false", - "stat_prefix": "istio" - } - root_id: stats_outbound - vm_config: - code: - local: - inline_string: envoy.wasm.stats - runtime: envoy.wasm.runtime.null - vm_id: stats_outbound + type_url: type.googleapis.com/stats.PluginConfig + value: {} - applyTo: HTTP_FILTER match: context: SIDECAR_INBOUND @@ -2487,31 +2485,16 @@ spec: subFilter: name: envoy.filters.http.router proxy: - proxyVersion: ^1\.16.* + proxyVersion: ^1\.17.* patch: operation: INSERT_BEFORE value: name: istio.stats typed_config: '@type': type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm + type_url: type.googleapis.com/stats.PluginConfig value: - config: - configuration: - '@type': type.googleapis.com/google.protobuf.StringValue - value: | - { - "debug": "false", - "stat_prefix": "istio", - "disable_host_header_fallback": true - } - root_id: stats_inbound - vm_config: - code: - local: - inline_string: envoy.wasm.stats - runtime: envoy.wasm.runtime.null - vm_id: stats_inbound + disable_host_header_fallback: true - applyTo: HTTP_FILTER match: context: GATEWAY @@ -2522,31 +2505,16 @@ spec: subFilter: name: envoy.filters.http.router proxy: - proxyVersion: ^1\.16.* + proxyVersion: ^1\.17.* patch: operation: INSERT_BEFORE value: name: istio.stats typed_config: '@type': type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.http.wasm.v3.Wasm + type_url: type.googleapis.com/stats.PluginConfig value: - config: - configuration: - '@type': type.googleapis.com/google.protobuf.StringValue - value: | - { - "debug": "false", - "stat_prefix": "istio", - "disable_host_header_fallback": true - } - root_id: stats_outbound - vm_config: - code: - local: - inline_string: envoy.wasm.stats - runtime: envoy.wasm.runtime.null - vm_id: stats_outbound + disable_host_header_fallback: true priority: -1 --- @@ -2554,8 +2522,8 @@ apiVersion: networking.istio.io/v1alpha3 kind: EnvoyFilter metadata: labels: - istio.io/rev: cp-v116x.istio-system - name: tcp-stats-filter-1.15-cp-v116x + istio.io/rev: cp-v117x.istio-system + name: tcp-stats-filter-1.16-cp-v117x namespace: istio-system spec: configPatches: @@ -2567,7 +2535,7 @@ spec: filter: name: envoy.filters.network.tcp_proxy proxy: - proxyVersion: ^1\.15.* + proxyVersion: ^1\.16.* patch: operation: INSERT_BEFORE value: @@ -2599,7 +2567,7 @@ spec: filter: name: envoy.filters.network.tcp_proxy proxy: - proxyVersion: ^1\.15.* + proxyVersion: ^1\.16.* patch: operation: INSERT_BEFORE value: @@ -2631,7 +2599,7 @@ spec: filter: name: envoy.filters.network.tcp_proxy proxy: - proxyVersion: ^1\.15.* + proxyVersion: ^1\.16.* patch: operation: INSERT_BEFORE value: @@ -2662,8 +2630,8 @@ apiVersion: networking.istio.io/v1alpha3 kind: EnvoyFilter metadata: labels: - istio.io/rev: cp-v116x.istio-system - name: tcp-stats-filter-1.16-cp-v116x + istio.io/rev: cp-v117x.istio-system + name: tcp-stats-filter-1.17-cp-v117x namespace: istio-system spec: configPatches: @@ -2675,30 +2643,15 @@ spec: filter: name: envoy.filters.network.tcp_proxy proxy: - proxyVersion: ^1\.16.* + proxyVersion: ^1\.17.* patch: operation: INSERT_BEFORE value: name: istio.stats typed_config: '@type': type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm - value: - config: - configuration: - '@type': type.googleapis.com/google.protobuf.StringValue - value: | - { - "debug": "false", - "stat_prefix": "istio" - } - root_id: stats_inbound - vm_config: - code: - local: - inline_string: envoy.wasm.stats - runtime: envoy.wasm.runtime.null - vm_id: tcp_stats_inbound + type_url: type.googleapis.com/stats.PluginConfig + value: {} - applyTo: NETWORK_FILTER match: context: SIDECAR_OUTBOUND @@ -2707,30 +2660,15 @@ spec: filter: name: envoy.filters.network.tcp_proxy proxy: - proxyVersion: ^1\.16.* + proxyVersion: ^1\.17.* patch: operation: INSERT_BEFORE value: name: istio.stats typed_config: '@type': type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm - value: - config: - configuration: - '@type': type.googleapis.com/google.protobuf.StringValue - value: | - { - "debug": "false", - "stat_prefix": "istio" - } - root_id: stats_outbound - vm_config: - code: - local: - inline_string: envoy.wasm.stats - runtime: envoy.wasm.runtime.null - vm_id: tcp_stats_outbound + type_url: type.googleapis.com/stats.PluginConfig + value: {} - applyTo: NETWORK_FILTER match: context: GATEWAY @@ -2739,28 +2677,13 @@ spec: filter: name: envoy.filters.network.tcp_proxy proxy: - proxyVersion: ^1\.16.* + proxyVersion: ^1\.17.* patch: operation: INSERT_BEFORE value: name: istio.stats typed_config: '@type': type.googleapis.com/udpa.type.v1.TypedStruct - type_url: type.googleapis.com/envoy.extensions.filters.network.wasm.v3.Wasm - value: - config: - configuration: - '@type': type.googleapis.com/google.protobuf.StringValue - value: | - { - "debug": "false", - "stat_prefix": "istio" - } - root_id: stats_outbound - vm_config: - code: - local: - inline_string: envoy.wasm.stats - runtime: envoy.wasm.runtime.null - vm_id: tcp_stats_outbound + type_url: type.googleapis.com/stats.PluginConfig + value: {} priority: -1 diff --git a/internal/components/discovery/testdata/icp-expected-values.yaml b/internal/components/discovery/testdata/icp-expected-values.yaml index cffd736ab..6482c3392 100644 --- a/internal/components/discovery/testdata/icp-expected-values.yaml +++ b/internal/components/discovery/testdata/icp-expected-values.yaml @@ -92,21 +92,21 @@ pilot: mountPath: /etc/config env: - name: ISTIOD_CUSTOM_HOST - value: istiod-cp-v116x.istio-system.svc + value: istiod-cp-v117x.istio-system.svc - name: PILOT_ENABLE_STATUS value: "true" - name: INJECTION_WEBHOOK_CONFIG_NAME - value: istio-sidecar-injector-cp-v116x-istio-system + value: istio-sidecar-injector-cp-v117x-istio-system - name: VALIDATION_WEBHOOK_CONFIG_NAME - value: istio-validator-cp-v116x-istio-system + value: istio-validator-cp-v117x-istio-system - name: LEADER_ELECTION_NAME_SUFFIX - value: -cp-v116x + value: -cp-v117x - name: CACERT_CONFIG_NAME - value: istio-ca-root-cert-cp-v116x + value: istio-ca-root-cert-cp-v117x - name: MESHCONFIG_CONFIGMAP_NAME - value: istio-cp-v116x + value: istio-cp-v117x - name: INJECTOR_CONFIGMAP_NAME - value: istio-sidecar-injector-cp-v116x + value: istio-sidecar-injector-cp-v117x - name: TEST_ENV value: test-env-value resources: @@ -167,7 +167,7 @@ pilot: traceSampling: 0.5 enableProtocolSniffingForOutbound: false enableProtocolSniffingForInbound: false -revision: cp-v116x +revision: cp-v117x meshConfig: rootNamespace: istio-system connectTimeout: 5s diff --git a/internal/components/discovery/testdata/icp-passive-expected-resource-dump.yaml b/internal/components/discovery/testdata/icp-passive-expected-resource-dump.yaml index f51d0c630..f5932a26c 100644 --- a/internal/components/discovery/testdata/icp-passive-expected-resource-dump.yaml +++ b/internal/components/discovery/testdata/icp-passive-expected-resource-dump.yaml @@ -13,7 +13,7 @@ data: mesh: |- connectTimeout: 5s defaultConfig: - discoveryAddress: istiod-cp-v116x.istio-system.svc:15012 + discoveryAddress: istiod-cp-v117x.istio-system.svc:15012 meshId: mesh1 tracing: zipkin: @@ -26,9 +26,9 @@ kind: ConfigMap metadata: labels: istio: meshconfig - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-operator-discovery - name: istio-cp-v116x.istio-system + name: istio-cp-v117x.istio-system namespace: istio-system --- @@ -343,6 +343,10 @@ data: value: "{{ $containers | join "," }}" - name: ISTIO_META_CLUSTER_ID value: "{{ valueOrDefault .Values.global.multiCluster.clusterName `Kubernetes` }}" + - name: ISTIO_META_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName - name: ISTIO_META_INTERCEPTION_MODE value: "{{ or (index .ObjectMeta.Annotations `sidecar.istio.io/interceptionMode`) .ProxyConfig.InterceptionMode.String }}" {{- if .Values.global.network }} @@ -680,6 +684,10 @@ data: value: "{{ $containers | join "," }}" - name: ISTIO_META_CLUSTER_ID value: "{{ valueOrDefault .Values.global.multiCluster.clusterName `Kubernetes` }}" + - name: ISTIO_META_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName - name: ISTIO_META_INTERCEPTION_MODE value: "{{ .ProxyConfig.InterceptionMode.String }}" {{- if .Values.global.network }} @@ -1019,6 +1027,10 @@ data: value: "{{ $containers | join "," }}" - name: ISTIO_META_CLUSTER_ID value: "{{ valueOrDefault .Values.global.multiCluster.clusterName `Kubernetes` }}" + - name: ISTIO_META_NODE_NAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName {{- if .Values.global.network }} - name: ISTIO_META_NETWORK value: "{{ .Values.global.network }}" @@ -1235,6 +1247,7 @@ data: "global": { "caAddress": "", "caName": "Citadel", + "certSigners": [], "configCluster": false, "configValidation": true, "defaultPodDisruptionBudget": { @@ -1317,7 +1330,7 @@ data: "sts": { "servicePort": 0 }, - "tag": "1.16.1", + "tag": "1.17.1", "tracer": { "datadog": { "address": "$(HOST_IP):8126" @@ -1343,7 +1356,7 @@ data: "chained": true, "enabled": false }, - "revision": "cp-v116x", + "revision": "cp-v117x", "sidecarInjectorWebhook": { "alwaysInjectSelector": [], "defaultTemplates": [ @@ -1366,9 +1379,9 @@ kind: ConfigMap metadata: labels: istio: sidecar-injector - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-operator-discovery - name: istio-sidecar-injector-cp-v116x.istio-system + name: istio-sidecar-injector-cp-v117x.istio-system namespace: istio-system --- @@ -1378,7 +1391,7 @@ metadata: labels: app: istio-reader release: istio-operator-discovery - name: istio-reader-cp-v116x + name: istio-reader-cp-v117x namespace: istio-system --- @@ -1388,7 +1401,7 @@ metadata: labels: app: istio-reader release: istio-operator-discovery - name: istio-reader-cp-v116x-istio-system + name: istio-reader-cp-v117x-istio-system rules: - apiGroups: - config.istio.io @@ -1484,14 +1497,14 @@ metadata: labels: app: istio-reader release: istio-operator-discovery - name: istio-reader-cp-v116x-istio-system + name: istio-reader-cp-v117x-istio-system roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: istio-reader-cp-v116x-istio-system + name: istio-reader-cp-v117x-istio-system subjects: - kind: ServiceAccount - name: istio-reader-cp-v116x + name: istio-reader-cp-v117x namespace: istio-system --- @@ -1501,9 +1514,9 @@ metadata: labels: app: istiod istio: istiod - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-operator-discovery - name: istiod-cp-v116x + name: istiod-cp-v117x namespace: istio-system spec: clusterIP: None @@ -1531,16 +1544,16 @@ kind: MutatingWebhookConfiguration metadata: labels: app: sidecar-injector - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-operator-discovery - name: istio-sidecar-injector-cp-v116x.istio-system + name: istio-sidecar-injector-cp-v117x.istio-system webhooks: - admissionReviewVersions: - v1beta1 - v1 clientConfig: service: - name: istio-sidecar-injector-cp-v116x + name: istio-sidecar-injector-cp-v117x namespace: istio-system path: /inject port: 443 @@ -1551,7 +1564,7 @@ webhooks: - key: istio.io/rev operator: In values: - - cp-v116x.istio-system + - cp-v117x.istio-system - key: istio-injection operator: DoesNotExist objectSelector: @@ -1576,7 +1589,7 @@ webhooks: - v1 clientConfig: service: - name: istio-sidecar-injector-cp-v116x + name: istio-sidecar-injector-cp-v117x namespace: istio-system path: /inject port: 443 @@ -1597,7 +1610,7 @@ webhooks: - key: istio.io/rev operator: In values: - - cp-v116x.istio-system + - cp-v117x.istio-system rules: - apiGroups: - "" diff --git a/internal/components/discovery/testdata/icp-passive-expected-values.yaml b/internal/components/discovery/testdata/icp-passive-expected-values.yaml index 3cd3299e9..8920c1ce5 100644 --- a/internal/components/discovery/testdata/icp-passive-expected-values.yaml +++ b/internal/components/discovery/testdata/icp-passive-expected-values.yaml @@ -9,7 +9,7 @@ global: meshConfig: connectTimeout: 5s rootNamespace: istio-system -revision: cp-v116x +revision: cp-v117x sidecarInjectorWebhook: defaultTemplates: - sidecar diff --git a/internal/components/discovery/testdata/icp-passive-test-cr.yaml b/internal/components/discovery/testdata/icp-passive-test-cr.yaml index 118b02c36..0b858b643 100644 --- a/internal/components/discovery/testdata/icp-passive-test-cr.yaml +++ b/internal/components/discovery/testdata/icp-passive-test-cr.yaml @@ -1,7 +1,7 @@ apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioControlPlane metadata: - name: cp-v116x + name: cp-v117x namespace: istio-system spec: sidecarInjector: @@ -39,7 +39,7 @@ spec: value: custom-passive2 meshID: mesh1 clusterID: demo-cluster2 - version: "1.16.1" + version: "1.17.1" mode: PASSIVE networkName: network1 caProvider: Citadel diff --git a/internal/components/discovery/testdata/icp-test-cr.yaml b/internal/components/discovery/testdata/icp-test-cr.yaml index 9b0613e47..b4a22e252 100644 --- a/internal/components/discovery/testdata/icp-test-cr.yaml +++ b/internal/components/discovery/testdata/icp-test-cr.yaml @@ -1,7 +1,7 @@ apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioControlPlane metadata: - name: cp-v116x + name: cp-v117x namespace: istio-system spec: sidecarInjector: @@ -39,7 +39,7 @@ spec: value: custom2 meshID: mesh1 clusterID: demo-cluster1 - version: "1.16.1" + version: "1.17.1" mode: ACTIVE networkName: network1 containerImageConfiguration: diff --git a/internal/components/istiomeshgateway/istiomeshgateway_test.go b/internal/components/istiomeshgateway/istiomeshgateway_test.go index d3fd78b81..2e026a9ed 100644 --- a/internal/components/istiomeshgateway/istiomeshgateway_test.go +++ b/internal/components/istiomeshgateway/istiomeshgateway_test.go @@ -68,7 +68,7 @@ func TestIMGWResourceDump(t *testing.T) { reconciler.NativeReconcilerSetControllerRef(), }), v1alpha1.IstioMeshGatewayProperties{ - Revision: "cp-v116x.istio-system", + Revision: "cp-v117x.istio-system", EnablePrometheusMerge: utils.BoolPointer(true), InjectionTemplate: "gateway", InjectionChecksum: "08fdba0c89f9bbd6624201d98758746d1bddc78e9004b00259f33b20b7f9efba", diff --git a/internal/components/istiomeshgateway/testdata/icp-test-cr.yaml b/internal/components/istiomeshgateway/testdata/icp-test-cr.yaml index a3244cf18..f30b8ef47 100644 --- a/internal/components/istiomeshgateway/testdata/icp-test-cr.yaml +++ b/internal/components/istiomeshgateway/testdata/icp-test-cr.yaml @@ -1,12 +1,12 @@ apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioControlPlane metadata: - name: cp-v116x + name: cp-v117x namespace: istio-system spec: meshID: mesh1 clusterID: demo-cluster1 - version: "1.16.1" + version: "1.17.1" mode: ACTIVE containerImageConfiguration: hub: gcr.io/istio-testing diff --git a/internal/components/istiomeshgateway/testdata/imgw-expected-resource-dump.yaml b/internal/components/istiomeshgateway/testdata/imgw-expected-resource-dump.yaml index 901608e77..e77208d1e 100644 --- a/internal/components/istiomeshgateway/testdata/imgw-expected-resource-dump.yaml +++ b/internal/components/istiomeshgateway/testdata/imgw-expected-resource-dump.yaml @@ -15,7 +15,7 @@ metadata: app: demo-gw gateway-name: demo-gw gateway-type: ingress - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-meshgateway name: demo-gw namespace: default @@ -27,7 +27,7 @@ spec: app: demo-gw gateway-name: demo-gw gateway-type: ingress - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system podlabel: podlabelvalue release: istio-meshgateway --- @@ -42,7 +42,7 @@ metadata: app: demo-gw gateway-name: demo-gw gateway-type: ingress - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-meshgateway name: demo-gw-service-account namespace: default @@ -55,7 +55,7 @@ metadata: app: demo-gw gateway-name: demo-gw gateway-type: ingress - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-meshgateway name: demo-gw-sds namespace: default @@ -77,7 +77,7 @@ metadata: app: demo-gw gateway-name: demo-gw gateway-type: ingress - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-meshgateway name: demo-gw-sds namespace: default @@ -99,7 +99,7 @@ metadata: app: demo-gw gateway-name: demo-gw gateway-type: ingress - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-meshgateway name: demo-gw namespace: default @@ -121,7 +121,7 @@ spec: app: demo-gw gateway-name: demo-gw gateway-type: ingress - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system podlabel: podlabelvalue release: istio-meshgateway type: LoadBalancer @@ -157,7 +157,7 @@ metadata: app: demo-gw gateway-name: demo-gw gateway-type: ingress - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-meshgateway name: demo-gw namespace: default @@ -167,7 +167,7 @@ spec: app: demo-gw gateway-name: demo-gw gateway-type: ingress - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system podlabel: podlabelvalue release: istio-meshgateway strategy: @@ -191,7 +191,7 @@ spec: app: demo-gw gateway-name: demo-gw gateway-type: ingress - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-meshgateway sidecar.istio.io/inject: "true" podlabel: podlabelvalue @@ -303,7 +303,7 @@ metadata: app: demo-gw gateway-name: demo-gw gateway-type: ingress - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-meshgateway spec: maxReplicas: 3 diff --git a/internal/components/istiomeshgateway/testdata/imgw-test-cr.yaml b/internal/components/istiomeshgateway/testdata/imgw-test-cr.yaml index 0a1e0cbfc..26cf823c0 100644 --- a/internal/components/istiomeshgateway/testdata/imgw-test-cr.yaml +++ b/internal/components/istiomeshgateway/testdata/imgw-test-cr.yaml @@ -138,7 +138,7 @@ spec: - groupVersionKind: kind: DestinationRule objectKey: - name: meshexpansion-dr-istiod-cp-v116x + name: meshexpansion-dr-istiod-cp-v117x patches: - parseValue: true path: /spec/trafficPolicy?/loadBalancer? diff --git a/internal/components/meshexpansion/testdata/icp-test-cr.yaml b/internal/components/meshexpansion/testdata/icp-test-cr.yaml index c04140d66..2bdb72894 100644 --- a/internal/components/meshexpansion/testdata/icp-test-cr.yaml +++ b/internal/components/meshexpansion/testdata/icp-test-cr.yaml @@ -1,10 +1,10 @@ apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioControlPlane metadata: - name: cp-v116x + name: cp-v117x namespace: istio-system spec: - version: "1.16.1" + version: "1.17.1" mode: ACTIVE networkName: network-bogus distribution: cisco diff --git a/internal/components/meshexpansion/testdata/mex-expected-resource-dump.yaml b/internal/components/meshexpansion/testdata/mex-expected-resource-dump.yaml index 6993dc859..dde7bef74 100644 --- a/internal/components/meshexpansion/testdata/mex-expected-resource-dump.yaml +++ b/internal/components/meshexpansion/testdata/mex-expected-resource-dump.yaml @@ -10,10 +10,10 @@ status: {} apiVersion: networking.istio.io/v1alpha3 kind: Gateway metadata: - name: istio-cross-network-cp-v116x + name: istio-cross-network-cp-v117x spec: selector: - gateway-name: istio-meshexpansion-cp-v116x + gateway-name: istio-meshexpansion-cp-v117x gateway-type: ingress servers: - hosts: @@ -29,10 +29,10 @@ spec: apiVersion: networking.istio.io/v1alpha3 kind: Gateway metadata: - name: istiod-expansion-cp-v116x + name: istiod-expansion-cp-v117x spec: selector: - gateway-name: istio-meshexpansion-cp-v116x + gateway-name: istio-meshexpansion-cp-v117x gateway-type: ingress servers: - hosts: @@ -56,10 +56,10 @@ spec: apiVersion: networking.istio.io/v1alpha3 kind: VirtualService metadata: - name: istiod-expansion-cp-v116x + name: istiod-expansion-cp-v117x spec: gateways: - - istiod-expansion-cp-v116x + - istiod-expansion-cp-v117x hosts: - '*' tls: @@ -69,7 +69,7 @@ spec: - '*' route: - destination: - host: istiod-cp-v116x.istio-system.svc.cluster.local + host: istiod-cp-v117x.istio-system.svc.cluster.local port: number: 15012 - match: @@ -78,7 +78,7 @@ spec: - '*' route: - destination: - host: istiod-cp-v116x.istio-system.svc.cluster.local + host: istiod-cp-v117x.istio-system.svc.cluster.local port: number: 443 @@ -86,16 +86,16 @@ spec: apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioMeshGateway metadata: - name: istio-meshexpansion-cp-v116x + name: istio-meshexpansion-cp-v117x annotations: imgw-annotation: annotationvalue labels: app: istio-meshexpansion-gateway imgw-label: labelvalue - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system spec: istioControlPlane: - name: cp-v116x + name: cp-v117x namespace: istio-system runAsRoot: true deployment: diff --git a/internal/components/meshexpansion/testdata/mex-expected-values.yaml b/internal/components/meshexpansion/testdata/mex-expected-values.yaml index 1488fb765..0407229b9 100644 --- a/internal/components/meshexpansion/testdata/mex-expected-values.yaml +++ b/internal/components/meshexpansion/testdata/mex-expected-values.yaml @@ -1,4 +1,4 @@ -revision: cp-v116x +revision: cp-v117x network: network-bogus distribution: cisco exposeClusterServices: true diff --git a/internal/components/resourcesyncrule/testdata/icp-active-test-cr.yaml b/internal/components/resourcesyncrule/testdata/icp-active-test-cr.yaml index 31ab636d8..c4751eb79 100644 --- a/internal/components/resourcesyncrule/testdata/icp-active-test-cr.yaml +++ b/internal/components/resourcesyncrule/testdata/icp-active-test-cr.yaml @@ -1,10 +1,10 @@ apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioControlPlane metadata: - name: cp-v116x + name: cp-v117x namespace: istio-system spec: - version: "1.16.1" + version: "1.17.1" mode: ACTIVE distribution: cisco meshID: mesh1 diff --git a/internal/components/resourcesyncrule/testdata/icp-passive-test-cr.yaml b/internal/components/resourcesyncrule/testdata/icp-passive-test-cr.yaml index de280a444..609f64abe 100644 --- a/internal/components/resourcesyncrule/testdata/icp-passive-test-cr.yaml +++ b/internal/components/resourcesyncrule/testdata/icp-passive-test-cr.yaml @@ -1,10 +1,10 @@ apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioControlPlane metadata: - name: cp-v116x + name: cp-v117x namespace: istio-system spec: - version: "1.16.1" + version: "1.17.1" mode: PASSIVE distribution: cisco meshID: mesh1 diff --git a/internal/components/resourcesyncrule/testdata/rsr-expected-active-resource-dump.yaml b/internal/components/resourcesyncrule/testdata/rsr-expected-active-resource-dump.yaml index 0a68caa30..a0872c6f9 100644 --- a/internal/components/resourcesyncrule/testdata/rsr-expected-active-resource-dump.yaml +++ b/internal/components/resourcesyncrule/testdata/rsr-expected-active-resource-dump.yaml @@ -12,7 +12,7 @@ metadata: labels: cluster-registry.k8s.cisco.com/reader-aggregated: "true" release: istio-resource-sync-rule - name: istio-ca-root-cert-reader-cp-v116x + name: istio-ca-root-cert-reader-cp-v117x rules: - apiGroups: - "" @@ -29,7 +29,7 @@ metadata: labels: cluster-registry.k8s.cisco.com/controller-aggregated: "true" release: istio-resource-sync-rule - name: istio-custom-resources-controller-cp-v116x + name: istio-custom-resources-controller-cp-v117x rules: - apiGroups: - networking.istio.io @@ -53,7 +53,7 @@ metadata: labels: cluster-registry.k8s.cisco.com/reader-aggregated: "true" release: istio-resource-sync-rule - name: istio-custom-resources-reader-cp-v116x + name: istio-custom-resources-reader-cp-v117x rules: - apiGroups: - networking.istio.io @@ -73,7 +73,7 @@ metadata: labels: cluster-registry.k8s.cisco.com/reader-aggregated: "true" release: istio-resource-sync-rule - name: istio-mesh-reader-cp-v116x + name: istio-mesh-reader-cp-v117x rules: - apiGroups: - servicemesh.cisco.com @@ -90,7 +90,7 @@ metadata: labels: cluster-registry.k8s.cisco.com/controller-aggregated: "true" release: istio-resource-sync-rule - name: istio-peeristiocontrolplane-controller-cp-v116x + name: istio-peeristiocontrolplane-controller-cp-v117x rules: - apiGroups: - servicemesh.cisco.com @@ -121,7 +121,7 @@ metadata: labels: cluster-registry.k8s.cisco.com/reader-aggregated: "true" release: istio-resource-sync-rule - name: istio-peeristiocontrolplane-reader-cp-v116x + name: istio-peeristiocontrolplane-reader-cp-v117x rules: - apiGroups: - servicemesh.cisco.com @@ -136,9 +136,9 @@ apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 kind: ClusterFeature metadata: labels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-resource-sync-rule - name: istio-ca-root-cert-source-cp-v116x + name: istio-ca-root-cert-source-cp-v117x spec: featureName: istio.servicemesh.cisco.com/ca-root-cert-source --- @@ -147,9 +147,9 @@ apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 kind: ClusterFeature metadata: labels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-resource-sync-rule - name: istio-custom-resources-source-cp-v116x + name: istio-custom-resources-source-cp-v117x spec: featureName: istio.servicemesh.cisco.com/custom-resources-source @@ -158,9 +158,9 @@ apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 kind: ClusterFeature metadata: labels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-resource-sync-rule - name: istio-mesh-source-cp-v116x + name: istio-mesh-source-cp-v117x spec: featureName: istio.servicemesh.cisco.com/mesh-source --- @@ -168,9 +168,9 @@ apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 kind: ClusterFeature metadata: labels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-resource-sync-rule - name: istio-multi-cluster-secret-source-cp-v116x + name: istio-multi-cluster-secret-source-cp-v117x spec: featureName: istio.servicemesh.cisco.com/multi-cluster-secret-source --- @@ -178,9 +178,9 @@ apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 kind: ClusterFeature metadata: labels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-resource-sync-rule - name: istio-peeristiocontrolplane-source-cp-v116x + name: istio-peeristiocontrolplane-source-cp-v117x spec: featureName: istio.servicemesh.cisco.com/peeristiocontrolplane-source --- @@ -191,12 +191,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-authorizationpolicies-sink-cp-v116x + name: istio-authorizationpolicies-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/custom-resources-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: security.istio.io kind: AuthorizationPolicy @@ -214,7 +214,7 @@ spec: - key: banzaicloud.io/related-to operator: DoesNotExist matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system --- apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 @@ -224,12 +224,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-destinationrules-sink-cp-v116x + name: istio-destinationrules-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/custom-resources-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: networking.istio.io kind: DestinationRule @@ -247,7 +247,7 @@ spec: - key: banzaicloud.io/related-to operator: DoesNotExist matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system --- apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 @@ -257,12 +257,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-envoyfilters-sink-cp-v116x + name: istio-envoyfilters-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/custom-resources-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: networking.istio.io kind: EnvoyFilter @@ -280,7 +280,7 @@ spec: - key: banzaicloud.io/related-to operator: DoesNotExist matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system --- apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 @@ -290,12 +290,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-gateways-sink-cp-v116x + name: istio-gateways-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/custom-resources-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: networking.istio.io kind: Gateway @@ -313,7 +313,7 @@ spec: - key: banzaicloud.io/related-to operator: DoesNotExist matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system --- apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 kind: ResourceSyncRule @@ -322,12 +322,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-multi-cluster-secret-sink-cp-v116x + name: istio-multi-cluster-secret-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/multi-cluster-secret-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: kind: Secret version: v1 @@ -338,7 +338,7 @@ spec: value: k8s.cisco.com/istio-reader-secret labels: - matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system mutations: labels: add: @@ -352,12 +352,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-peerauthentications-sink-cp-v116x + name: istio-peerauthentications-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/custom-resources-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: security.istio.io kind: PeerAuthentication @@ -375,7 +375,7 @@ spec: - key: banzaicloud.io/related-to operator: DoesNotExist matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system --- apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 @@ -385,12 +385,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-peeristiocontrolplane-sink-cp-v116x + name: istio-peeristiocontrolplane-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/peeristiocontrolplane-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: servicemesh.cisco.com kind: IstioControlPlane @@ -398,7 +398,7 @@ spec: rules: - match: - objectKey: - name: cp-v116x + name: cp-v117x namespace: istio-system mutations: groupVersionKind: @@ -418,12 +418,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-requestauthentications-sink-cp-v116x + name: istio-requestauthentications-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/custom-resources-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: security.istio.io kind: RequestAuthentication @@ -441,7 +441,7 @@ spec: - key: banzaicloud.io/related-to operator: DoesNotExist matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system --- apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 @@ -451,12 +451,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-serviceentries-sink-cp-v116x + name: istio-serviceentries-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/custom-resources-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: networking.istio.io kind: ServiceEntry @@ -474,7 +474,7 @@ spec: - key: banzaicloud.io/related-to operator: DoesNotExist matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system --- apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 @@ -484,12 +484,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-sidecars-sink-cp-v116x + name: istio-sidecars-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/custom-resources-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: networking.istio.io kind: Sidecar @@ -507,7 +507,7 @@ spec: - key: banzaicloud.io/related-to operator: DoesNotExist matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system --- apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 @@ -517,12 +517,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-telemetries-sink-cp-v116x + name: istio-telemetries-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/custom-resources-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: telemetry.istio.io kind: Telemetry @@ -540,7 +540,7 @@ spec: - key: banzaicloud.io/related-to operator: DoesNotExist matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system --- apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 @@ -550,12 +550,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-virtualservices-sink-cp-v116x + name: istio-virtualservices-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/custom-resources-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: networking.istio.io kind: VirtualService @@ -573,7 +573,7 @@ spec: - key: banzaicloud.io/related-to operator: DoesNotExist matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system --- apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 @@ -583,12 +583,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-workloadentries-sink-cp-v116x + name: istio-workloadentries-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/custom-resources-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: networking.istio.io kind: WorkloadEntry @@ -606,7 +606,7 @@ spec: - key: banzaicloud.io/related-to operator: DoesNotExist matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system --- apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 @@ -616,12 +616,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-workloadgroups-sink-cp-v116x + name: istio-workloadgroups-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/custom-resources-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: networking.istio.io kind: WorkloadGroup @@ -639,4 +639,4 @@ spec: - key: banzaicloud.io/related-to operator: DoesNotExist matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system diff --git a/internal/components/resourcesyncrule/testdata/rsr-expected-active-values.yaml b/internal/components/resourcesyncrule/testdata/rsr-expected-active-values.yaml index 63c22ec24..c5e88ba74 100644 --- a/internal/components/resourcesyncrule/testdata/rsr-expected-active-values.yaml +++ b/internal/components/resourcesyncrule/testdata/rsr-expected-active-values.yaml @@ -1,4 +1,4 @@ -revision: cp-v116x +revision: cp-v117x mode: ACTIVE distribution: cisco meshID: mesh1 diff --git a/internal/components/resourcesyncrule/testdata/rsr-expected-passive-resource-dump.yaml b/internal/components/resourcesyncrule/testdata/rsr-expected-passive-resource-dump.yaml index 0541f7dd9..42152dbc9 100644 --- a/internal/components/resourcesyncrule/testdata/rsr-expected-passive-resource-dump.yaml +++ b/internal/components/resourcesyncrule/testdata/rsr-expected-passive-resource-dump.yaml @@ -12,7 +12,7 @@ metadata: labels: cluster-registry.k8s.cisco.com/controller-aggregated: "true" release: istio-resource-sync-rule - name: istio-ca-root-cert-controller-cp-v116x + name: istio-ca-root-cert-controller-cp-v117x rules: - apiGroups: - "" @@ -33,7 +33,7 @@ metadata: labels: cluster-registry.k8s.cisco.com/reader-aggregated: "true" release: istio-resource-sync-rule - name: istio-ca-root-cert-reader-cp-v116x + name: istio-ca-root-cert-reader-cp-v117x rules: - apiGroups: - "" @@ -50,7 +50,7 @@ metadata: labels: cluster-registry.k8s.cisco.com/controller-aggregated: "true" release: istio-resource-sync-rule - name: istio-mesh-controller-cp-v116x + name: istio-mesh-controller-cp-v117x rules: - apiGroups: - servicemesh.cisco.com @@ -79,7 +79,7 @@ metadata: labels: cluster-registry.k8s.cisco.com/reader-aggregated: "true" release: istio-resource-sync-rule - name: istio-mesh-reader-cp-v116x + name: istio-mesh-reader-cp-v117x rules: - apiGroups: - servicemesh.cisco.com @@ -96,7 +96,7 @@ metadata: labels: cluster-registry.k8s.cisco.com/controller-aggregated: "true" release: istio-resource-sync-rule - name: istio-peeristiocontrolplane-controller-cp-v116x + name: istio-peeristiocontrolplane-controller-cp-v117x rules: - apiGroups: - servicemesh.cisco.com @@ -127,7 +127,7 @@ metadata: labels: cluster-registry.k8s.cisco.com/reader-aggregated: "true" release: istio-resource-sync-rule - name: istio-peeristiocontrolplane-reader-cp-v116x + name: istio-peeristiocontrolplane-reader-cp-v117x rules: - apiGroups: - servicemesh.cisco.com @@ -142,9 +142,9 @@ apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 kind: ClusterFeature metadata: labels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-resource-sync-rule - name: istio-multi-cluster-secret-source-cp-v116x + name: istio-multi-cluster-secret-source-cp-v117x spec: featureName: istio.servicemesh.cisco.com/multi-cluster-secret-source --- @@ -152,9 +152,9 @@ apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 kind: ClusterFeature metadata: labels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-resource-sync-rule - name: istio-peeristiocontrolplane-source-cp-v116x + name: istio-peeristiocontrolplane-source-cp-v117x spec: featureName: istio.servicemesh.cisco.com/peeristiocontrolplane-source --- @@ -165,19 +165,19 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-ca-root-cert-sink-cp-v116x + name: istio-ca-root-cert-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/ca-root-cert-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: kind: ConfigMap version: v1 rules: - match: - objectKey: - name: istio-ca-root-cert-cp-v116x + name: istio-ca-root-cert-cp-v117x --- apiVersion: clusterregistry.k8s.cisco.com/v1alpha1 kind: ResourceSyncRule @@ -186,12 +186,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-mesh-sink-cp-v116x + name: istio-mesh-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/mesh-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: servicemesh.cisco.com kind: IstioMesh @@ -210,12 +210,12 @@ metadata: cluster-registry.k8s.cisco.com/resource-sync-disabled: "true" labels: release: istio-resource-sync-rule - name: istio-peeristiocontrolplane-sink-cp-v116x + name: istio-peeristiocontrolplane-sink-cp-v117x spec: clusterFeatureMatch: - featureName: istio.servicemesh.cisco.com/peeristiocontrolplane-source matchLabels: - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system groupVersionKind: group: servicemesh.cisco.com kind: IstioControlPlane @@ -223,7 +223,7 @@ spec: rules: - match: - objectKey: - name: cp-v116x + name: cp-v117x namespace: istio-system mutations: groupVersionKind: diff --git a/internal/components/resourcesyncrule/testdata/rsr-expected-passive-values.yaml b/internal/components/resourcesyncrule/testdata/rsr-expected-passive-values.yaml index f4a0e1562..a486b2e43 100644 --- a/internal/components/resourcesyncrule/testdata/rsr-expected-passive-values.yaml +++ b/internal/components/resourcesyncrule/testdata/rsr-expected-passive-values.yaml @@ -1,4 +1,4 @@ -revision: cp-v116x +revision: cp-v117x mode: PASSIVE distribution: cisco meshID: mesh1 diff --git a/internal/components/sidecarinjector/testdata/icp-expected-resource-dump.yaml b/internal/components/sidecarinjector/testdata/icp-expected-resource-dump.yaml index a52a289ce..af6e344bf 100644 --- a/internal/components/sidecarinjector/testdata/icp-expected-resource-dump.yaml +++ b/internal/components/sidecarinjector/testdata/icp-expected-resource-dump.yaml @@ -16,9 +16,9 @@ metadata: labels: app: istio-sidecar-injector istio: sidecar-injector - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-sidecar-injector - name: istio-sidecar-injector-cp-v116x + name: istio-sidecar-injector-cp-v117x namespace: istio-system --- @@ -28,7 +28,7 @@ metadata: labels: app: istio-sidecar-injector release: istio-sidecar-injector - name: istio-sidecar-injector-cp-v116x-istio-system + name: istio-sidecar-injector-cp-v117x-istio-system rules: - apiGroups: - "" @@ -56,14 +56,14 @@ metadata: labels: app: istio-sidecar-injector release: istio-sidecar-injector - name: istio-sidecar-injector-cp-v116x-istio-system + name: istio-sidecar-injector-cp-v117x-istio-system roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: istio-sidecar-injector-cp-v116x-istio-system + name: istio-sidecar-injector-cp-v117x-istio-system subjects: - kind: ServiceAccount - name: istio-sidecar-injector-cp-v116x + name: istio-sidecar-injector-cp-v117x namespace: istio-system --- @@ -73,9 +73,9 @@ metadata: labels: app: istio-sidecar-injector istio: sidecar-injector - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-sidecar-injector - name: istio-sidecar-injector-cp-v116x + name: istio-sidecar-injector-cp-v117x namespace: istio-system spec: ports: @@ -90,7 +90,7 @@ spec: selector: app: istio-sidecar-injector istio: sidecar-injector - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system podlabel: podlabelvalue release: istio-sidecar-injector type: ClusterIP @@ -104,9 +104,9 @@ metadata: labels: app: istio-sidecar-injector istio: sidecar-injector - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system release: istio-sidecar-injector - name: istio-sidecar-injector-cp-v116x + name: istio-sidecar-injector-cp-v117x namespace: istio-system spec: replicas: 1 @@ -114,7 +114,7 @@ spec: matchLabels: app: istio-sidecar-injector istio: sidecar-injector - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system podlabel: podlabelvalue release: istio-sidecar-injector strategy: @@ -131,7 +131,7 @@ spec: labels: app: istio-sidecar-injector istio: sidecar-injector - istio.io/rev: cp-v116x.istio-system + istio.io/rev: cp-v117x.istio-system podlabel: podlabelvalue release: istio-sidecar-injector sidecar.istio.io/inject: "false" @@ -165,17 +165,17 @@ spec: - --healthCheckInterval=2s - --healthCheckFile=/tmp/health - --reconcileWebhookConfig=true - - --webhookConfigName=istio-sidecar-injector-cp-v116x-istio-system + - --webhookConfigName=istio-sidecar-injector-cp-v117x-istio-system env: - name: REVISION - value: cp-v116x.istio-system + value: cp-v117x.istio-system - name: CERT_DNS_NAMES - value: istio-sidecar-injector-cp-v116x.istio-system,istio-sidecar-injector-cp-v116x.istio-system.svc,istio-sidecar-injector-cp-v116x.istio-system.svc.cluster.local + value: istio-sidecar-injector-cp-v117x.istio-system,istio-sidecar-injector-cp-v117x.istio-system.svc,istio-sidecar-injector-cp-v117x.istio-system.svc.cluster.local - name: CNI_ENV_NAME value: "true" - name: CNI_ANOTHER_ENV_NAME value: standard - image: banzaicloud/istio-sidecar-injector:v1.16.1-bzc.0 + image: banzaicloud/istio-sidecar-injector:v1.17.1-bzc.0 imagePullPolicy: Always livenessProbe: exec: @@ -248,7 +248,7 @@ spec: runAsGroup: 1337 runAsNonRoot: true runAsUser: 1337 - serviceAccountName: istio-sidecar-injector-cp-v116x + serviceAccountName: istio-sidecar-injector-cp-v117x tolerations: - effect: NoSchedule key: key1 @@ -258,7 +258,7 @@ spec: volumes: - configMap: defaultMode: 420 - name: istio-cp-v116x + name: istio-cp-v117x name: config-volume - configMap: defaultMode: 420 @@ -267,7 +267,7 @@ spec: path: config - key: values path: values - name: istio-sidecar-injector-cp-v116x + name: istio-sidecar-injector-cp-v117x name: inject-config - emptyDir: medium: Memory diff --git a/internal/components/sidecarinjector/testdata/icp-expected-values.yaml b/internal/components/sidecarinjector/testdata/icp-expected-values.yaml index 886cdcd04..c7436bf2b 100644 --- a/internal/components/sidecarinjector/testdata/icp-expected-values.yaml +++ b/internal/components/sidecarinjector/testdata/icp-expected-values.yaml @@ -1,6 +1,6 @@ -revision: cp-v116x +revision: cp-v117x deployment: - image: banzaicloud/istio-sidecar-injector:v1.16.1-bzc.0 + image: banzaicloud/istio-sidecar-injector:v1.17.1-bzc.0 metadata: annotations: daemonset-annotation: value diff --git a/internal/components/sidecarinjector/testdata/icp-test-cr.yaml b/internal/components/sidecarinjector/testdata/icp-test-cr.yaml index 2f410638b..a31573b36 100644 --- a/internal/components/sidecarinjector/testdata/icp-test-cr.yaml +++ b/internal/components/sidecarinjector/testdata/icp-test-cr.yaml @@ -1,10 +1,10 @@ apiVersion: servicemesh.cisco.com/v1alpha1 kind: IstioControlPlane metadata: - name: cp-v116x + name: cp-v117x namespace: istio-system spec: - version: "1.16.1" + version: "1.17.1" mode: PASSIVE distribution: cisco containerImageConfiguration: @@ -30,7 +30,7 @@ spec: type: RollingUpdate rollingUpdate: maxUnavailable: 1 - image: banzaicloud/istio-sidecar-injector:v1.16.1-bzc.0 + image: banzaicloud/istio-sidecar-injector:v1.17.1-bzc.0 env: - name: CNI_ENV_NAME value: "true" diff --git a/scripts/label-crds.sh b/scripts/label-crds.sh index eb6926df0..393c3eff6 100755 --- a/scripts/label-crds.sh +++ b/scripts/label-crds.sh @@ -4,7 +4,7 @@ dirname=$(dirname "$0") projectdir=$PWD/$dirname/.. crdpath=$projectdir/config/crd/bases -ISTIO_VERSION=${1:-"1.16.1"} +ISTIO_VERSION=${1:-"1.17.1"} for name in "$crdpath"/*.yaml; do sed "$ d" $name > $name.changed