Skip to content

Commit

Permalink
Update Kubernetes v1.18.9 dependencies (#79)
Browse files Browse the repository at this point in the history
/cherry-pick

Signed-off-by: 1gtm <1gtm@appscode.com>
  • Loading branch information
1gtm authored Nov 29, 2020
1 parent 67ec7d1 commit 37c7d87
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 12 deletions.
1 change: 1 addition & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ require (
k8s.io/component-base v0.18.9
k8s.io/kubectl v0.18.9
kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8
kmodules.xyz/custom-resources v0.0.0-20201124062543-bd8d35c21b0c // indirect
kmodules.xyz/objectstore-api v0.0.0-20201105133858-cbb2af88d50a
kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2
kmodules.xyz/openshift v0.0.0-20201105073146-0da509a7d39f
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1087,6 +1087,8 @@ kmodules.xyz/constants v0.0.0-20200923054614-6b87dbbae4d6/go.mod h1:DbiFk1bJ1KEO
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=
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,6 @@ spec:
type: string
required:
- key
- stringValue
- value
type: object
addKeysFrom:
description: AddKeysFrom represents a transform that merges
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,6 @@ spec:
type: string
required:
- key
- stringValue
- value
type: object
addKeysFrom:
description: AddKeysFrom represents a transform that merges all
Expand Down
8 changes: 4 additions & 4 deletions vendor/kmodules.xyz/custom-resources/crds/bindata.go

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,7 @@ kmodules.xyz/client-go/tools/clientcmd
kmodules.xyz/client-go/tools/clusterid
kmodules.xyz/client-go/tools/exec
kmodules.xyz/client-go/tools/pushgateway
# 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
Expand Down

0 comments on commit 37c7d87

Please sign in to comment.