File tree Expand file tree Collapse file tree 4 files changed +6
-7
lines changed
kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1 Expand file tree Collapse file tree 4 files changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -17,6 +17,7 @@ require (
17
17
k8s.io/component-base v0.18.9
18
18
k8s.io/kubectl v0.18.9
19
19
kmodules.xyz/client-go v0.0.0-20201007024140-3223988adf40
20
+ kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4 // indirect
20
21
kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41
21
22
kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab
22
23
kmodules.xyz/openshift v0.0.0-20200922211657-1ece16d36c18
Original file line number Diff line number Diff line change @@ -977,6 +977,8 @@ kmodules.xyz/constants v0.0.0-20200506032633-a21e58ceec72/go.mod h1:DbiFk1bJ1KEO
977
977
kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 /go.mod h1:WrO3fryNyFCgqqyWnwI89lnzWA7kN072Ehya7ELGfzE =
978
978
kmodules.xyz/custom-resources v0.0.0-20200922210108-70f2815a43bb h1:SwMPMh6A196yoe8kAH+guTNS8rsTfB2dRbFNh6g0Znk =
979
979
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 =
980
982
kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41 h1:BsCSSPoY0uRGylfPTUzzQ28h2axuXremPGPzwpmxvYI =
981
983
kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41 /go.mod h1:XAWxC/b1ICoufU6XDV0AOHNQY+y+4/B3Z5uyLnW1B6s =
982
984
kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab h1:d/4AFAN0TfKgwhjbQYzwXXHT/5/vTP7SAAvS4uJX+wQ =
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 @@ -560,7 +560,7 @@ kmodules.xyz/client-go/tools/clientcmd
560
560
kmodules.xyz/client-go/tools/clusterid
561
561
kmodules.xyz/client-go/tools/exec
562
562
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
564
564
kmodules.xyz/custom-resources/apis/appcatalog
565
565
kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1
566
566
kmodules.xyz/custom-resources/client/clientset/versioned
You can’t perform that action at this time.
0 commit comments