Skip to content

Commit 6a98325

Browse files
authored
[cherry-pick] Update Kubernetes v1.18.9 dependencies (#399) (#408)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent 0dbf712 commit 6a98325

File tree

4 files changed

+6
-10
lines changed

4 files changed

+6
-10
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
k8s.io/kubernetes v1.18.9 // indirect
2222
kmodules.xyz/client-go v0.0.0-20201007024140-3223988adf40
2323
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4
24-
kmodules.xyz/custom-resources v0.0.0-20200922210108-70f2815a43bb
24+
kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4
2525
kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41 // indirect
2626
kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab
2727
kmodules.xyz/prober v0.0.0-20200922212142-743a6514664e // indirect

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,8 +1316,8 @@ kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 h1:NWWv+Qju8xzHZ
13161316
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4/go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE=
13171317
kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9 h1:W+k1qhU0W1rptia2PWPOb7IWUvWnf31EMnatXt7MW6w=
13181318
kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9/go.mod h1:bu1V7HdnuHc1hgvbqAdcwTViQ0TfZwF3Nu/SjB4vai4=
1319-
kmodules.xyz/custom-resources v0.0.0-20200922210108-70f2815a43bb h1:SwMPMh6A196yoe8kAH+guTNS8rsTfB2dRbFNh6g0Znk=
1320-
kmodules.xyz/custom-resources v0.0.0-20200922210108-70f2815a43bb/go.mod h1:+YU32jSWaGGE4etTr/iCF88tLAeDNq1lhptVymjUbjg=
1319+
kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4 h1:eftT0CrrAYK1uniwsVhheYao4mwGk+eFT9eftRX9BMo=
1320+
kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4/go.mod h1:+YU32jSWaGGE4etTr/iCF88tLAeDNq1lhptVymjUbjg=
13211321
kmodules.xyz/monitoring-agent-api v0.0.0-20200828051750-42aa8e7852f3/go.mod h1:ybC7USLPa1dCpNeiJBuoJ5TMucpFUklnj+Dhq/sSky0=
13221322
kmodules.xyz/objectstore-api v0.0.0-20200521103120-92080446e04d h1:ud3XDScnBdD5q6nLQI/tHLSbuuSwIFaav6IhcQAz2qA=
13231323
kmodules.xyz/objectstore-api v0.0.0-20200521103120-92080446e04d/go.mod h1:k6sbzLWYBLRGDNmCj/NwLgj1cniRXCl9ux/P6+7Xd+A=

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"kmodules.xyz/client-go/apiextensions"
2828
"kmodules.xyz/custom-resources/crds"
2929

30+
core "k8s.io/api/core/v1"
3031
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3132
"k8s.io/client-go/kubernetes"
3233
)
@@ -51,17 +52,12 @@ func (a AppBinding) URL() (string, error) {
5152
return "", errors.New("connection url is missing")
5253
}
5354

54-
const (
55-
KeyUsername = "username"
56-
KeyPassword = "password"
57-
)
58-
5955
func (a AppBinding) URLTemplate() (string, error) {
6056
rawurl, err := a.URL()
6157
if err != nil {
6258
return "", err
6359
}
64-
auth := fmt.Sprintf("{{%s}}:{{%s}}@", KeyUsername, KeyPassword)
60+
auth := fmt.Sprintf("{{%s}}:{{%s}}@", core.BasicAuthUsernameKey, core.BasicAuthPasswordKey)
6561

6662
i := strings.Index(rawurl, "://")
6763
if i < 0 {

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,7 +860,7 @@ kmodules.xyz/client-go/tools/cli
860860
kmodules.xyz/client-go/tools/clusterid
861861
# kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4
862862
kmodules.xyz/crd-schema-fuzz
863-
# kmodules.xyz/custom-resources v0.0.0-20200922210108-70f2815a43bb
863+
# kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4
864864
kmodules.xyz/custom-resources/apis/appcatalog
865865
kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1
866866
kmodules.xyz/custom-resources/client/clientset/versioned

0 commit comments

Comments
 (0)