add back standard storage class name
parent
33356263db
commit
ff449d4da0
|
|
@ -2371,7 +2371,6 @@ const async_wait_until_1 = __importDefault(__webpack_require__(41299));
|
|||
const core = __importStar(__webpack_require__(42186));
|
||||
const k8s = __importStar(__webpack_require__(89679));
|
||||
const cloud_runner_logger_1 = __importDefault(__webpack_require__(22855));
|
||||
const yaml_1 = __importDefault(__webpack_require__(13552));
|
||||
class KubernetesStorage {
|
||||
static createPersistentVolumeClaim(buildParameters, pvcName, kubeClient, namespace) {
|
||||
return __awaiter(this, void 0, void 0, function* () {
|
||||
|
|
@ -2420,7 +2419,7 @@ class KubernetesStorage {
|
|||
}
|
||||
catch (error) {
|
||||
core.error('Failed to watch PVC');
|
||||
core.error(error.toString());
|
||||
core.error(error);
|
||||
core.error(`PVC Body: ${JSON.stringify((yield kubeClient.readNamespacedPersistentVolumeClaim(name, namespace)).body, undefined, 4)}`);
|
||||
throw error;
|
||||
}
|
||||
|
|
@ -2436,15 +2435,13 @@ class KubernetesStorage {
|
|||
};
|
||||
pvc.spec = {
|
||||
accessModes: ['ReadWriteOnce'],
|
||||
storageClassName: process.env.K8s_STORAGE_CLASS || 'standard',
|
||||
resources: {
|
||||
requests: {
|
||||
storage: buildParameters.kubeVolumeSize,
|
||||
},
|
||||
},
|
||||
};
|
||||
if (process.env.K8S_PVC_SPEC) {
|
||||
pvc.spec = yaml_1.default.parse(process.env.K8S_PVC_SPEC);
|
||||
}
|
||||
const result = yield kubeClient.createNamespacedPersistentVolumeClaim(namespace, pvc);
|
||||
return result;
|
||||
});
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -3,7 +3,6 @@ import * as core from '@actions/core';
|
|||
import * as k8s from '@kubernetes/client-node';
|
||||
import BuildParameters from '../../build-parameters';
|
||||
import CloudRunnerLogger from '../services/cloud-runner-logger';
|
||||
import YAML from 'yaml';
|
||||
|
||||
class KubernetesStorage {
|
||||
public static async createPersistentVolumeClaim(
|
||||
|
|
@ -55,9 +54,9 @@ class KubernetesStorage {
|
|||
intervalBetweenAttempts: 15000,
|
||||
},
|
||||
);
|
||||
} catch (error: any) {
|
||||
} catch (error) {
|
||||
core.error('Failed to watch PVC');
|
||||
core.error(error.toString());
|
||||
core.error(error);
|
||||
core.error(
|
||||
`PVC Body: ${JSON.stringify(
|
||||
(await kubeClient.readNamespacedPersistentVolumeClaim(name, namespace)).body,
|
||||
|
|
@ -83,15 +82,13 @@ class KubernetesStorage {
|
|||
};
|
||||
pvc.spec = {
|
||||
accessModes: ['ReadWriteOnce'],
|
||||
storageClassName: process.env.K8s_STORAGE_CLASS || 'standard',
|
||||
resources: {
|
||||
requests: {
|
||||
storage: buildParameters.kubeVolumeSize,
|
||||
},
|
||||
},
|
||||
};
|
||||
if (process.env.K8S_PVC_SPEC) {
|
||||
pvc.spec = YAML.parse(process.env.K8S_PVC_SPEC);
|
||||
}
|
||||
const result = await kubeClient.createNamespacedPersistentVolumeClaim(namespace, pvc);
|
||||
return result;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue