@@ -1175,24 +1175,17 @@ export class Cluster extends OpenShiftItem implements Disposable {
1175
1175
1176
1176
static prepareSSOInKubeConfig ( proxy : string , username : string , accessToken : string ) : KubeConfig {
1177
1177
const kcu = new KubeConfig ( ) ;
1178
- const clusterProxy = {
1179
- name : 'sandbox-proxy' ,
1180
- server : proxy ,
1181
- } ;
1182
- const user = {
1183
- name : 'sso-user' ,
1184
- token : accessToken ,
1185
- } ;
1186
- const context = {
1187
- cluster : clusterProxy . name ,
1188
- name : 'sandbox-proxy-context' ,
1189
- user : user . name ,
1190
- namespace : `${ username } -dev` ,
1191
- } ;
1192
- kcu . addCluster ( clusterProxy ) ;
1193
- kcu . addUser ( user )
1194
- kcu . addContext ( context ) ;
1195
- kcu . setCurrentContext ( context . name ) ;
1178
+ kcu . loadFromOptions ( {
1179
+ clusters : [ { name : 'sandbox-proxy' , server : proxy , skipTLSVerify : false } ] ,
1180
+ users : [ { name : 'sso-user' , token : accessToken } ] ,
1181
+ contexts : [ {
1182
+ name : 'sandbox-proxy-context' ,
1183
+ cluster : 'sandbox-proxy' ,
1184
+ user : 'sso-user' ,
1185
+ namespace : `${ username } -dev` ,
1186
+ } ] ,
1187
+ currentContext : 'sandbox-proxy-context' ,
1188
+ } ) ;
1196
1189
return kcu ;
1197
1190
}
1198
1191
@@ -1211,24 +1204,24 @@ export class Cluster extends OpenShiftItem implements Disposable {
1211
1204
} as V1Secret
1212
1205
1213
1206
try {
1214
- await k8sApi . createNamespacedSecret ( `${ username } -dev` , v1Secret ) ;
1207
+ await k8sApi . createNamespacedSecret ( { namespace : `${ username } -dev` , body : v1Secret } ) ;
1215
1208
} catch {
1216
1209
// Ignore
1217
1210
}
1218
- const newSecrets = await k8sApi . listNamespacedSecret ( `${ username } -dev` ) ;
1219
- return newSecrets ?. body . items . find ( ( secret ) => secret . metadata . name === `pipeline-secret-${ username } -dev` ) ;
1211
+ const newSecrets = await k8sApi . listNamespacedSecret ( { namespace : `${ username } -dev` } ) ;
1212
+ return newSecrets ?. items . find ( ( secret ) => secret . metadata . name === `pipeline-secret-${ username } -dev` ) ;
1220
1213
}
1221
1214
1222
1215
static async getPipelineServiceAccountToken ( k8sApi : CoreV1Api , username : string ) : Promise < string > {
1223
1216
try {
1224
- const serviceAccounts = await k8sApi . listNamespacedServiceAccount ( `${ username } -dev` ) ;
1225
- const pipelineServiceAccount = serviceAccounts . body . items . find ( serviceAccount => serviceAccount . metadata . name === 'pipeline' ) ;
1217
+ const serviceAccounts = await k8sApi . listNamespacedServiceAccount ( { namespace : `${ username } -dev` } ) ;
1218
+ const pipelineServiceAccount = serviceAccounts . items . find ( serviceAccount => serviceAccount . metadata . name === 'pipeline' ) ;
1226
1219
if ( ! pipelineServiceAccount ) {
1227
1220
return ;
1228
1221
}
1229
1222
1230
- const secrets = await k8sApi . listNamespacedSecret ( `${ username } -dev` ) ;
1231
- let pipelineTokenSecret = secrets ?. body . items . find ( ( secret ) => secret . metadata . name === `pipeline-secret-${ username } -dev` ) ;
1223
+ const secrets = await k8sApi . listNamespacedSecret ( { namespace : `${ username } -dev` } ) ;
1224
+ let pipelineTokenSecret = secrets ?. items . find ( ( secret ) => secret . metadata . name === `pipeline-secret-${ username } -dev` ) ;
1232
1225
if ( ! pipelineTokenSecret ) {
1233
1226
pipelineTokenSecret = await Cluster . installPipelineSecretToken ( k8sApi , pipelineServiceAccount , username ) ;
1234
1227
if ( ! pipelineTokenSecret ) {
0 commit comments