trying a fix for self-hosted agent

This commit is contained in:
Atharva Mulmuley
2021-04-29 13:44:22 +05:30
parent ba9acf943c
commit d621ae1ce7
2 changed files with 5 additions and 2 deletions

View File

@ -15,6 +15,7 @@ const querystring = require("querystring");
const az_login = require("./main");
const path = require("path");
const child_process_1 = require("child_process");
const fs = require("fs");
function getAzureAccessToken(servicePrincipalId, servicePrincipalKey, tenantId, authorityUrl, managementEndpointUrl) {
return __awaiter(this, void 0, void 0, function* () {
if (!servicePrincipalId || !servicePrincipalKey || !tenantId || !authorityUrl) {
@ -71,6 +72,7 @@ function getArcKubeconfig() {
yield az_login.executeAzCliCommand(`account show`, false);
yield az_login.executeAzCliCommand(`extension add -n connectedk8s`, false);
yield az_login.executeAzCliCommand(`extension list`, false);
yield az_login.executeAzCliCommand(`connectedk8s --help`, false);
const runnerTempDirectory = process.env['RUNNER_TEMP']; // Using process.env until the core libs are updated
const kubeconfigPath = path.join(runnerTempDirectory, `kubeconfig_${Date.now()}`);
if (method == 'service-account') {
@ -93,7 +95,7 @@ function getArcKubeconfig() {
}
console.log('Waiting for 2 minutes for kubeconfig to be merged....');
yield sleep(120000); //sleeping for 2 minutes to allow kubeconfig to be merged
//fs.chmodSync(kubeconfigPath, '600');
fs.chmodSync(kubeconfigPath, '600');
core.exportVariable('KUBECONFIG', kubeconfigPath);
console.log('KUBECONFIG environment variable is set');
}

View File

@ -68,6 +68,7 @@ export async function getArcKubeconfig(): Promise<string> {
await az_login.executeAzCliCommand(`account show`, false);
await az_login.executeAzCliCommand(`extension add -n connectedk8s`, false);
await az_login.executeAzCliCommand(`extension list`, false);
await az_login.executeAzCliCommand(`connectedk8s --help`, false);
const runnerTempDirectory = process.env['RUNNER_TEMP']; // Using process.env until the core libs are updated
const kubeconfigPath = path.join(runnerTempDirectory, `kubeconfig_${Date.now()}`);
if (method == 'service-account'){
@ -89,7 +90,7 @@ export async function getArcKubeconfig(): Promise<string> {
}
console.log('Waiting for 2 minutes for kubeconfig to be merged....')
await sleep(120000) //sleeping for 2 minutes to allow kubeconfig to be merged
//fs.chmodSync(kubeconfigPath, '600');
fs.chmodSync(kubeconfigPath, '600');
core.exportVariable('KUBECONFIG', kubeconfigPath);
console.log('KUBECONFIG environment variable is set');
} catch (ex) {