diff --git a/go.mod b/go.mod index e154ec49f..fa1f37700 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( kmodules.xyz/client-go v0.0.0-20210218100652-8f345ddfe801 kmodules.xyz/custom-resources v0.0.0-20210222235834-b3f8dc56b6a3 kmodules.xyz/monitoring-agent-api v0.0.0-20201105074044-be7a1044891a - kubedb.dev/apimachinery v0.16.3-0.20210308083722-3cdca5092e26 + kubedb.dev/apimachinery v0.17.0 stash.appscode.dev/apimachinery v0.11.10 ) diff --git a/go.sum b/go.sum index 17fd0e421..f2ca4403c 100644 --- a/go.sum +++ b/go.sum @@ -988,9 +988,8 @@ golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200422194213-44a606286825/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 h1:IaQbIIB2X/Mp/DKctl6ROxz1KyMlKp4uyvL6+kQ7C88= golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79/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/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1052,9 +1051,8 @@ golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200602114024-627f9648deb9 h1:pNX+40auqi2JqRfOP1akLGtYcn15TUbkhwuCO3foqqM= golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344 h1:vGXIOMxbNfDTk/aXCmfdLgkrSV+Z2tcbze+pEc3v5W4= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1338,31 +1336,26 @@ k8s.io/system-validators v1.0.4/go.mod h1:HgSgTg4NAGNoYYjKsUyk52gdNi2PVDswQ9Iyn6 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU= k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8/go.mod h1:WXDwZBmvrcLgGcuO9iZpI9jcfPuDFfWbxA4EnhAFtGw= -kmodules.xyz/client-go v0.0.0-20210108092221-c3812eb92bd0/go.mod h1:WXDwZBmvrcLgGcuO9iZpI9jcfPuDFfWbxA4EnhAFtGw= kmodules.xyz/client-go v0.0.0-20210218100652-8f345ddfe801 h1:2seQ02nLJpFdN2dLFy5WbCELalgYgpCqOHMBfDAChfA= kmodules.xyz/client-go v0.0.0-20210218100652-8f345ddfe801/go.mod h1:GdX1CHOpjL4F8P9O/7dE9m0fIOs05BNHKVT+kM51rk8= kmodules.xyz/constants v0.0.0-20200923054614-6b87dbbae4d6/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY= kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4/go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE= -kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c/go.mod h1:/r3/eJ3LIfwGyBEVaobqUZRZGh7GJv5RJojj/bdD14Q= kmodules.xyz/custom-resources v0.0.0-20210222100152-7426e3678989/go.mod h1:/r3/eJ3LIfwGyBEVaobqUZRZGh7GJv5RJojj/bdD14Q= kmodules.xyz/custom-resources v0.0.0-20210222235834-b3f8dc56b6a3 h1:TVUKrj37RHx895lCF1or47q7zrfZiPD9Hvn/9+6nP8E= kmodules.xyz/custom-resources v0.0.0-20210222235834-b3f8dc56b6a3/go.mod h1:/r3/eJ3LIfwGyBEVaobqUZRZGh7GJv5RJojj/bdD14Q= kmodules.xyz/monitoring-agent-api v0.0.0-20201105074044-be7a1044891a h1:3uwHtoj4msqYEoAJ7lyS7z3OFeQPF9v3J4Iv8shs86U= kmodules.xyz/monitoring-agent-api v0.0.0-20201105074044-be7a1044891a/go.mod h1:r8b8lckYt5Gc5tiF3NSBPJmUrxPILerNRdozcaX7grI= -kmodules.xyz/objectstore-api v0.0.0-20201105133858-cbb2af88d50a/go.mod h1:87wP8pKn5ICyQcbK+w+4Jlx5JQy/+mkDGj7T/Qnfrpk= kmodules.xyz/objectstore-api v0.0.0-20210218144135-bfabb80e0362 h1:oG5nkEc8HfcR6Q3rAPJxP5qWEEv5ZJaUaN/qSZw/LF4= kmodules.xyz/objectstore-api v0.0.0-20210218144135-bfabb80e0362/go.mod h1:87wP8pKn5ICyQcbK+w+4Jlx5JQy/+mkDGj7T/Qnfrpk= -kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2/go.mod h1:RMHLigHILAk04wMAuMqBerskKdWlLyjqb0zLLL68cBM= kmodules.xyz/offshoot-api v0.0.0-20210218144050-e1d794cb382a/go.mod h1:RMHLigHILAk04wMAuMqBerskKdWlLyjqb0zLLL68cBM= kmodules.xyz/offshoot-api v0.0.0-20210308072215-581e7685cd02 h1:dJStGXDaR8jwYNWi+RQfetds/hpH8lBvBEaZ4cpJ16U= kmodules.xyz/offshoot-api v0.0.0-20210308072215-581e7685cd02/go.mod h1:RMHLigHILAk04wMAuMqBerskKdWlLyjqb0zLLL68cBM= kmodules.xyz/openshift v0.0.0-20201105073146-0da509a7d39f/go.mod h1:vFwB/f5rVH5QoKXb/MN5xndDzYbmip2N8Zn68wgywlk= -kmodules.xyz/prober v0.0.0-20201105074402-a243b3a27fd8/go.mod h1:2eN8X5Wq7/AAgE5AWMAX8T0lE51HZiYEldG2RQuouX4= kmodules.xyz/prober v0.0.0-20210218144026-43e923722d81 h1:mi0XHhavbXQqj9q89dNhWaOdGjZWHhpr3ai5gSYMZ44= kmodules.xyz/prober v0.0.0-20210218144026-43e923722d81/go.mod h1:2eN8X5Wq7/AAgE5AWMAX8T0lE51HZiYEldG2RQuouX4= kmodules.xyz/webhook-runtime v0.0.0-20201105073856-2dc7382b88c6/go.mod h1:xLgewoOzwR5ZrVOHQ2SR0P4E7tgCyBWbYlUawEXgeF4= -kubedb.dev/apimachinery v0.16.3-0.20210308083722-3cdca5092e26 h1:iqJPtVTZvppn7i1Pig3y9kpaH+Q3r/DXRUkASJueimA= -kubedb.dev/apimachinery v0.16.3-0.20210308083722-3cdca5092e26/go.mod h1:1faNyha2xmV42ismrbF6rnlYqif+FVfPrdAMoLe+glg= +kubedb.dev/apimachinery v0.17.0 h1:GwZlixCz0s3gfgBpo/Xy4ligm2aKNHnL/bZTObEVa6I= +kubedb.dev/apimachinery v0.17.0/go.mod h1:KH4NFS3gJh2qGr07uq84Ce60Q+nEPs50/FboRGjruhs= modernc.org/cc v1.0.0/go.mod h1:1Sk4//wdnYJiUIxnW8ddKpaOJCF37yAdqYnkxUpaYxw= modernc.org/golex v1.0.0/go.mod h1:b/QX9oBD/LhixY6NDh+IdGv17hgB+51fET1i2kPSmvk= modernc.org/mathutil v1.0.0/go.mod h1:wU0vUrJsVWBZ4P6e7xtFJEhFSNsfRLJ8H458uRjg03k= @@ -1389,7 +1382,6 @@ sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= software.sslmate.com/src/go-pkcs12 v0.0.0-20180114231543-2291e8f0f237/go.mod h1:/xvNRWUqm0+/ZMiF4EX00vrSCMsE4/NHb+Pt3freEeQ= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0= -stash.appscode.dev/apimachinery v0.11.9/go.mod h1:Ixnv6Oq7O6XgofgEDrbQhvFCZu2t4XDx16dPgMsxnUM= stash.appscode.dev/apimachinery v0.11.10 h1:Qeyagj207Xgl3U1YbBTSzdIrY27RK7aunNbDXC6HmPI= stash.appscode.dev/apimachinery v0.11.10/go.mod h1:/mCvRYT6pzejllri8OMBRHrpYUSD9fMB7GlgZvCRp6Y= vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI= diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/constants.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/constants.go index e094944c3..dc6bff32f 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/constants.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/constants.go @@ -189,7 +189,6 @@ const ( PerconaXtraDBClusterCustomConfigMountPath = "/etc/percona-xtradb-cluster.conf.d/" // =========================== MariaDB Constants ============================ - MariaDBClusterRecommendedVersion = "10.5" MariaDBMaxClusterNameLength = 32 MariaDBStandaloneReplicas = 1 MariaDBDefaultClusterSize = 3 @@ -232,6 +231,8 @@ const ( PostgresPEMSecretSuffix = "pem" PostgresDefaultUsername = "postgres" + PostgresUID = 70 + // =========================== ProxySQL Constants ============================ LabelProxySQLName = ProxySQLKey + "/name" LabelProxySQLLoadBalance = ProxySQLKey + "/load-balance" diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mongodb_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mongodb_helpers.go index 8813e983c..de830037b 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mongodb_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mongodb_helpers.go @@ -431,6 +431,7 @@ func (m *MongoDB) SetDefaults(mgVersion *v1alpha1.MongoDBVersion, topology *core } m.SetTLSDefaults() + m.Spec.Monitor.SetDefaults() } func (m *MongoDB) SetTLSDefaults() { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/postgres_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/postgres_helpers.go index d23d0b596..c95cf10f2 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/postgres_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/postgres_helpers.go @@ -193,11 +193,14 @@ func (p *Postgres) SetDefaults(topology *core_util.Topology) { if p.Spec.PodTemplate.Spec.ContainerSecurityContext == nil { p.Spec.PodTemplate.Spec.ContainerSecurityContext = &core.SecurityContext{ + RunAsUser: pointer.Int64P(PostgresUID), Privileged: pointer.BoolP(false), Capabilities: &core.Capabilities{ Add: []core.Capability{"IPC_LOCK", "SYS_RESOURCE"}, }, } + } else { + p.Spec.PodTemplate.Spec.ContainerSecurityContext.RunAsUser = pointer.Int64P(PostgresUID) } p.Spec.Monitor.SetDefaults() diff --git a/vendor/modules.txt b/vendor/modules.txt index 6518b2509..ae6742737 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -153,9 +153,9 @@ github.com/yudai/gojsondiff github.com/yudai/gojsondiff/formatter # github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 github.com/yudai/golcs -# golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 +# golang.org/x/crypto v0.0.0-20200429183012-4b2356b1ed79 golang.org/x/crypto/ssh/terminal -# golang.org/x/net v0.0.0-20200625001655-4c5254603344 +# golang.org/x/net v0.0.0-20200602114024-627f9648deb9 golang.org/x/net/context golang.org/x/net/context/ctxhttp golang.org/x/net/http/httpguts @@ -490,7 +490,7 @@ kmodules.xyz/objectstore-api/api/v1 kmodules.xyz/offshoot-api/api/v1 # kmodules.xyz/prober v0.0.0-20210218144026-43e923722d81 kmodules.xyz/prober/api/v1 -# kubedb.dev/apimachinery v0.16.3-0.20210308083722-3cdca5092e26 +# kubedb.dev/apimachinery v0.17.0 kubedb.dev/apimachinery/apis kubedb.dev/apimachinery/apis/autoscaling kubedb.dev/apimachinery/apis/autoscaling/v1alpha1