@@ -29,9 +29,7 @@ func init() {
29
29
}
30
30
31
31
func create (cli * cli.Context ) {
32
- pathToKubeConfig := cli .String ("config" )
33
- jwt := cli .String ("token" )
34
- cnf := clientcmd .GetConfigFromFileOrDie (pathToKubeConfig )
32
+ cnf := clientcmd .GetConfigFromFileOrDie (kubeConfigPath )
35
33
c := * cnf
36
34
override := clientcmd.ConfigOverrides {
37
35
ClusterInfo : api.Cluster {
@@ -80,7 +78,7 @@ func create(cli *cli.Context) {
80
78
fmt .Println ("Found secret" )
81
79
82
80
fmt .Println ("Creating cluster in Codefresh" )
83
- body , e := addCluser (clientCnf .Host , contextName , secret .Data ["token" ], secret .Data ["ca.crt" ], jwt )
81
+ body , e := addCluser (clientCnf .Host , contextName , secret .Data ["token" ], secret .Data ["ca.crt" ])
84
82
if e != nil {
85
83
fmt .Println ("Error!!" )
86
84
fmt .Println (e )
@@ -93,7 +91,7 @@ func create(cli *cli.Context) {
93
91
}
94
92
}
95
93
96
- func addCluser (host string , contextName string , token []byte , crt []byte , jwt string ) ([]byte , error ) {
94
+ func addCluser (host string , contextName string , token []byte , crt []byte ) ([]byte , error ) {
97
95
url := baseCodefreshURL + "api/clusters/local/cluster"
98
96
payload := & requestPayload {
99
97
Type : "sat" ,
@@ -105,15 +103,15 @@ func addCluser(host string, contextName string, token []byte, crt []byte, jwt st
105
103
}
106
104
mar , _ := json .Marshal (payload )
107
105
p := strings .NewReader (string (mar ))
108
- err := testConnection (payload , jwt )
106
+ err := testConnection (payload )
109
107
if err != nil {
110
108
return nil , err
111
109
}
112
110
req , err := http .NewRequest ("POST" , url , p )
113
111
if err != nil {
114
112
return nil , err
115
113
}
116
- req .Header .Add ("X-Access-Token" , jwt )
114
+ req .Header .Add ("X-Access-Token" , codefreshJwt )
117
115
req .Header .Add ("content-type" , "application/json" )
118
116
res , err := http .DefaultClient .Do (req )
119
117
if err != nil {
@@ -127,15 +125,15 @@ func addCluser(host string, contextName string, token []byte, crt []byte, jwt st
127
125
return body , nil
128
126
}
129
127
130
- func testConnection (payload * requestPayload , jwt string ) error {
128
+ func testConnection (payload * requestPayload ) error {
131
129
url := baseCodefreshURL + "api/kubernetes/test"
132
130
mar , _ := json .Marshal (payload )
133
131
p := strings .NewReader (string (mar ))
134
132
req , err := http .NewRequest ("POST" , url , p )
135
133
if err != nil {
136
134
return err
137
135
}
138
- req .Header .Add ("X-Access-Token" , jwt )
136
+ req .Header .Add ("X-Access-Token" , codefreshJwt )
139
137
req .Header .Add ("content-type" , "application/json" )
140
138
res , err := http .DefaultClient .Do (req )
141
139
if err != nil {
0 commit comments