File tree Expand file tree Collapse file tree 4 files changed +6
-10
lines changed
kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1 Expand file tree Collapse file tree 4 files changed +6
-10
lines changed Original file line number Diff line number Diff line change @@ -21,7 +21,7 @@ require (
21
21
k8s.io/kubernetes v1.18.9 // indirect
22
22
kmodules.xyz/client-go v0.0.0-20201007024140-3223988adf40
23
23
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
25
25
kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41 // indirect
26
26
kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab
27
27
kmodules.xyz/prober v0.0.0-20200922212142-743a6514664e // indirect
Original file line number Diff line number Diff line change @@ -1316,8 +1316,8 @@ kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 h1:NWWv+Qju8xzHZ
1316
1316
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 /go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE =
1317
1317
kmodules.xyz/custom-resources v0.0.0-20200604135349-9e9f5c4fdba9 h1:W+k1qhU0W1rptia2PWPOb7IWUvWnf31EMnatXt7MW6w =
1318
1318
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 =
1321
1321
kmodules.xyz/monitoring-agent-api v0.0.0-20200828051750-42aa8e7852f3 /go.mod h1:ybC7USLPa1dCpNeiJBuoJ5TMucpFUklnj+Dhq/sSky0 =
1322
1322
kmodules.xyz/objectstore-api v0.0.0-20200521103120-92080446e04d h1:ud3XDScnBdD5q6nLQI/tHLSbuuSwIFaav6IhcQAz2qA =
1323
1323
kmodules.xyz/objectstore-api v0.0.0-20200521103120-92080446e04d /go.mod h1:k6sbzLWYBLRGDNmCj/NwLgj1cniRXCl9ux/P6+7Xd+A =
Original file line number Diff line number Diff line change @@ -27,6 +27,7 @@ import (
27
27
"kmodules.xyz/client-go/apiextensions"
28
28
"kmodules.xyz/custom-resources/crds"
29
29
30
+ core "k8s.io/api/core/v1"
30
31
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
31
32
"k8s.io/client-go/kubernetes"
32
33
)
@@ -51,17 +52,12 @@ func (a AppBinding) URL() (string, error) {
51
52
return "" , errors .New ("connection url is missing" )
52
53
}
53
54
54
- const (
55
- KeyUsername = "username"
56
- KeyPassword = "password"
57
- )
58
-
59
55
func (a AppBinding ) URLTemplate () (string , error ) {
60
56
rawurl , err := a .URL ()
61
57
if err != nil {
62
58
return "" , err
63
59
}
64
- auth := fmt .Sprintf ("{{%s}}:{{%s}}@" , KeyUsername , KeyPassword )
60
+ auth := fmt .Sprintf ("{{%s}}:{{%s}}@" , core . BasicAuthUsernameKey , core . BasicAuthPasswordKey )
65
61
66
62
i := strings .Index (rawurl , "://" )
67
63
if i < 0 {
Original file line number Diff line number Diff line change @@ -860,7 +860,7 @@ kmodules.xyz/client-go/tools/cli
860
860
kmodules.xyz/client-go/tools/clusterid
861
861
# kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4
862
862
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
864
864
kmodules.xyz/custom-resources/apis/appcatalog
865
865
kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1
866
866
kmodules.xyz/custom-resources/client/clientset/versioned
You can’t perform that action at this time.
0 commit comments