Prepare for release 3.6.8-beta.20200708 (#93)

ProductLine: Stash

Release: v2020.07.08-beta.0

Release-tracker: stashed/CHANGELOG#1
Signed-off-by: 1gtm <1gtm@appscode.com>

Author: 1gtm

charts/stash-mongodb/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 description: 'stash-mongodb - MongoDB database plugin for Stash by AppsCode'
 name: stash-mongodb
-version: 3.6.8
-appVersion: 3.6.8
+version: 3.6.8-beta.20200708
+appVersion: 3.6.8-beta.20200708
 home: https://github.com/stashed/mongodb
 icon: https://cdn.appscode.com/images/icon/stash.png
 sources:

charts/stash-mongodb/README.md

@@ -7,7 +7,7 @@
 ```console
 $ helm repo add appscode https://charts.appscode.com/stable/
 $ helm repo update
-$ helm install stash-mongodb-3.6.8 appscode/stash-mongodb -n kube-system --version=3.6.8
+$ helm install stash-mongodb-3.6.8-beta.20200708 appscode/stash-mongodb -n kube-system --version=3.6.8-beta.20200708
 ```
 
 ## Introduction
@@ -20,10 +20,10 @@ This chart deploys necessary `Function` and `Task` definition to backup or resto
 
 ## Installing the Chart
 
-To install the chart with the release name `stash-mongodb-3.6.8`:
+To install the chart with the release name `stash-mongodb-3.6.8-beta.20200708`:
 
 ```console
-$ helm install stash-mongodb-3.6.8 appscode/stash-mongodb -n kube-system --version=3.6.8
+$ helm install stash-mongodb-3.6.8-beta.20200708 appscode/stash-mongodb -n kube-system --version=3.6.8-beta.20200708
 ```
 
 The command deploys necessary `Function` and `Task` definition to backup or restore MongoDB 3.6.8 using Stash on the Kubernetes cluster in the default configuration. The [configuration](#configuration) section lists the parameters that can be configured during installation.
@@ -32,10 +32,10 @@ The command deploys necessary `Function` and `Task` definition to backup or rest
 
 ## Uninstalling the Chart
 
-To uninstall/delete the `stash-mongodb-3.6.8`:
+To uninstall/delete the `stash-mongodb-3.6.8-beta.20200708`:
 
 ```console
-$ helm delete stash-mongodb-3.6.8 -n kube-system
+$ helm delete stash-mongodb-3.6.8-beta.20200708 -n kube-system
 ```
 
 The command removes all the Kubernetes components associated with the chart and deletes the release.
@@ -60,12 +60,12 @@ The following table lists the configurable parameters of the `stash-mongodb` cha
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example:
 
 ```console
-$ helm install stash-mongodb-3.6.8 appscode/stash-mongodb -n kube-system --version=3.6.8 --set image.registry=stashed
+$ helm install stash-mongodb-3.6.8-beta.20200708 appscode/stash-mongodb -n kube-system --version=3.6.8-beta.20200708 --set image.registry=stashed
 ```
 
 Alternatively, a YAML file that specifies the values for the parameters can be provided while
 installing the chart. For example:
 
 ```console
-$ helm install stash-mongodb-3.6.8 appscode/stash-mongodb -n kube-system --version=3.6.8 --values values.yaml
+$ helm install stash-mongodb-3.6.8-beta.20200708 appscode/stash-mongodb -n kube-system --version=3.6.8-beta.20200708 --values values.yaml
 ```

charts/stash-mongodb/doc.yaml

@@ -10,11 +10,11 @@ repository:
   name: appscode
 chart:
   name: stash-mongodb
-  version: 3.6.8
+  version: 3.6.8-beta.20200708
   values: "-- generate from values file --"
   valuesExample: "-- generate from values file --"
 prerequisites:
 - Kubernetes 1.11+
 release:
-  name: stash-mongodb-3.6.8
+  name: stash-mongodb-3.6.8-beta.20200708
   namespace: kube-system

go.mod

@@ -16,13 +16,13 @@ require (
 	k8s.io/apimachinery v0.18.3
 	k8s.io/client-go v12.0.0+incompatible
 	k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
-	kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371
+	kmodules.xyz/client-go v0.0.0-20200630053911-20d035822d35
 	kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95
 	kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9
 	kmodules.xyz/offshoot-api v0.0.0-20200521035628-e135bf07b226
 	kubedb.dev/apimachinery v0.14.0-alpha.5
 	sigs.k8s.io/yaml v1.2.0
-	stash.appscode.dev/apimachinery v0.10.0-alpha.0
+	stash.appscode.dev/apimachinery v0.10.0-beta.0
 )
 
 replace (

go.sum

@@ -1257,6 +1257,8 @@ kmodules.xyz/client-go v0.0.0-20200524205059-e986bc44c91b/go.mod h1:sY/eoe4ktxZE
 kmodules.xyz/client-go v0.0.0-20200525012433-99c6914a1eca/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
 kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371 h1:PPawDOMyDHGeDPN8j1epNozaIB/Z7MlJsXpwm/r4jgk=
 kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
+kmodules.xyz/client-go v0.0.0-20200630053911-20d035822d35 h1:gDzZWVvgAaEBzo4lxMGhPUWqySgFyFDkcqw3NskZiwQ=
+kmodules.xyz/client-go v0.0.0-20200630053911-20d035822d35/go.mod h1:sY/eoe4ktxZEoHpr5NpAQ5s22VSwTE8psJtKVeVgLRY=
 kmodules.xyz/constants v0.0.0-20200506032633-a21e58ceec72/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
 kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95 h1:v0S/+ftzL6Xrs9XevgchAOJyPKlRQXPiZf87xotj3X4=
 kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95/go.mod h1:jpu8xFsDKd6kAWUAKk8oTu/GQGBWqhrcaDeOJdaCJnk=
@@ -1305,4 +1307,6 @@ software.sslmate.com/src/go-pkcs12 v0.0.0-20180114231543-2291e8f0f237/go.mod h1:
 sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
 stash.appscode.dev/apimachinery v0.10.0-alpha.0 h1:/CBUctjDJyjo9a9lANjAPRq3Fj1KygXddgoJKdGQ0Q8=
 stash.appscode.dev/apimachinery v0.10.0-alpha.0/go.mod h1:su9Q+3/B6+5PdGvVZBIkXoAik6iKKFUcdPNThpZPVV4=
+stash.appscode.dev/apimachinery v0.10.0-beta.0 h1:gIn9ai1ipjgGImTXJseOsucv3rJmQC4/34kihUWul4g=
+stash.appscode.dev/apimachinery v0.10.0-beta.0/go.mod h1:v3rBovazmdCv/9rAA5U7LpDRFhVqcLsagnLlbPfD2Eg=
 vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=

vendor/kmodules.xyz/client-go/apiextensions/kubernetes.go

@@ -54,8 +54,8 @@ func RegisterCRDs(client crd_cs.Interface, crds []*CustomResourceDefinition) err
 				client,
 				crd.V1.Name,
 				func(in *crdv1.CustomResourceDefinition) *crdv1.CustomResourceDefinition {
-					in.Labels = meta_util.MergeKeys(in.Labels, crd.V1.Labels)
-					in.Annotations = meta_util.MergeKeys(in.Annotations, crd.V1.Annotations)
+					in.Labels = meta_util.OverwriteKeys(in.Labels, crd.V1.Labels)
+					in.Annotations = meta_util.OverwriteKeys(in.Annotations, crd.V1.Annotations)
 
 					in.Spec = crd.V1.Spec
 					return in
@@ -86,8 +86,8 @@ func RegisterCRDs(client crd_cs.Interface, crds []*CustomResourceDefinition) err
 				client,
 				crd.V1beta1.Name,
 				func(in *crdv1beta1.CustomResourceDefinition) *crdv1beta1.CustomResourceDefinition {
-					in.Labels = meta_util.MergeKeys(in.Labels, crd.V1beta1.Labels)
-					in.Annotations = meta_util.MergeKeys(in.Annotations, crd.V1beta1.Annotations)
+					in.Labels = meta_util.OverwriteKeys(in.Labels, crd.V1beta1.Labels)
+					in.Annotations = meta_util.OverwriteKeys(in.Annotations, crd.V1beta1.Annotations)
 
 					in.Spec = crd.V1beta1.Spec
 					return in

vendor/kmodules.xyz/client-go/meta/lib.go

@@ -109,12 +109,32 @@ func MergeKeys(out, in map[string]string) map[string]string {
 		out = make(map[string]string, len(in))
 	}
 
+	for k, v := range in {
+		if _, ok := out[k]; !ok {
+			out[k] = v
+		}
+	}
+	return out
+}
+
+func OverwriteKeys(out, in map[string]string) map[string]string {
+	if in == nil {
+		return out
+	}
+	if out == nil {
+		out = make(map[string]string, len(in))
+	}
+
 	for k, v := range in {
 		out[k] = v
 	}
 	return out
 }
 
+func NameWithPrefix(prefix, name string, customLength ...int) string {
+	return ValidNameWithPrefix(prefix, name, customLength...)
+}
+
 func ValidNameWithPrefix(prefix, name string, customLength ...int) string {
 	maxLength := validation.DNS1123LabelMaxLength
 	if len(customLength) != 0 {
@@ -124,6 +144,19 @@ func ValidNameWithPrefix(prefix, name string, customLength ...int) string {
 	return strings.Trim(out[:min(maxLength, len(out))], "-")
 }
 
+func NameWithSuffix(name, suffix string, customLength ...int) string {
+	maxLength := validation.DNS1123LabelMaxLength
+	if len(customLength) != 0 {
+		maxLength = customLength[0]
+	}
+	if len(suffix) >= maxLength {
+		return strings.Trim(suffix[max(0, len(suffix)-maxLength):], "-")
+	}
+	out := fmt.Sprintf("%s-%s", name[:min(len(name), maxLength-len(suffix)-1)], suffix)
+	return strings.Trim(out, "-")
+}
+
+// Deprecated: Use NameWithSuffix in new code
 func ValidNameWithSuffix(name, suffix string, customLength ...int) string {
 	maxLength := validation.DNS1123LabelMaxLength
 	if len(customLength) != 0 {
@@ -133,7 +166,7 @@ func ValidNameWithSuffix(name, suffix string, customLength ...int) string {
 	return strings.Trim(out[max(0, len(out)-maxLength):], "-")
 }
 
-func ValidNameWithPefixNSuffix(prefix, name, suffix string, customLength ...int) string {
+func ValidNameWithPrefixNSuffix(prefix, name, suffix string, customLength ...int) string {
 	maxLength := validation.DNS1123LabelMaxLength
 	if len(customLength) != 0 {
 		maxLength = customLength[0]
@@ -154,8 +187,8 @@ func ValidCronJobNameWithSuffix(name, suffix string) string {
 	return ValidNameWithSuffix(name, suffix, MaxCronJobNameLength)
 }
 
-func ValidCronJobNameWithPefixNSuffix(prefix, name, suffix string) string {
-	return ValidNameWithPefixNSuffix(prefix, name, suffix, MaxCronJobNameLength)
+func ValidCronJobNameWithPrefixNSuffix(prefix, name, suffix string) string {
+	return ValidNameWithPrefixNSuffix(prefix, name, suffix, MaxCronJobNameLength)
 }
 
 func min(x, y int) int {

vendor/modules.txt

@@ -770,7 +770,7 @@ k8s.io/utils/net
 k8s.io/utils/path
 k8s.io/utils/pointer
 k8s.io/utils/trace
-# kmodules.xyz/client-go v0.0.0-20200525195850-2fd180961371
+# kmodules.xyz/client-go v0.0.0-20200630053911-20d035822d35
 kmodules.xyz/client-go
 kmodules.xyz/client-go/api/v1
 kmodules.xyz/client-go/apiextensions
@@ -813,8 +813,7 @@ sigs.k8s.io/structured-merge-diff/v3/typed
 sigs.k8s.io/structured-merge-diff/v3/value
 # sigs.k8s.io/yaml v1.2.0
 sigs.k8s.io/yaml
-# stash.appscode.dev/apimachinery v0.10.0-alpha.0
-stash.appscode.dev/apimachinery/api/crds
+# stash.appscode.dev/apimachinery v0.10.0-beta.0
 stash.appscode.dev/apimachinery/apis
 stash.appscode.dev/apimachinery/apis/repositories
 stash.appscode.dev/apimachinery/apis/repositories/v1alpha1
@@ -831,4 +830,5 @@ stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1alpha1/
 stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1
 stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/fake
 stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util
+stash.appscode.dev/apimachinery/crds
 stash.appscode.dev/apimachinery/pkg/restic

vendor/stash.appscode.dev/apimachinery/apis/constants.go

@@ -1,5 +1,5 @@
 /*
-Copyright The Stash Authors.
+Copyright AppsCode Inc. and Contributors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

vendor/stash.appscode.dev/apimachinery/apis/invoker.go

@@ -1,5 +1,5 @@
 /*
-Copyright The Stash Authors.
+Copyright AppsCode Inc. and Contributors
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.