Skip to content

Commit de0721c

Browse files
authored
[cherry-pick] Update Kubernetes v1.18.9 dependencies (#235) (#238)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 6dd1480 commit de0721c

File tree

9 files changed

+15
-13
lines changed

9 files changed

+15
-13
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6
2121
kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8
2222
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4
23-
kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79
23+
kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c
2424
kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2
2525
sigs.k8s.io/yaml v1.2.0
2626
stash.appscode.dev/apimachinery v0.11.6

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -968,6 +968,8 @@ kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 h1:NWWv+Qju8xzHZ
968968
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4/go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE=
969969
kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79 h1:BKPPUY/w0ac4R6g172zrejs+MLae2CHGqHCFpzrbRLc=
970970
kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79/go.mod h1:/r3/eJ3LIfwGyBEVaobqUZRZGh7GJv5RJojj/bdD14Q=
971+
kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c h1:OIAnTI2yik4i1DSe23kO+89RMw/Eu6WUG/IQ++ivYNo=
972+
kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c/go.mod h1:/r3/eJ3LIfwGyBEVaobqUZRZGh7GJv5RJojj/bdD14Q=
971973
kmodules.xyz/objectstore-api v0.0.0-20201105133858-cbb2af88d50a h1:FJ8Fwn+BCalLuzkhjmyDf7Fuh19LBIEf/Fx/+xaYDB0=
972974
kmodules.xyz/objectstore-api v0.0.0-20201105133858-cbb2af88d50a/go.mod h1:87wP8pKn5ICyQcbK+w+4Jlx5JQy/+mkDGj7T/Qnfrpk=
973975
kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2 h1:JVuNeHhVq/iRRM2yRF7nuYUdq1necfAPGpA5JjUcBuk=

vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/appbinding_types.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,11 @@ type AddKeyTransform struct {
259259
Key string `json:"key" protobuf:"bytes,1,opt,name=key"`
260260
// The binary value (possibly non-string) to add to the Secret under the specified key. If both
261261
// value and stringValue are specified, then value is ignored and stringValue is stored.
262-
Value []byte `json:"value" protobuf:"bytes,2,opt,name=value"`
262+
// +optional
263+
Value []byte `json:"value,omitempty" protobuf:"bytes,2,opt,name=value"`
263264
// The string (non-binary) value to add to the Secret under the specified key.
264-
StringValue *string `json:"stringValue" protobuf:"bytes,3,opt,name=stringValue"`
265+
// +optional
266+
StringValue *string `json:"stringValue,omitempty" protobuf:"bytes,3,opt,name=stringValue"`
265267
}
266268

267269
// AddKeysFromTransform specifies that Service Catalog should merge

vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/generated.proto

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1/openapi_generated.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/kmodules.xyz/custom-resources/crds/appcatalog.appscode.com_appbindings.v1.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,6 @@ spec:
166166
type: string
167167
required:
168168
- key
169-
- stringValue
170-
- value
171169
type: object
172170
addKeysFrom:
173171
description: AddKeysFrom represents a transform that merges

vendor/kmodules.xyz/custom-resources/crds/appcatalog.appscode.com_appbindings.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,6 @@ spec:
163163
type: string
164164
required:
165165
- key
166-
- stringValue
167-
- value
168166
type: object
169167
addKeysFrom:
170168
description: AddKeysFrom represents a transform that merges all

vendor/kmodules.xyz/custom-resources/crds/bindata.go

Lines changed: 4 additions & 4 deletions
Large diffs are not rendered by default.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ kmodules.xyz/client-go/tools/cli
861861
kmodules.xyz/client-go/tools/clusterid
862862
# kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4
863863
kmodules.xyz/crd-schema-fuzz
864-
# kmodules.xyz/custom-resources v0.0.0-20201105075444-3c6af51b4f79
864+
# kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c
865865
kmodules.xyz/custom-resources/apis/appcatalog
866866
kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1
867867
kmodules.xyz/custom-resources/client/clientset/versioned

0 commit comments

Comments
 (0)