From c18241f187d22ddddf330588a425ec799c131725 Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Thu, 1 Apr 2021 11:53:07 +0200 Subject: [PATCH] Bump v1.6.2 (#1433) * helm chart remove 1.6.0 archive from 1.6.0 archive * bump operator to v1.6.2 * fix pointer deref * skip connection pooler sync when empty * revert pooler change and minor update to version msg * do not log query on error when creating or altering users --- .../postgres-operator-issue-template.md | 2 +- README.md | 2 +- charts/postgres-operator-ui/Chart.yaml | 4 +- charts/postgres-operator-ui/index.yaml | 32 ++++++-- .../postgres-operator-ui-1.6.2.tgz | Bin 0 -> 3999 bytes charts/postgres-operator-ui/values.yaml | 2 +- charts/postgres-operator/Chart.yaml | 4 +- .../crds/operatorconfigurations.yaml | 6 +- charts/postgres-operator/index.yaml | 31 ++++++-- .../postgres-operator-1.6.2.tgz | Bin 0 -> 19963 bytes charts/postgres-operator/values-crd.yaml | 8 +- charts/postgres-operator/values.yaml | 10 +-- docs/administrator.md | 2 +- docs/reference/operator_parameters.md | 2 +- go.sum | 56 -------------- manifests/complete-postgres-manifest.yaml | 2 +- manifests/configmap.yaml | 6 +- manifests/minimal-fake-pooler-deployment.yaml | 2 +- manifests/operatorconfiguration.crd.yaml | 6 +- manifests/postgres-operator.yaml | 2 +- ...gresql-operator-default-configuration.yaml | 6 +- .../v1/operator_configuration_type.go | 8 +- .../acid.zalan.do/v1/zz_generated.deepcopy.go | 5 ++ pkg/cluster/k8sres.go | 4 +- pkg/cluster/majorversionupgrade.go | 2 +- pkg/controller/operator_config.go | 6 +- pkg/util/config/config.go | 72 +++++++++--------- pkg/util/users/users.go | 6 +- 28 files changed, 140 insertions(+), 148 deletions(-) create mode 100644 charts/postgres-operator-ui/postgres-operator-ui-1.6.2.tgz create mode 100644 charts/postgres-operator/postgres-operator-1.6.2.tgz diff --git a/.github/ISSUE_TEMPLATE/postgres-operator-issue-template.md b/.github/ISSUE_TEMPLATE/postgres-operator-issue-template.md index b96eba1c6..f53be1319 100644 --- a/.github/ISSUE_TEMPLATE/postgres-operator-issue-template.md +++ b/.github/ISSUE_TEMPLATE/postgres-operator-issue-template.md @@ -9,7 +9,7 @@ assignees: '' Please, answer some short questions which should help us to understand your problem / question better? -- **Which image of the operator are you using?** e.g. registry.opensource.zalan.do/acid/postgres-operator:v1.6.1 +- **Which image of the operator are you using?** e.g. registry.opensource.zalan.do/acid/postgres-operator:v1.6.2 - **Where do you run it - cloud or metal? Kubernetes or OpenShift?** [AWS K8s | GCP ... | Bare Metal K8s] - **Are you running Postgres Operator in production?** [yes | no] - **Type of issue?** [Bug report, question, feature request, etc.] diff --git a/README.md b/README.md index b29142967..3035e109d 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ We introduce the major version into the backup path to smoothen the [major versi The new operator configuration can set a compatibility flag *enable_spilo_wal_path_compat* to make Spilo look for wal segments in the current path but also old format paths. This comes at potential performance costs and should be disabled after a few days. -The newest Spilo 13 image is: `registry.opensource.zalan.do/acid/spilo-13:2.0-p4` +The newest Spilo 13 image is: `registry.opensource.zalan.do/acid/spilo-13:2.0-p6` The last Spilo 12 image is: `registry.opensource.zalan.do/acid/spilo-12:1.6-p5` diff --git a/charts/postgres-operator-ui/Chart.yaml b/charts/postgres-operator-ui/Chart.yaml index 8ff7f6637..4ad4de5e6 100644 --- a/charts/postgres-operator-ui/Chart.yaml +++ b/charts/postgres-operator-ui/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: postgres-operator-ui -version: 1.6.1 -appVersion: 1.6.1 +version: 1.6.2 +appVersion: 1.6.2 home: https://github.com/zalando/postgres-operator description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience keywords: diff --git a/charts/postgres-operator-ui/index.yaml b/charts/postgres-operator-ui/index.yaml index 2762265c3..fcbb613f5 100644 --- a/charts/postgres-operator-ui/index.yaml +++ b/charts/postgres-operator-ui/index.yaml @@ -1,9 +1,31 @@ apiVersion: v1 entries: postgres-operator-ui: + - apiVersion: v1 + appVersion: 1.6.2 + created: "2021-03-29T15:05:15.495911278+02:00" + description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience + digest: 7adfb8fad3c1ac8038bb9367aec8fbeed04e590631c00a2ecaee7aca6b222520 + home: https://github.com/zalando/postgres-operator + keywords: + - postgres + - operator + - ui + - cloud-native + - patroni + - spilo + maintainers: + - email: opensource@zalando.de + name: Zalando + name: postgres-operator-ui + sources: + - https://github.com/zalando/postgres-operator + urls: + - postgres-operator-ui-1.6.2.tgz + version: 1.6.2 - apiVersion: v1 appVersion: 1.6.1 - created: "2021-02-19T12:19:43.9076945+01:00" + created: "2021-03-29T15:05:15.495347181+02:00" description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience digest: 3d321352f2f1e7bb7450aa8876e3d818aa9f9da9bd4250507386f0490f2c1969 home: https://github.com/zalando/postgres-operator @@ -25,9 +47,9 @@ entries: version: 1.6.1 - apiVersion: v1 appVersion: 1.6.0 - created: "2021-02-19T12:19:43.907164331+01:00" + created: "2021-03-29T15:05:15.494822657+02:00" description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience - digest: 7bc10d08b25fa423b85a26a1b4c6f6709c5a9d374fa833b44629dc0713f17529 + digest: 1e0aa1e7db3c1daa96927ffbf6fdbcdb434562f961833cb5241ddbe132220ee4 home: https://github.com/zalando/postgres-operator keywords: - postgres @@ -47,7 +69,7 @@ entries: version: 1.6.0 - apiVersion: v1 appVersion: 1.5.0 - created: "2021-02-19T12:19:43.906550454+01:00" + created: "2021-03-29T15:05:15.494293759+02:00" description: Postgres Operator UI provides a graphical interface for a convenient database-as-a-service user experience digest: c91ea39e6d51d57f4048fb1b6ec53b40823f2690eb88e4e4f1a036367b9fdd61 home: https://github.com/zalando/postgres-operator @@ -67,4 +89,4 @@ entries: urls: - postgres-operator-ui-1.5.0.tgz version: 1.5.0 -generated: "2021-02-19T12:19:43.905861603+01:00" +generated: "2021-03-29T15:05:15.493586164+02:00" diff --git a/charts/postgres-operator-ui/postgres-operator-ui-1.6.2.tgz b/charts/postgres-operator-ui/postgres-operator-ui-1.6.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..0e81a88f8e52826dc71420fc602ebf4f5a97f0c3 GIT binary patch literal 3999 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 F001pO$B6&{ literal 0 HcmV?d00001 diff --git a/charts/postgres-operator-ui/values.yaml b/charts/postgres-operator-ui/values.yaml index b8e147c05..db44ce375 100644 --- a/charts/postgres-operator-ui/values.yaml +++ b/charts/postgres-operator-ui/values.yaml @@ -8,7 +8,7 @@ replicaCount: 1 image: registry: registry.opensource.zalan.do repository: acid/postgres-operator-ui - tag: v1.6.1 + tag: v1.6.2 pullPolicy: "IfNotPresent" # Optionally specify an array of imagePullSecrets. diff --git a/charts/postgres-operator/Chart.yaml b/charts/postgres-operator/Chart.yaml index 857967a48..94dea3a15 100644 --- a/charts/postgres-operator/Chart.yaml +++ b/charts/postgres-operator/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: postgres-operator -version: 1.6.1 -appVersion: 1.6.1 +version: 1.6.2 +appVersion: 1.6.2 home: https://github.com/zalando/postgres-operator description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes keywords: diff --git a/charts/postgres-operator/crds/operatorconfigurations.yaml b/charts/postgres-operator/crds/operatorconfigurations.yaml index 0b9b56fb6..0ac5651c3 100644 --- a/charts/postgres-operator/crds/operatorconfigurations.yaml +++ b/charts/postgres-operator/crds/operatorconfigurations.yaml @@ -65,7 +65,7 @@ spec: properties: docker_image: type: string - default: "registry.opensource.zalan.do/acid/spilo-13:2.0-p4" + default: "registry.opensource.zalan.do/acid/spilo-13:2.0-p6" enable_crd_validation: type: boolean default: true @@ -397,7 +397,7 @@ spec: properties: logical_backup_docker_image: type: string - default: "registry.opensource.zalan.do/acid/logical-backup:v1.6.1" + default: "registry.opensource.zalan.do/acid/logical-backup:v1.6.2" logical_backup_google_application_credentials: type: string logical_backup_job_prefix: @@ -526,7 +526,7 @@ spec: default: "pooler" connection_pooler_image: type: string - default: "registry.opensource.zalan.do/acid/pgbouncer:master-14" + default: "registry.opensource.zalan.do/acid/pgbouncer:master-16" connection_pooler_max_db_connections: type: integer default: 60 diff --git a/charts/postgres-operator/index.yaml b/charts/postgres-operator/index.yaml index 1096c88d8..e59cc7629 100644 --- a/charts/postgres-operator/index.yaml +++ b/charts/postgres-operator/index.yaml @@ -1,9 +1,30 @@ apiVersion: v1 entries: postgres-operator: + - apiVersion: v1 + appVersion: 1.6.2 + created: "2021-03-30T17:00:50.171986449+02:00" + description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes + digest: d886f8a0879ca07d1e5246ee7bc55710e1c872f3977280fe495db6fc2057a7f4 + home: https://github.com/zalando/postgres-operator + keywords: + - postgres + - operator + - cloud-native + - patroni + - spilo + maintainers: + - email: opensource@zalando.de + name: Zalando + name: postgres-operator + sources: + - https://github.com/zalando/postgres-operator + urls: + - postgres-operator-1.6.2.tgz + version: 1.6.2 - apiVersion: v1 appVersion: 1.6.1 - created: "2021-02-19T12:13:13.262839018+01:00" + created: "2021-03-30T17:00:50.170294515+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes digest: 4ba5972cd486dcaa2d11c5613a6f97f6b7b831822e610fe9e10a57ea1db23556 home: https://github.com/zalando/postgres-operator @@ -24,9 +45,9 @@ entries: version: 1.6.1 - apiVersion: v1 appVersion: 1.6.0 - created: "2021-02-19T12:13:13.260413425+01:00" + created: "2021-03-30T17:00:50.168493689+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes - digest: 1b4c3892335a207f4719c3817186e98b6105398ab45dafc4274dac837ec9bf31 + digest: f52149718ea364f46b4b9eec9a65f6253ad182bb78df541d14cd5277b9c8a8c3 home: https://github.com/zalando/postgres-operator keywords: - postgres @@ -45,7 +66,7 @@ entries: version: 1.6.0 - apiVersion: v1 appVersion: 1.5.0 - created: "2021-02-19T12:13:13.257505579+01:00" + created: "2021-03-30T17:00:50.166722286+02:00" description: Postgres Operator creates and manages PostgreSQL clusters running in Kubernetes digest: 198351d5db52e65cdf383d6f3e1745d91ac1e2a01121f8476f8b1be728b09531 home: https://github.com/zalando/postgres-operator @@ -64,4 +85,4 @@ entries: urls: - postgres-operator-1.5.0.tgz version: 1.5.0 -generated: "2021-02-19T12:13:13.25598107+01:00" +generated: "2021-03-30T17:00:50.165166707+02:00" diff --git a/charts/postgres-operator/postgres-operator-1.6.2.tgz b/charts/postgres-operator/postgres-operator-1.6.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..4daf847e1b49988574d4eaedabfc46703779d060 GIT binary patch literal 19963 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 A;{X5v literal 0 HcmV?d00001 diff --git a/charts/postgres-operator/values-crd.yaml b/charts/postgres-operator/values-crd.yaml index 33fe83cb0..6110fe8bc 100644 --- a/charts/postgres-operator/values-crd.yaml +++ b/charts/postgres-operator/values-crd.yaml @@ -1,7 +1,7 @@ image: registry: registry.opensource.zalan.do repository: acid/postgres-operator - tag: v1.6.1 + tag: v1.6.2 pullPolicy: "IfNotPresent" # Optionally specify an array of imagePullSecrets. @@ -32,7 +32,7 @@ configGeneral: # Select if setup uses endpoints (default), or configmaps to manage leader (DCS=k8s) # kubernetes_use_configmaps: false # Spilo docker image - docker_image: registry.opensource.zalan.do/acid/spilo-13:2.0-p4 + docker_image: registry.opensource.zalan.do/acid/spilo-13:2.0-p6 # min number of instances in Postgres cluster. -1 = no limit min_instances: -1 # max number of instances in Postgres cluster. -1 = no limit @@ -263,7 +263,7 @@ configAwsOrGcp: # configure K8s cron job managed by the operator configLogicalBackup: # image for pods of the logical backup job (example runs pg_dumpall) - logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.1" + logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.2" # path of google cloud service account json file # logical_backup_google_application_credentials: "" @@ -326,7 +326,7 @@ configConnectionPooler: # db user for pooler to use connection_pooler_user: "pooler" # docker image - connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-14" + connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-16" # max db connections the pooler should hold connection_pooler_max_db_connections: 60 # default pooling mode diff --git a/charts/postgres-operator/values.yaml b/charts/postgres-operator/values.yaml index 20bdc405e..1cf84ca87 100644 --- a/charts/postgres-operator/values.yaml +++ b/charts/postgres-operator/values.yaml @@ -1,7 +1,7 @@ image: registry: registry.opensource.zalan.do repository: acid/postgres-operator - tag: v1.6.1 + tag: v1.6.2 pullPolicy: "IfNotPresent" # Optionally specify an array of imagePullSecrets. @@ -35,7 +35,7 @@ configGeneral: # Select if setup uses endpoints (default), or configmaps to manage leader (DCS=k8s) # kubernetes_use_configmaps: "false" # Spilo docker image - docker_image: registry.opensource.zalan.do/acid/spilo-13:2.0-p4 + docker_image: registry.opensource.zalan.do/acid/spilo-13:2.0-p6 # min number of instances in Postgres cluster. -1 = no limit min_instances: "-1" # max number of instances in Postgres cluster. -1 = no limit @@ -149,7 +149,7 @@ configKubernetes: spilo_privileged: "false" # whether the Spilo container should run with additional permissions other than parent. # required by cron which needs setuid - spilo_allow_privilege_escalation: true + spilo_allow_privilege_escalation: "true" # storage resize strategy, available options are: ebs, pvc, off storage_resize_mode: pvc # operator watches for postgres objects in the given namespace @@ -253,7 +253,7 @@ configAwsOrGcp: # configure K8s cron job managed by the operator configLogicalBackup: # image for pods of the logical backup job (example runs pg_dumpall) - logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.1" + logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.2" # path of google cloud service account json file # logical_backup_google_application_credentials: "" @@ -320,7 +320,7 @@ configConnectionPooler: # db user for pooler to use connection_pooler_user: "pooler" # docker image - connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-14" + connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-16" # max db connections the pooler should hold connection_pooler_max_db_connections: "60" # default pooling mode diff --git a/docs/administrator.md b/docs/administrator.md index 878e53fa2..2b65fe3ea 100644 --- a/docs/administrator.md +++ b/docs/administrator.md @@ -950,7 +950,7 @@ make docker # build in image in minikube docker env eval $(minikube docker-env) -docker build -t registry.opensource.zalan.do/acid/postgres-operator-ui:v1.6.1 . +docker build -t registry.opensource.zalan.do/acid/postgres-operator-ui:v1.6.2 . # apply UI manifests next to a running Postgres Operator kubectl apply -f manifests/ diff --git a/docs/reference/operator_parameters.md b/docs/reference/operator_parameters.md index ace6eae81..80d0e5b8c 100644 --- a/docs/reference/operator_parameters.md +++ b/docs/reference/operator_parameters.md @@ -593,7 +593,7 @@ grouped under the `logical_backup` key. runs `pg_dumpall` on a replica if possible and uploads compressed results to an S3 bucket under the key `/spilo/pg_cluster_name/cluster_k8s_uuid/logical_backups`. The default image is the same image built with the Zalando-internal CI - pipeline. Default: "registry.opensource.zalan.do/acid/logical-backup:v1.6.1" + pipeline. Default: "registry.opensource.zalan.do/acid/logical-backup:v1.6.2" * **logical_backup_google_application_credentials** Specifies the path of the google cloud service account json file. Default is empty. diff --git a/go.sum b/go.sum index 34eeac971..eb83c8d38 100644 --- a/go.sum +++ b/go.sum @@ -45,7 +45,6 @@ github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbt github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46 h1:lsxEuwrXEAokXB9qhlbKWPpo3KMLZQ5WB5WLQRW1uq0= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= 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= @@ -63,21 +62,16 @@ github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRF github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= -github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a h1:idn718Q4B6AGu/h5Sxe66HYVdqdGu2l9Iebqhi/AEoA= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.36.29 h1:lM1G3AF1+7vzFm0n7hfH8r2+750BTo+6Lo6FtPB7kzk= github.com/aws/aws-sdk-go v1.36.29/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -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/blang/semver v3.5.0+incompatible h1:CGxCgetQ64DKk7rdZ++Vfnb1+ogGNnB17OJKJXD2Cfs= github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= @@ -88,13 +82,10 @@ github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkE github.com/coreos/etcd v3.3.10+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.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= @@ -142,11 +133,9 @@ github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70t github.com/go-openapi/analysis v0.17.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= github.com/go-openapi/analysis v0.18.0/go.mod h1:IowGgpVeD0vNm45So8nr+IcQ3pxVtpRoBWb8PVZO0ik= github.com/go-openapi/analysis v0.19.2/go.mod h1:3P1osvZa9jKjb8ed2TPng3f0i/UY9snX6gxi44djMjk= -github.com/go-openapi/analysis v0.19.5 h1:8b2ZgKfKIUTVQpTb77MoRDIMEIwvDVw40o3aOXdfYzI= github.com/go-openapi/analysis v0.19.5/go.mod h1:hkEAkxagaIvIP7VTn8ygJNkd4kAYON2rCu0v0ObL0AU= github.com/go-openapi/errors v0.17.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= github.com/go-openapi/errors v0.18.0/go.mod h1:LcZQpmvG4wyF5j4IhA73wkLFQg+QJXOQHVjmcZxhka0= -github.com/go-openapi/errors v0.19.2 h1:a2kIyV3w+OS3S97zxUndRVD46+FhGOUBDFY7nmu4CsY= github.com/go-openapi/errors v0.19.2/go.mod h1:qX0BLWsyaKfvhluLejVpVNwNRdXZhEbTA4kxxpKBC94= github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0= github.com/go-openapi/jsonpointer v0.17.0/go.mod h1:cOnomiV+CVVwFLk0A/MExoFMjwdsUdVpsRhURCKh+3M= @@ -164,11 +153,9 @@ github.com/go-openapi/loads v0.17.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf github.com/go-openapi/loads v0.18.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= github.com/go-openapi/loads v0.19.0/go.mod h1:72tmFy5wsWx89uEVddd0RjRWPZm92WRLhf7AC+0+OOU= github.com/go-openapi/loads v0.19.2/go.mod h1:QAskZPMX5V0C2gvfkGZzJlINuP7Hx/4+ix5jWFxsNPs= -github.com/go-openapi/loads v0.19.4 h1:5I4CCSqoWzT+82bBkNIvmLc0UOsoKKQ4Fz+3VxOB7SY= github.com/go-openapi/loads v0.19.4/go.mod h1:zZVHonKd8DXyxyw4yfnVjPzBjIQcLt0CCsn0N0ZrQsk= github.com/go-openapi/runtime v0.0.0-20180920151709-4f900dc2ade9/go.mod h1:6v9a6LTXWQCdL8k1AO3cvqx5OtZY/Y9wKTgaoP6YRfA= github.com/go-openapi/runtime v0.19.0/go.mod h1:OwNfisksmmaZse4+gpV3Ne9AyMOlP1lt4sK4FXt0O64= -github.com/go-openapi/runtime v0.19.4 h1:csnOgcgAiuGoM/Po7PEpKDoNulCcF3FGbSnbHfxgjMI= github.com/go-openapi/runtime v0.19.4/go.mod h1:X277bwSUBxVlCYR3r7xgZZGKVvBd/29gLDlFGtJ8NL4= github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc= github.com/go-openapi/spec v0.17.0/go.mod h1:XkF/MOi14NmjsfZ8VtAKf8pIlbZzyoTvZsdfssdxcBI= @@ -179,7 +166,6 @@ github.com/go-openapi/spec v0.19.3/go.mod h1:FpwSN1ksY1eteniUU7X0N/BgJ7a4WvBFVA8 github.com/go-openapi/strfmt v0.17.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= github.com/go-openapi/strfmt v0.18.0/go.mod h1:P82hnJI0CXkErkXi8IKjPbNBM6lV6+5pLP5l494TcyU= github.com/go-openapi/strfmt v0.19.0/go.mod h1:+uW+93UVvGGq2qGaZxdDeJqSAqBqBdl+ZPMF/cC8nDY= -github.com/go-openapi/strfmt v0.19.3 h1:eRfyY5SkaNJCAwmmMcADjY31ow9+N7MCLW7oRkbsINA= github.com/go-openapi/strfmt v0.19.3/go.mod h1:0yX7dbo8mKIvc3XSKp7MNfxw4JytCfCD6+bY1AVL9LU= github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I= github.com/go-openapi/swag v0.17.0/go.mod h1:AByQ+nYG6gQg71GINrmuDXCPWdL640yX49/kXLo40Tg= @@ -189,9 +175,7 @@ github.com/go-openapi/swag v0.19.5 h1:lTz6Ys4CmqqCQmZPBlbQENR1/GucA2bzYTE12Pw4tF github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/go-openapi/validate v0.18.0/go.mod h1:Uh4HdOzKt19xGIGm1qHf/ofbX1YQ4Y+MYsct2VUrAJ4= github.com/go-openapi/validate v0.19.2/go.mod h1:1tRCw7m3jtI8eNWEEliiAqUIcBztB2KDnRCRMUi7GTA= -github.com/go-openapi/validate v0.19.5 h1:QhCBKRYqZR+SKo4gl1lPhPahope8/RLt6EVgY8X80w0= github.com/go-openapi/validate v0.19.5/go.mod h1:8DJv2CVJQ6kGNpFW6eV9N3JviE1C85nY1c2z52x1Gk4= -github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= 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= @@ -201,7 +185,6 @@ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfU github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= 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 h1:5ZkaAPbicIKTF2I64qf5Fh8Aa83Q/dnOafMYV0OMwjA= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -223,7 +206,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= @@ -232,7 +214,6 @@ github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= -github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= @@ -248,7 +229,6 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -261,7 +241,6 @@ github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoA github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/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.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= 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.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= @@ -274,7 +253,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= @@ -315,10 +293,8 @@ github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaO github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -330,7 +306,6 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d h1:LznySqW8MqVeFh+pW6rOkFdld9QQ7jRydBKKM6jyPVI= github.com/motomux/pretty v0.0.0-20161209205251-b2aad2c9a95d/go.mod h1:u3hJ0kqCQu/cPpsu3RbCOPZ0d7V3IjPjv1adNRleM9I= github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= @@ -356,22 +331,18 @@ github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prY 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.7.1 h1:NTGy1Ja9pByO+xAeH/qiWnLrKtr3hJPNjaVUwnjpdpA= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= 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/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.10.0 h1:RyRA7RzGXQZiW+tGMr7sxa85G1z0yOpM1qq5c8lNawc= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= 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.1.3 h1:F0+tqvhOksq22sc6iCHF5WGlWjdwj92p0udFh1VFBS8= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/r3labs/diff v1.1.0 h1:V53xhrbTHrWFWq3gI4b94AjgEJOerO1+1l0xyHOBi8M= @@ -392,7 +363,6 @@ github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8= github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= @@ -403,12 +373,10 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= @@ -425,22 +393,17 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= -go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5 h1:Gqga3zA9tdAcfqobUGjSoCob5L3f8Dt5EuOp3ihNZko= go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5/go.mod h1:skWido08r9w6Lq/w70DO5XYIKMu4QFu1+4VsqLQuJy8= go.mongodb.org/mongo-driver v1.0.3/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= go.mongodb.org/mongo-driver v1.1.1/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= -go.mongodb.org/mongo-driver v1.1.2 h1:jxcFYjlkl8xaERsgLo+RNquI0epW6zuy/ZRQs6jnrFA= go.mongodb.org/mongo-driver v1.1.2/go.mod h1:u7ryQJ+DOzQmeO7zB6MHyr8jkEQvC8vH7qLUO4lqsUM= 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= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/zap v1.10.0 h1:ORx85nbTijNz8ljznvCMR1ZBIPKFn3jQrag10X2AsuM= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -451,7 +414,6 @@ golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190617133340-57b3e21c3d56/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c h1:9HhBz5L/UjnK9XLtiZhYAdue5BVKep3PMmS2LuPDt8k= @@ -522,7 +484,6 @@ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwY 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= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 h1:pE8b58s1HRDMi8RDc79m0HISf9D4TzseP40cEA6IGfs= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -532,7 +493,6 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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 h1:SQFwaSi55rU7vdNs9Yr0Z324VNlrF+0wMqRXT4St8ck= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/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-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -566,7 +526,6 @@ golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY= golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -576,14 +535,12 @@ golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fq golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= -golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4 h1:0YWbFKbhXG/wIiuHDSKpS0Iy7FSA+u45VtBMfQcFTTc= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0 h1:/5xXl8Y5W96D+TtHSlonuFqGHIWVuyCkGJLwGh9JJFs= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s= golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -666,7 +623,6 @@ google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4 google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY= google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -674,7 +630,6 @@ google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ij google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg= google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -685,7 +640,6 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi 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= -google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= @@ -700,7 +654,6 @@ gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4= 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/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= 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= @@ -711,7 +664,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.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/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= @@ -725,18 +677,15 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= 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= -k8s.io/api v0.19.4 h1:I+1I4cgJYuCDgiLNjKx7SLmIbwgj9w7N7Zr5vSIdwpo= k8s.io/api v0.19.4/go.mod h1:SbtJ2aHCItirzdJ36YslycFNzWADYH3tgOhvBEFtZAk= k8s.io/api v0.20.2 h1:y/HR22XDZY3pniu9hIFDLpUCPq2w5eQ6aV/VFQ7uJMw= k8s.io/api v0.20.2/go.mod h1:d7n6Ehyzx+S+cE3VhTGfVNNqtGc/oL9DCdYYahlurV8= k8s.io/apiextensions-apiserver v0.19.4 h1:D9ak9T012tb3vcGFWYmbQuj9SCC8YM4zhA4XZqsAQC4= k8s.io/apiextensions-apiserver v0.19.4/go.mod h1:B9rpH/nu4JBCtuUp3zTTk8DEjZUupZTBEec7/2zNRYw= -k8s.io/apimachinery v0.19.4 h1:+ZoddM7nbzrDCp0T3SWnyxqf8cbWPT2fkZImoyvHUG0= k8s.io/apimachinery v0.19.4/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA= k8s.io/apimachinery v0.20.2 h1:hFx6Sbt1oG0n6DZ+g4bFt5f6BoMkOjKWsQFu077M3Vg= k8s.io/apimachinery v0.20.2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= k8s.io/apiserver v0.19.4/go.mod h1:X8WRHCR1UGZDd7HpV0QDc1h/6VbbpAeAGyxSh8yzZXw= -k8s.io/client-go v0.19.4 h1:85D3mDNoLF+xqpyE9Dh/OtrJDyJrSRKkHmDXIbEzer8= k8s.io/client-go v0.19.4/go.mod h1:ZrEy7+wj9PjH5VMBCuu/BDlvtUAku0oVFk4MmnW9mWA= k8s.io/client-go v0.20.2 h1:uuf+iIAbfnCSw8IGAv/Rg0giM+2bOzHLOsbbrwrdhNQ= k8s.io/client-go v0.20.2/go.mod h1:kH5brqWqp7HDxUFKoEgiI4v8G1xzbe9giaCenUWJzgE= @@ -747,24 +696,19 @@ k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8 k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= -k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= -k8s.io/utils v0.0.0-20200729134348-d5654de09c73 h1:uJmqzgNWG7XyClnU/mLPBWwfKKF1K8Hf8whTseBgJcg= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= 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.9 h1:rusRLrDhjBp6aYtl9sGEvQJr6faoHoDLd0YcUBTZguI= sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.9/go.mod h1:dzAXnQbTRyDlZPJX2SUPEqvnB+j7AJjtlox7PEwigU0= -sigs.k8s.io/structured-merge-diff/v4 v4.0.1 h1:YXTMot5Qz/X1iBRJhAt+vI+HVttY0WkSqqhKxQ0xVbA= 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 h1:YHQV7Dajm86OuqnIR6zAelnDWBRjo+YhYV9PmGrh1s8= sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= diff --git a/manifests/complete-postgres-manifest.yaml b/manifests/complete-postgres-manifest.yaml index 7f7b34d98..75b873321 100644 --- a/manifests/complete-postgres-manifest.yaml +++ b/manifests/complete-postgres-manifest.yaml @@ -9,7 +9,7 @@ metadata: # "delete-date": "2020-08-31" # can only be deleted on that day if "delete-date "key is configured # "delete-clustername": "acid-test-cluster" # can only be deleted when name matches if "delete-clustername" key is configured spec: - dockerImage: registry.opensource.zalan.do/acid/spilo-13:2.0-p4 + dockerImage: registry.opensource.zalan.do/acid/spilo-13:2.0-p6 teamId: "acid" numberOfInstances: 2 users: # Application/Robot users diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml index 6a98bbb48..29390a1f0 100644 --- a/manifests/configmap.yaml +++ b/manifests/configmap.yaml @@ -16,7 +16,7 @@ data: # connection_pooler_default_cpu_request: "500m" # connection_pooler_default_memory_limit: 100Mi # connection_pooler_default_memory_request: 100Mi - connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-14" + connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-16" # connection_pooler_max_db_connections: 60 # connection_pooler_mode: "transaction" # connection_pooler_number_of_instances: 2 @@ -32,7 +32,7 @@ data: # default_memory_request: 100Mi # delete_annotation_date_key: delete-date # delete_annotation_name_key: delete-clustername - docker_image: registry.opensource.zalan.do/acid/spilo-13:2.0-p4 + docker_image: registry.opensource.zalan.do/acid/spilo-13:2.0-p6 # downscaler_annotations: "deployment-time,downscaler/*" # enable_admin_role_for_users: "true" # enable_crd_validation: "true" @@ -63,7 +63,7 @@ data: # inherited_labels: application,environment # kube_iam_role: "" # log_s3_bucket: "" - logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.1" + logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.2" # logical_backup_google_application_credentials: "" logical_backup_job_prefix: "logical-backup-" logical_backup_provider: "s3" diff --git a/manifests/minimal-fake-pooler-deployment.yaml b/manifests/minimal-fake-pooler-deployment.yaml index 823b4f24d..037cac0f8 100644 --- a/manifests/minimal-fake-pooler-deployment.yaml +++ b/manifests/minimal-fake-pooler-deployment.yaml @@ -23,7 +23,7 @@ spec: serviceAccountName: postgres-operator containers: - name: postgres-operator - image: registry.opensource.zalan.do/acid/pgbouncer:master-14 + image: registry.opensource.zalan.do/acid/pgbouncer:master-16 imagePullPolicy: IfNotPresent resources: requests: diff --git a/manifests/operatorconfiguration.crd.yaml b/manifests/operatorconfiguration.crd.yaml index 2a2e4c980..47244e5d7 100644 --- a/manifests/operatorconfiguration.crd.yaml +++ b/manifests/operatorconfiguration.crd.yaml @@ -61,7 +61,7 @@ spec: properties: docker_image: type: string - default: "registry.opensource.zalan.do/acid/spilo-13:2.0-p4" + default: "registry.opensource.zalan.do/acid/spilo-13:2.0-p6" enable_crd_validation: type: boolean default: true @@ -393,7 +393,7 @@ spec: properties: logical_backup_docker_image: type: string - default: "registry.opensource.zalan.do/acid/logical-backup:v1.6.1" + default: "registry.opensource.zalan.do/acid/logical-backup:v1.6.2" logical_backup_google_application_credentials: type: string logical_backup_job_prefix: @@ -522,7 +522,7 @@ spec: default: "pooler" connection_pooler_image: type: string - default: "registry.opensource.zalan.do/acid/pgbouncer:master-14" + default: "registry.opensource.zalan.do/acid/pgbouncer:master-16" connection_pooler_max_db_connections: type: integer default: 60 diff --git a/manifests/postgres-operator.yaml b/manifests/postgres-operator.yaml index 5c134345b..5e189c819 100644 --- a/manifests/postgres-operator.yaml +++ b/manifests/postgres-operator.yaml @@ -19,7 +19,7 @@ spec: serviceAccountName: postgres-operator containers: - name: postgres-operator - image: registry.opensource.zalan.do/acid/postgres-operator:v1.6.1 + image: registry.opensource.zalan.do/acid/postgres-operator:v1.6.2 imagePullPolicy: IfNotPresent resources: requests: diff --git a/manifests/postgresql-operator-default-configuration.yaml b/manifests/postgresql-operator-default-configuration.yaml index 39fa6bb48..3a8a79c8d 100644 --- a/manifests/postgresql-operator-default-configuration.yaml +++ b/manifests/postgresql-operator-default-configuration.yaml @@ -3,7 +3,7 @@ kind: OperatorConfiguration metadata: name: postgresql-operator-default-configuration configuration: - docker_image: registry.opensource.zalan.do/acid/spilo-13:2.0-p4 + docker_image: registry.opensource.zalan.do/acid/spilo-13:2.0-p6 # enable_crd_validation: true # enable_lazy_spilo_upgrade: false enable_pgversion_env_var: true @@ -123,7 +123,7 @@ configuration: # wal_gs_bucket: "" # wal_s3_bucket: "" logical_backup: - logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.1" + logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup:v1.6.2" # logical_backup_google_application_credentials: "" logical_backup_job_prefix: "logical-backup-" logical_backup_provider: "s3" @@ -162,7 +162,7 @@ configuration: connection_pooler_default_cpu_request: "500m" connection_pooler_default_memory_limit: 100Mi connection_pooler_default_memory_request: 100Mi - connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-14" + connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-16" # connection_pooler_max_db_connections: 60 connection_pooler_mode: "transaction" connection_pooler_number_of_instances: 2 diff --git a/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go b/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go index 3d40373ac..78b618b78 100644 --- a/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go +++ b/pkg/apis/acid.zalan.do/v1/operator_configuration_type.go @@ -43,9 +43,9 @@ type PostgresUsersConfiguration struct { // MajorVersionUpgradeConfiguration defines how to execute major version upgrades of Postgres. type MajorVersionUpgradeConfiguration struct { - MajorVersionUpgradeMode string `json:"major_version_upgrade_mode" default:"off"` // off - no actions, manual - manifest triggers action, full - manifest and minimal version violation trigger upgrade - MinimalMajorVersion string `json:"minimal_major_version" default:"9.5"` - TargetMajorVersion string `json:"target_major_version" default:"13"` + MajorVersionUpgradeMode string `json:"major_version_upgrade_mode" default:"off"` // off - no actions, manual - manifest triggers action, full - manifest and minimal version violation trigger upgrade + MinimalMajorVersion string `json:"minimal_major_version" default:"9.5"` + TargetMajorVersion string `json:"target_major_version" default:"13"` } // KubernetesMetaConfiguration defines k8s conf required for all Postgres clusters and the operator itself @@ -56,7 +56,7 @@ type KubernetesMetaConfiguration struct { PodServiceAccountRoleBindingDefinition string `json:"pod_service_account_role_binding_definition,omitempty"` PodTerminateGracePeriod Duration `json:"pod_terminate_grace_period,omitempty"` SpiloPrivileged bool `json:"spilo_privileged,omitempty"` - SpiloAllowPrivilegeEscalation bool `json:"spilo_allow_privilege_escalation,omitempty"` + SpiloAllowPrivilegeEscalation *bool `json:"spilo_allow_privilege_escalation,omitempty"` SpiloRunAsUser *int64 `json:"spilo_runasuser,omitempty"` SpiloRunAsGroup *int64 `json:"spilo_runasgroup,omitempty"` SpiloFSGroup *int64 `json:"spilo_fsgroup,omitempty"` diff --git a/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go b/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go index 8da5eb6ba..584a72143 100644 --- a/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go +++ b/pkg/apis/acid.zalan.do/v1/zz_generated.deepcopy.go @@ -147,6 +147,11 @@ func (in *ConnectionPoolerConfiguration) DeepCopy() *ConnectionPoolerConfigurati // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *KubernetesMetaConfiguration) DeepCopyInto(out *KubernetesMetaConfiguration) { *out = *in + if in.SpiloAllowPrivilegeEscalation != nil { + in, out := &in.SpiloAllowPrivilegeEscalation, &out.SpiloAllowPrivilegeEscalation + *out = new(bool) + **out = **in + } if in.SpiloRunAsUser != nil { in, out := &in.SpiloRunAsUser, &out.SpiloRunAsUser *out = new(int64) diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go index 9d74cf77a..ace665fb0 100644 --- a/pkg/cluster/k8sres.go +++ b/pkg/cluster/k8sres.go @@ -442,7 +442,7 @@ func generateContainer( envVars []v1.EnvVar, volumeMounts []v1.VolumeMount, privilegedMode bool, - privilegeEscalationMode bool, + privilegeEscalationMode *bool, additionalPodCapabilities *v1.Capabilities, ) *v1.Container { return &v1.Container{ @@ -467,7 +467,7 @@ func generateContainer( VolumeMounts: volumeMounts, Env: envVars, SecurityContext: &v1.SecurityContext{ - AllowPrivilegeEscalation: &privilegeEscalationMode, + AllowPrivilegeEscalation: privilegeEscalationMode, Privileged: &privilegedMode, ReadOnlyRootFilesystem: util.False(), Capabilities: additionalPodCapabilities, diff --git a/pkg/cluster/majorversionupgrade.go b/pkg/cluster/majorversionupgrade.go index 6ee703ca5..06dd979b2 100644 --- a/pkg/cluster/majorversionupgrade.go +++ b/pkg/cluster/majorversionupgrade.go @@ -52,7 +52,7 @@ func (c *Cluster) majorVersionUpgrade() error { desiredVersion := c.GetDesiredMajorVersionAsInt() if c.currentMajorVersion >= desiredVersion { - c.logger.Infof("cluster version up to date. current: %d desired: %d", c.currentMajorVersion, desiredVersion) + c.logger.Infof("cluster version up to date. current: %d, min desired: %d", c.currentMajorVersion, desiredVersion) return nil } diff --git a/pkg/controller/operator_config.go b/pkg/controller/operator_config.go index 4388110db..3c0302cab 100644 --- a/pkg/controller/operator_config.go +++ b/pkg/controller/operator_config.go @@ -39,7 +39,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur result.EnableSpiloWalPathCompat = fromCRD.EnableSpiloWalPathCompat result.EtcdHost = fromCRD.EtcdHost result.KubernetesUseConfigMaps = fromCRD.KubernetesUseConfigMaps - result.DockerImage = util.Coalesce(fromCRD.DockerImage, "registry.opensource.zalan.do/acid/spilo-13:2.0-p4") + result.DockerImage = util.Coalesce(fromCRD.DockerImage, "registry.opensource.zalan.do/acid/spilo-13:2.0-p6") result.Workers = util.CoalesceUInt32(fromCRD.Workers, 8) result.MinInstances = fromCRD.MinInstances result.MaxInstances = fromCRD.MaxInstances @@ -68,7 +68,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur result.PodEnvironmentSecret = fromCRD.Kubernetes.PodEnvironmentSecret result.PodTerminateGracePeriod = util.CoalesceDuration(time.Duration(fromCRD.Kubernetes.PodTerminateGracePeriod), "5m") result.SpiloPrivileged = fromCRD.Kubernetes.SpiloPrivileged - result.SpiloAllowPrivilegeEscalation = fromCRD.Kubernetes.SpiloAllowPrivilegeEscalation + result.SpiloAllowPrivilegeEscalation = util.CoalesceBool(fromCRD.Kubernetes.SpiloAllowPrivilegeEscalation, util.True()) result.SpiloRunAsUser = fromCRD.Kubernetes.SpiloRunAsUser result.SpiloRunAsGroup = fromCRD.Kubernetes.SpiloRunAsGroup result.SpiloFSGroup = fromCRD.Kubernetes.SpiloFSGroup @@ -152,7 +152,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur // logical backup config result.LogicalBackupSchedule = util.Coalesce(fromCRD.LogicalBackup.Schedule, "30 00 * * *") - result.LogicalBackupDockerImage = util.Coalesce(fromCRD.LogicalBackup.DockerImage, "registry.opensource.zalan.do/acid/logical-backup:v1.6.1") + result.LogicalBackupDockerImage = util.Coalesce(fromCRD.LogicalBackup.DockerImage, "registry.opensource.zalan.do/acid/logical-backup:v1.6.2") result.LogicalBackupProvider = util.Coalesce(fromCRD.LogicalBackup.BackupProvider, "s3") result.LogicalBackupS3Bucket = fromCRD.LogicalBackup.S3Bucket result.LogicalBackupS3Region = fromCRD.LogicalBackup.S3Region diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index 356ad60ba..a5d144051 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -23,40 +23,40 @@ type CRD struct { // Resources describes kubernetes resource specific configuration parameters type Resources struct { - ResourceCheckInterval time.Duration `name:"resource_check_interval" default:"3s"` - ResourceCheckTimeout time.Duration `name:"resource_check_timeout" default:"10m"` - PodLabelWaitTimeout time.Duration `name:"pod_label_wait_timeout" default:"10m"` - PodDeletionWaitTimeout time.Duration `name:"pod_deletion_wait_timeout" default:"10m"` - PodTerminateGracePeriod time.Duration `name:"pod_terminate_grace_period" default:"5m"` - SpiloRunAsUser *int64 `name:"spilo_runasuser,omitempty"` - SpiloRunAsGroup *int64 `name:"spilo_runasgroup,omitempty"` - SpiloFSGroup *int64 `name:"spilo_fsgroup"` - PodPriorityClassName string `name:"pod_priority_class_name"` - ClusterDomain string `name:"cluster_domain" default:"cluster.local"` - SpiloPrivileged bool `name:"spilo_privileged" default:"false"` - SpiloAllowPrivilegeEscalation bool `name:"spilo_allow_privilege_escalation" default:"false"` - AdditionalPodCapabilities []string `name:"additional_pod_capabilities" default:""` - ClusterLabels map[string]string `name:"cluster_labels" default:"application:spilo"` - InheritedLabels []string `name:"inherited_labels" default:""` - InheritedAnnotations []string `name:"inherited_annotations" default:""` - DownscalerAnnotations []string `name:"downscaler_annotations"` - ClusterNameLabel string `name:"cluster_name_label" default:"cluster-name"` - DeleteAnnotationDateKey string `name:"delete_annotation_date_key"` - DeleteAnnotationNameKey string `name:"delete_annotation_name_key"` - PodRoleLabel string `name:"pod_role_label" default:"spilo-role"` - PodToleration map[string]string `name:"toleration" default:""` - DefaultCPURequest string `name:"default_cpu_request" default:"100m"` - DefaultMemoryRequest string `name:"default_memory_request" default:"100Mi"` - DefaultCPULimit string `name:"default_cpu_limit" default:"1"` - DefaultMemoryLimit string `name:"default_memory_limit" default:"500Mi"` - MinCPULimit string `name:"min_cpu_limit" default:"250m"` - MinMemoryLimit string `name:"min_memory_limit" default:"250Mi"` - PodEnvironmentConfigMap spec.NamespacedName `name:"pod_environment_configmap"` - PodEnvironmentSecret string `name:"pod_environment_secret"` - NodeReadinessLabel map[string]string `name:"node_readiness_label" default:""` - MaxInstances int32 `name:"max_instances" default:"-1"` - MinInstances int32 `name:"min_instances" default:"-1"` - ShmVolume *bool `name:"enable_shm_volume" default:"true"` + ResourceCheckInterval time.Duration `name:"resource_check_interval" default:"3s"` + ResourceCheckTimeout time.Duration `name:"resource_check_timeout" default:"10m"` + PodLabelWaitTimeout time.Duration `name:"pod_label_wait_timeout" default:"10m"` + PodDeletionWaitTimeout time.Duration `name:"pod_deletion_wait_timeout" default:"10m"` + PodTerminateGracePeriod time.Duration `name:"pod_terminate_grace_period" default:"5m"` + SpiloRunAsUser *int64 `name:"spilo_runasuser,omitempty"` + SpiloRunAsGroup *int64 `name:"spilo_runasgroup,omitempty"` + SpiloFSGroup *int64 `name:"spilo_fsgroup"` + PodPriorityClassName string `name:"pod_priority_class_name"` + ClusterDomain string `name:"cluster_domain" default:"cluster.local"` + SpiloPrivileged bool `name:"spilo_privileged" default:"false"` + SpiloAllowPrivilegeEscalation *bool `name:"spilo_allow_privilege_escalation" default:"true"` + AdditionalPodCapabilities []string `name:"additional_pod_capabilities" default:""` + ClusterLabels map[string]string `name:"cluster_labels" default:"application:spilo"` + InheritedLabels []string `name:"inherited_labels" default:""` + InheritedAnnotations []string `name:"inherited_annotations" default:""` + DownscalerAnnotations []string `name:"downscaler_annotations"` + ClusterNameLabel string `name:"cluster_name_label" default:"cluster-name"` + DeleteAnnotationDateKey string `name:"delete_annotation_date_key"` + DeleteAnnotationNameKey string `name:"delete_annotation_name_key"` + PodRoleLabel string `name:"pod_role_label" default:"spilo-role"` + PodToleration map[string]string `name:"toleration" default:""` + DefaultCPURequest string `name:"default_cpu_request" default:"100m"` + DefaultMemoryRequest string `name:"default_memory_request" default:"100Mi"` + DefaultCPULimit string `name:"default_cpu_limit" default:"1"` + DefaultMemoryLimit string `name:"default_memory_limit" default:"500Mi"` + MinCPULimit string `name:"min_cpu_limit" default:"250m"` + MinMemoryLimit string `name:"min_memory_limit" default:"250Mi"` + PodEnvironmentConfigMap spec.NamespacedName `name:"pod_environment_configmap"` + PodEnvironmentSecret string `name:"pod_environment_secret"` + NodeReadinessLabel map[string]string `name:"node_readiness_label" default:""` + MaxInstances int32 `name:"max_instances" default:"-1"` + MinInstances int32 `name:"min_instances" default:"-1"` + ShmVolume *bool `name:"enable_shm_volume" default:"true"` } type InfrastructureRole struct { @@ -114,7 +114,7 @@ type Scalyr struct { // LogicalBackup defines configuration for logical backup type LogicalBackup struct { LogicalBackupSchedule string `name:"logical_backup_schedule" default:"30 00 * * *"` - LogicalBackupDockerImage string `name:"logical_backup_docker_image" default:"registry.opensource.zalan.do/acid/logical-backup:v1.6.1"` + LogicalBackupDockerImage string `name:"logical_backup_docker_image" default:"registry.opensource.zalan.do/acid/logical-backup:v1.6.2"` LogicalBackupProvider string `name:"logical_backup_provider" default:"s3"` LogicalBackupS3Bucket string `name:"logical_backup_s3_bucket" default:""` LogicalBackupS3Region string `name:"logical_backup_s3_region" default:""` @@ -152,7 +152,7 @@ type Config struct { WatchedNamespace string `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to' KubernetesUseConfigMaps bool `name:"kubernetes_use_configmaps" default:"false"` EtcdHost string `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use K8s as a DCS - DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-13:2.0-p4"` + DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-13:2.0-p6"` SidecarImages map[string]string `name:"sidecar_docker_images"` // deprecated in favour of SidecarContainers SidecarContainers []v1.Container `name:"sidecars"` PodServiceAccountName string `name:"pod_service_account_name" default:"postgres-pod"` diff --git a/pkg/util/users/users.go b/pkg/util/users/users.go index 5d97336e6..231cf2a89 100644 --- a/pkg/util/users/users.go +++ b/pkg/util/users/users.go @@ -119,7 +119,7 @@ func (strategy DefaultUserSyncStrategy) alterPgUserSet(user spec.PgUser, db *sql queries := produceAlterRoleSetStmts(user) query := fmt.Sprintf(doBlockStmt, strings.Join(queries, ";")) if _, err := db.Exec(query); err != nil { - return fmt.Errorf("dB error: %v, query: %s", err, query) + return err } return nil } @@ -146,7 +146,7 @@ func (strategy DefaultUserSyncStrategy) createPgUser(user spec.PgUser, db *sql.D query := fmt.Sprintf(createUserSQL, user.Name, strings.Join(userFlags, " "), userPassword) if _, err := db.Exec(query); err != nil { // TODO: Try several times - return fmt.Errorf("dB error: %v, query: %s", err, query) + return err } if len(user.Parameters) > 0 { @@ -174,7 +174,7 @@ func (strategy DefaultUserSyncStrategy) alterPgUser(user spec.PgUser, db *sql.DB query := fmt.Sprintf(doBlockStmt, strings.Join(resultStmt, ";")) if _, err := db.Exec(query); err != nil { // TODO: Try several times - return fmt.Errorf("dB error: %v query %s", err, query) + return err } }