[cherry-pick] Update Kubernetes v1.18.9 dependencies (#480) (#487)

/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
stashed · Nov 25, 2020 · cfb5023 · cfb5023
1 parent 551eb3b
commit cfb5023
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 13 deletions.
diff --git a/go.mod b/go.mod
@@ -19,7 +19,7 @@ require (
 	k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
 	kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8
 	kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4
-	kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79
+	kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c
 	kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2
 	sigs.k8s.io/yaml v1.2.0
 	stash.appscode.dev/apimachinery v0.11.6

diff --git a/go.sum b/go.sum
@@ -978,6 +978,8 @@ kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 h1:NWWv+Qju8xzHZ
 kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4/go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE=
 kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79 h1:BKPPUY/w0ac4R6g172zrejs+MLae2CHGqHCFpzrbRLc=
 kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79/go.mod h1:/r3/eJ3LIfwGyBEVaobqUZRZGh7GJv5RJojj/bdD14Q=
+kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c h1:OIAnTI2yik4i1DSe23kO+89RMw/Eu6WUG/IQ++ivYNo=
+kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c/go.mod h1:/r3/eJ3LIfwGyBEVaobqUZRZGh7GJv5RJojj/bdD14Q=
 kmodules.xyz/objectstore-api v0.0.0-20201105133858-cbb2af88d50a h1:FJ8Fwn+BCalLuzkhjmyDf7Fuh19LBIEf/Fx/+xaYDB0=
 kmodules.xyz/objectstore-api v0.0.0-20201105133858-cbb2af88d50a/go.mod h1:87wP8pKn5ICyQcbK+w+4Jlx5JQy/+mkDGj7T/Qnfrpk=
 kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2 h1:JVuNeHhVq/iRRM2yRF7nuYUdq1necfAPGpA5JjUcBuk=

diff --git a/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/appbinding_types.go b/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/appbinding_types.go
@@ -259,9 +259,11 @@ type AddKeyTransform struct {
 	Key string `json:"key" protobuf:"bytes,1,opt,name=key"`
 	// The binary value (possibly non-string) to add to the Secret under the specified key. If both
 	// value and stringValue are specified, then value is ignored and stringValue is stored.
-	Value []byte `json:"value" protobuf:"bytes,2,opt,name=value"`
+	// +optional
+	Value []byte `json:"value,omitempty" protobuf:"bytes,2,opt,name=value"`
 	// The string (non-binary) value to add to the Secret under the specified key.
-	StringValue *string `json:"stringValue" protobuf:"bytes,3,opt,name=stringValue"`
+	// +optional
+	StringValue *string `json:"stringValue,omitempty" protobuf:"bytes,3,opt,name=stringValue"`
 }
 
 // AddKeysFromTransform specifies that Service Catalog should merge

diff --git a/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/generated.proto b/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/generated.proto
diff --git a/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/openapi_generated.go
diff --git a/vendor/kmodules.xyz/custom-resources/crds/appcatalog.appscode.com_appbindings.v1.yaml b/vendor/kmodules.xyz/custom-resources/crds/appcatalog.appscode.com_appbindings.v1.yaml
@@ -166,8 +166,6 @@ spec:
                           type: string
                       required:
                       - key
-                      - stringValue
-                      - value
                       type: object
                     addKeysFrom:
                       description: AddKeysFrom represents a transform that merges

diff --git a/vendor/kmodules.xyz/custom-resources/crds/appcatalog.appscode.com_appbindings.yaml b/vendor/kmodules.xyz/custom-resources/crds/appcatalog.appscode.com_appbindings.yaml
@@ -163,8 +163,6 @@ spec:
                         type: string
                     required:
                     - key
-                    - stringValue
-                    - value
                     type: object
                   addKeysFrom:
                     description: AddKeysFrom represents a transform that merges all

diff --git a/vendor/kmodules.xyz/custom-resources/crds/bindata.go b/vendor/kmodules.xyz/custom-resources/crds/bindata.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -861,7 +861,7 @@ kmodules.xyz/client-go/tools/cli
 kmodules.xyz/client-go/tools/clusterid
 # kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4
 kmodules.xyz/crd-schema-fuzz
-# kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79
+# kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c
 kmodules.xyz/custom-resources/apis/appcatalog
 kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1
 kmodules.xyz/custom-resources/client/clientset/versioned