Skip to content

Commit 0037eb7

Browse files
authored
Update Kubernetes v1.18.9 dependencies (#58)
/cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com>
1 parent f94e368 commit 0037eb7

File tree

4 files changed

+6
-7
lines changed

4 files changed

+6
-7
lines changed

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ require (
1717
k8s.io/component-base v0.18.9
1818
k8s.io/kubectl v0.18.9
1919
kmodules.xyz/client-go v0.0.0-20201007024140-3223988adf40
20+
kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4 // indirect
2021
kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41
2122
kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab
2223
kmodules.xyz/openshift v0.0.0-20200922211657-1ece16d36c18

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -977,6 +977,8 @@ kmodules.xyz/constants v0.0.0-20200506032633-a21e58ceec72/go.mod h1:DbiFk1bJ1KEO
977977
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4/go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE=
978978
kmodules.xyz/custom-resources v0.0.0-20200922210108-70f2815a43bb h1:SwMPMh6A196yoe8kAH+guTNS8rsTfB2dRbFNh6g0Znk=
979979
kmodules.xyz/custom-resources v0.0.0-20200922210108-70f2815a43bb/go.mod h1:+YU32jSWaGGE4etTr/iCF88tLAeDNq1lhptVymjUbjg=
980+
kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4 h1:eftT0CrrAYK1uniwsVhheYao4mwGk+eFT9eftRX9BMo=
981+
kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4/go.mod h1:+YU32jSWaGGE4etTr/iCF88tLAeDNq1lhptVymjUbjg=
980982
kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41 h1:BsCSSPoY0uRGylfPTUzzQ28h2axuXremPGPzwpmxvYI=
981983
kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41/go.mod h1:XAWxC/b1ICoufU6XDV0AOHNQY+y+4/B3Z5uyLnW1B6s=
982984
kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab h1:d/4AFAN0TfKgwhjbQYzwXXHT/5/vTP7SAAvS4uJX+wQ=

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
@@ -560,7 +560,7 @@ kmodules.xyz/client-go/tools/clientcmd
560560
kmodules.xyz/client-go/tools/clusterid
561561
kmodules.xyz/client-go/tools/exec
562562
kmodules.xyz/client-go/tools/pushgateway
563-
# kmodules.xyz/custom-resources v0.0.0-20200922210108-70f2815a43bb
563+
# kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4
564564
kmodules.xyz/custom-resources/apis/appcatalog
565565
kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1
566566
kmodules.xyz/custom-resources/client/clientset/versioned

0 commit comments

Comments
 (0)