Skip to content

Commit

Permalink
Prepare for release v0.19.0-rc.0 (#609)
Browse files Browse the repository at this point in the history
ProductLine: KubeDB

Release: v2021.06.21-rc.0

Release-tracker: kubedb/CHANGELOG#38
Signed-off-by: 1gtm <[email protected]>
  • Loading branch information
1gtm authored Jun 22, 2021
1 parent b9214d6 commit b367d2a
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 10 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ require (
kmodules.xyz/client-go v0.0.0-20210617233340-13d22e91512b
kmodules.xyz/custom-resources v0.0.0-20210618003440-c6bb400da153
kmodules.xyz/monitoring-agent-api v0.0.0-20210618110729-9cd872c66513
kubedb.dev/apimachinery v0.18.1-0.20210618122709-e98fb31f5dfb
stash.appscode.dev/apimachinery v0.14.1-0.20210618025054-0cae462d7e04
kubedb.dev/apimachinery v0.19.0-rc.0
stash.appscode.dev/apimachinery v0.14.1
)

replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1155,8 +1155,8 @@ kmodules.xyz/prober v0.0.0-20210618020259-5836fb959027 h1:rtSPsruEkoBOLcbJkxMQjn
kmodules.xyz/prober v0.0.0-20210618020259-5836fb959027/go.mod h1:H4NcvS1RQxeXtQONALbU6r9OT3Xa7cMhfamX/k9t9wo=
kmodules.xyz/resource-metadata v0.5.7/go.mod h1:Jdi7zBXRwwFTOR0CxwKxqJhsDVIilhrgNipPjnKLyrs=
kmodules.xyz/webhook-runtime v0.0.0-20210618013329-0accb929102b/go.mod h1:MFZFmJk9IXNHwq8JlF/mukwBDbopFQj4swaB2MWHc/U=
kubedb.dev/apimachinery v0.18.1-0.20210618122709-e98fb31f5dfb h1:ldJ/5yMdsAvMAO7qWGK/NIViBLVndmmE6jQpPa6pvwE=
kubedb.dev/apimachinery v0.18.1-0.20210618122709-e98fb31f5dfb/go.mod h1:pE5rairEKDwM8iOevHCidDIouEE4Im6Ei6Zf5s/a17E=
kubedb.dev/apimachinery v0.19.0-rc.0 h1:Nd8Us1RQ8Vr4jgwJc4tCy7YTz0GGafN1Hy2PfYb3n0s=
kubedb.dev/apimachinery v0.19.0-rc.0/go.mod h1:EsDnTm5D9VBJiZjBfx9JMDgOldvtKcRP7Y52AFzsMTg=
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=
Expand Down Expand Up @@ -1191,5 +1191,5 @@ 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=
software.sslmate.com/src/go-pkcs12 v0.0.0-20200830195227-52f69702a001/go.mod h1:/xvNRWUqm0+/ZMiF4EX00vrSCMsE4/NHb+Pt3freEeQ=
sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
stash.appscode.dev/apimachinery v0.14.1-0.20210618025054-0cae462d7e04 h1:7cnkwSU9ACHkN+qHv15EKdftXGqHyK8G5fJ+aVUSvk4=
stash.appscode.dev/apimachinery v0.14.1-0.20210618025054-0cae462d7e04/go.mod h1:/Ys7EVp/ved+2xkfhqMbRpaJtI3p/KpCPRLJ6ZgDddA=
stash.appscode.dev/apimachinery v0.14.1 h1:HU6ediYchu138WckGEN+uXF7l99kd9bAbqBeZFnQLNk=
stash.appscode.dev/apimachinery v0.14.1/go.mod h1:/Ys7EVp/ved+2xkfhqMbRpaJtI3p/KpCPRLJ6ZgDddA=
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion, top
e.Spec.Topology.Ingest.Suffix = string(ElasticsearchNodeRoleTypeIngest)
}
SetDefaultResourceLimits(&e.Spec.Topology.Ingest.Resources, DefaultResources)
if e.Spec.Topology.Ingest.Replicas != nil {
if e.Spec.Topology.Ingest.Replicas == nil {
e.Spec.Topology.Ingest.Replicas = pointer.Int32P(1)
}

Expand All @@ -395,7 +395,7 @@ func (e *Elasticsearch) SetDefaults(esVersion *catalog.ElasticsearchVersion, top
e.Spec.Topology.Master.Suffix = string(ElasticsearchNodeRoleTypeMaster)
}
SetDefaultResourceLimits(&e.Spec.Topology.Master.Resources, DefaultResources)
if e.Spec.Topology.Master.Replicas != nil {
if e.Spec.Topology.Master.Replicas == nil {
e.Spec.Topology.Master.Replicas = pointer.Int32P(1)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,24 @@ func (p *Postgres) SetDefaults(postgresVersion *catalog.PostgresVersion, topolog
}
}

if p.Spec.PodTemplate.Spec.SecurityContext == nil {
p.Spec.PodTemplate.Spec.SecurityContext = &core.PodSecurityContext{
RunAsUser: p.Spec.PodTemplate.Spec.ContainerSecurityContext.RunAsUser,
RunAsGroup: p.Spec.PodTemplate.Spec.ContainerSecurityContext.RunAsGroup,
}
} else {
if p.Spec.PodTemplate.Spec.SecurityContext.RunAsUser == nil {
p.Spec.PodTemplate.Spec.SecurityContext.RunAsUser = p.Spec.PodTemplate.Spec.ContainerSecurityContext.RunAsUser
}
if p.Spec.PodTemplate.Spec.SecurityContext.RunAsGroup == nil {
p.Spec.PodTemplate.Spec.SecurityContext.RunAsGroup = p.Spec.PodTemplate.Spec.ContainerSecurityContext.RunAsGroup
}
}
// Need to set FSGroup equal to p.Spec.PodTemplate.Spec.ContainerSecurityContext.RunAsGroup.
// So that /var/pv directory have the group permission for the RunAsGroup user GID.
// Otherwise, We will get write permission denied.
p.Spec.PodTemplate.Spec.SecurityContext.FSGroup = p.Spec.PodTemplate.Spec.ContainerSecurityContext.RunAsGroup

p.Spec.Monitor.SetDefaults()
p.SetTLSDefaults()
SetDefaultResourceLimits(&p.Spec.PodTemplate.Spec.Resources, DefaultResources)
Expand Down
4 changes: 2 additions & 2 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ kmodules.xyz/objectstore-api/api/v1
kmodules.xyz/offshoot-api/api/v1
# kmodules.xyz/prober v0.0.0-20210618020259-5836fb959027
kmodules.xyz/prober/api/v1
# kubedb.dev/apimachinery v0.18.1-0.20210618122709-e98fb31f5dfb
# kubedb.dev/apimachinery v0.19.0-rc.0
## explicit
kubedb.dev/apimachinery/apis
kubedb.dev/apimachinery/apis/autoscaling
Expand Down Expand Up @@ -698,7 +698,7 @@ sigs.k8s.io/structured-merge-diff/v4/typed
sigs.k8s.io/structured-merge-diff/v4/value
# sigs.k8s.io/yaml v1.2.0
sigs.k8s.io/yaml
# stash.appscode.dev/apimachinery v0.14.1-0.20210618025054-0cae462d7e04
# stash.appscode.dev/apimachinery v0.14.1
## explicit
stash.appscode.dev/apimachinery/apis/repositories
stash.appscode.dev/apimachinery/apis/repositories/v1alpha1
Expand Down

0 comments on commit b367d2a

Please sign in to comment.