diff --git a/config/config.yaml.dist b/config/config.yaml.dist index 685f14ccf4..911ae21bea 100644 --- a/config/config.yaml.dist +++ b/config/config.yaml.dist @@ -179,7 +179,7 @@ dex: # charts: # webhook: # chart: "banzaicloud-stable/vault-secrets-webhook" -# version: "0.8.0" +# version: "1.10.0" # # # See https://github.com/banzaicloud/bank-vaults/tree/master/charts/vault-secrets-webhook for details # values: {} diff --git a/docker-compose.yml b/docker-compose.yml index f3852c2647..36452dcfde 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: - ${PWD}/database/docker-init-mysql.sql:/docker-entrypoint-initdb.d/docker-init.sql vault: - image: vault:1.4.2 + image: vault:1.6.1 command: server cap_add: - IPC_LOCK @@ -22,7 +22,7 @@ services: - ./etc/config/vault.hcl:/vault/config/vault.hcl vault-unsealer: - image: banzaicloud/bank-vaults:1.7.0 + image: banzaicloud/bank-vaults:1.10.0 depends_on: - vault restart: on-failure @@ -33,7 +33,7 @@ services: - ./etc/config/vault-config.yml:/vault-config.yml vault-configurer: - image: banzaicloud/bank-vaults:1.7.0 + image: banzaicloud/bank-vaults:1.10.0 depends_on: - vault - vault-unsealer diff --git a/go.mod b/go.mod index 2bacf79d08..f8ec13373b 100644 --- a/go.mod +++ b/go.mod @@ -27,7 +27,7 @@ require ( github.com/aws/aws-sdk-go v1.35.20 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-00010101000000-000000000000 // indirect github.com/banzaicloud/anchore-image-validator v0.0.0-20190823121528-918b9fa6af62 - github.com/banzaicloud/bank-vaults/pkg/sdk v0.4.0 + github.com/banzaicloud/bank-vaults/pkg/sdk v0.6.0 github.com/banzaicloud/cadence-aws-sdk v0.0.0-20201104115745-5238cf77328b github.com/banzaicloud/gin-utilz v0.3.1 github.com/banzaicloud/go-gin-prometheus v0.1.0 diff --git a/go.sum b/go.sum index 2d38b3c8d5..da8e45d3f0 100644 --- a/go.sum +++ b/go.sum @@ -202,8 +202,8 @@ github.com/banzaicloud/aliyun-sts-go-sdk v0.0.0-20191023142834-57827dd1486a h1:9 github.com/banzaicloud/aliyun-sts-go-sdk v0.0.0-20191023142834-57827dd1486a/go.mod h1:0tP+OZnwCc6rkSU2WkqysjrDhR7QuSve8Czl9Z0dFsU= github.com/banzaicloud/anchore-image-validator v0.0.0-20190823121528-918b9fa6af62 h1:wlvTg+btN2gyZrKDOoCpAz+tJLnc072UbTfFTtEdnZk= github.com/banzaicloud/anchore-image-validator v0.0.0-20190823121528-918b9fa6af62/go.mod h1:LpX/aNV3ZYLT0UphkpG88OPi5/vHMrScB7TQtQLrjTs= -github.com/banzaicloud/bank-vaults/pkg/sdk v0.4.0 h1:gr0sjF+PEnqltxQ8ypwRC6cSi69Nto+1sZuQ6bOzHGg= -github.com/banzaicloud/bank-vaults/pkg/sdk v0.4.0/go.mod h1:IgHC3oPQFEK/KI0TDxQ31iTuYLw29GiKMpB/sv1ZaOQ= +github.com/banzaicloud/bank-vaults/pkg/sdk v0.6.0 h1:SOv7vrvAynnp2vrC26cKWRbj1O0ymswvNOVVGtiL178= +github.com/banzaicloud/bank-vaults/pkg/sdk v0.6.0/go.mod h1:qiltQqY61LtTbzichEGinjnAODrbx7Z+gbXmT0tkS4U= github.com/banzaicloud/gin-utilz v0.3.1 h1:BnRW3oh6lK3jjyy0epTKDpMCFFR4c6zFHRbIYVEH5M8= github.com/banzaicloud/gin-utilz v0.3.1/go.mod h1:HK5gehB/ipiFw7ousnH335vpkVnqEXysi5wzQhAWByc= github.com/banzaicloud/go-gin-prometheus v0.1.0 h1:zetacN1k3svVc7DtzGfpHA49uO0G8cwsiP5qSuUUQKs= @@ -825,7 +825,6 @@ github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0 h1:i462o439Z github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI= github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= @@ -1091,7 +1090,6 @@ github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1Cpa github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= 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.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA= github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= @@ -1633,7 +1631,6 @@ golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1837,7 +1834,6 @@ 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.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.7/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 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -1916,7 +1912,6 @@ k8s.io/sample-apiserver v0.19.3/go.mod h1:lCFCWx71mTeqnj/DioYoSGwC0Ce/KSPFtvt41O k8s.io/system-validators v1.0.4/go.mod h1:HgSgTg4NAGNoYYjKsUyk52gdNi2PVDswQ9Iyn66R7NI= k8s.io/system-validators v1.1.2/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q= k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0= -k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20200414100711-2df71ebbae66/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20200603063816-c1c6865ac451/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= @@ -1952,7 +1947,6 @@ 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.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0= sigs.k8s.io/cluster-api v0.3.8/go.mod h1:j2beYKyad77JkeGaiv4l2obt81C3eqxfZGFDqX0YWjs= -sigs.k8s.io/controller-runtime v0.5.2/go.mod h1:JZUwSMVbxDupo0lTJSSFP5pimEyxGynROImSsqIOx1A= sigs.k8s.io/controller-runtime v0.5.9/go.mod h1:UI/unU7Q+mo/rWBrND0NAaVNj/Xjh/+aqSv/M3njpmo= sigs.k8s.io/controller-runtime v0.6.1/go.mod h1:XRYBPdbf5XJu9kpS84VJiZ7h/u1hF3gEORz0efEja7A= sigs.k8s.io/controller-runtime v0.6.2 h1:jkAnfdTYBpFwlmBn3pS5HFO06SfxvnTZ1p5PeEF/zAA= diff --git a/internal/cmd/config.go b/internal/cmd/config.go index f6ea3e0def..037f8ca0c5 100644 --- a/internal/cmd/config.go +++ b/internal/cmd/config.go @@ -567,7 +567,7 @@ func Configure(v *viper.Viper, p *pflag.FlagSet) { v.SetDefault("cluster::vault::managed::enabled", false) v.SetDefault("cluster::vault::managed::endpoint", "") v.SetDefault("cluster::vault::charts::webhook::chart", "banzaicloud-stable/vault-secrets-webhook") - v.SetDefault("cluster::vault::charts::webhook::version", "1.3.0") + v.SetDefault("cluster::vault::charts::webhook::version", "1.10.0") v.SetDefault("cluster::vault::charts::webhook::values", map[string]interface{}{}) v.SetDefault("cluster::monitoring::enabled", true)