Prepare for release v0.15.1 (#551)

ProductLine: KubeDB Release: v2020.11.12 Release-tracker: kubedb/CHANGELOG#24 Signed-off-by: 1gtm <[email protected]>
kubedb · Nov 12, 2020 · 81e8fb7 · 81e8fb7
1 parent 7152cf5
commit 81e8fb7
Show file tree

Hide file tree

Showing 9 changed files with 309 additions and 298 deletions.
diff --git a/go.mod b/go.mod
@@ -19,7 +19,7 @@ require (
 	kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79
 	kmodules.xyz/monitoring-agent-api v0.0.0-20201105074044-be7a1044891a
 	kmodules.xyz/objectstore-api v0.0.0-20201105133858-cbb2af88d50a
-	kubedb.dev/apimachinery v0.15.1-0.20201111204019-44d1f43bc6dd
+	kubedb.dev/apimachinery v0.15.1
 	stash.appscode.dev/apimachinery v0.11.6
 )
 

diff --git a/go.sum b/go.sum
@@ -1394,8 +1394,8 @@ kmodules.xyz/openshift v0.0.0-20201105073146-0da509a7d39f/go.mod h1:vFwB/f5rVH5Q
 kmodules.xyz/prober v0.0.0-20201105074402-a243b3a27fd8 h1:UJb5lHQVFKbmlgmRLq5IWJGtz3JqYYbyVG+dNdjC9Cc=
 kmodules.xyz/prober v0.0.0-20201105074402-a243b3a27fd8/go.mod h1:2eN8X5Wq7/AAgE5AWMAX8T0lE51HZiYEldG2RQuouX4=
 kmodules.xyz/webhook-runtime v0.0.0-20201105073856-2dc7382b88c6/go.mod h1:xLgewoOzwR5ZrVOHQ2SR0P4E7tgCyBWbYlUawEXgeF4=
-kubedb.dev/apimachinery v0.15.1-0.20201111204019-44d1f43bc6dd h1:Nnm0UEdGAeiSCO0HSJyDfGT3CuHRpiukNTyyf0Fl7pI=
-kubedb.dev/apimachinery v0.15.1-0.20201111204019-44d1f43bc6dd/go.mod h1:4H3J+V7lZy8dLgz0+z/Nzd13cEgZHnwbMaH729rxl/M=
+kubedb.dev/apimachinery v0.15.1 h1:Wi82S9kFcmsqDH0pmm6W/VL6MtTv67hfJ/39bSg1Fbg=
+kubedb.dev/apimachinery v0.15.1/go.mod h1:4H3J+V7lZy8dLgz0+z/Nzd13cEgZHnwbMaH729rxl/M=
 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=

diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/constants.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/constants.go
@@ -43,8 +43,10 @@ const (
 
 	DBCustomConfigName = "custom-config"
 
-	DefaultCPULimit    = ".25"
-	DefaultMemoryLimit = "512Mi"
+	DefaultCPULimit      = ".250"
+	DefaultMemoryLimit   = "512Mi"
+	DefaultCPURequest    = ".100"
+	DefaultMemoryRequest = "256Mi"
 
 	// =========================== Database key Constants ============================
 	PostgresKey      = ResourceSingularPostgres + "." + kubedb.GroupName

diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/generated.pb.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/generated.pb.go
diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/generated.proto b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/generated.proto
diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/helpers.go
@@ -57,7 +57,7 @@ func GetServiceTemplate(templates []NamedServiceTemplateSpec, alias ServiceAlias
 	for i := range templates {
 		c := templates[i]
 		if c.Alias == alias {
-			return c.ServiceTemplate
+			return c.ServiceTemplateSpec
 		}
 	}
 	return ofst.ServiceTemplateSpec{}
@@ -81,6 +81,15 @@ func setDefaultResourceLimits(req *core.ResourceRequirements) {
 	if req.Limits == nil {
 		req.Limits = core.ResourceList{}
 	}
+	if req.Requests == nil {
+		req.Requests = core.ResourceList{}
+	}
 	req.Limits[core.ResourceCPU] = fn(core.ResourceCPU, resource.MustParse(DefaultCPULimit))
+	if _, ok := req.Requests[core.ResourceCPU]; !ok {
+		req.Requests[core.ResourceCPU] = resource.MustParse(DefaultCPURequest)
+	}
 	req.Limits[core.ResourceMemory] = fn(core.ResourceMemory, resource.MustParse(DefaultMemoryLimit))
+	if _, ok := req.Requests[core.ResourceMemory]; !ok {
+		req.Requests[core.ResourceMemory] = resource.MustParse(DefaultMemoryRequest)
+	}
 }
diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/types.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/types.go
@@ -111,5 +111,5 @@ type NamedServiceTemplateSpec struct {
 
 	// ServiceTemplate is an optional configuration for a service used to expose database
 	// +optional
-	ServiceTemplate ofst.ServiceTemplateSpec `json:",inline,omitempty" protobuf:"bytes,2,opt,name=serviceTemplate"`
+	ofst.ServiceTemplateSpec `json:",inline,omitempty" protobuf:"bytes,2,opt,name=serviceTemplateSpec"`
 }
diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -490,7 +490,7 @@ kmodules.xyz/objectstore-api/api/v1
 kmodules.xyz/offshoot-api/api/v1
 # kmodules.xyz/prober v0.0.0-20201105074402-a243b3a27fd8
 kmodules.xyz/prober/api/v1
-# kubedb.dev/apimachinery v0.15.1-0.20201111204019-44d1f43bc6dd
+# kubedb.dev/apimachinery v0.15.1
 kubedb.dev/apimachinery/apis
 kubedb.dev/apimachinery/apis/autoscaling
 kubedb.dev/apimachinery/apis/autoscaling/v1alpha1