Skip to content

Commit 2a4b8b1

Browse files
authored
Merge pull request #29 from Latrodect/feature/k8s_best_practice_apply
Bug fix for jobs folder generation
2 parents aaca97d + 7123456 commit 2a4b8b1

File tree

5 files changed

+33
-30
lines changed

5 files changed

+33
-30
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@
1010
- Jobs generation added for k8s.
1111
- k8s Folder structure change.
1212

13-
[1.3.0]: https://github.com/Latrodect/Backdoor-VSCode-Extension-for-K8S-Setup-and-Code-Review/releases/tag/v1.2.0
13+
[1.3.1]: https://github.com/Latrodect/Backdoor-VSCode-Extension-for-K8S-Setup-and-Code-Review/releases/tag/v1.3.1

out/commands/generateKubernetesFiles.js

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

out/commands/generateKubernetesFiles.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "K8S and Docker Structure generator. Online code reviewer.",
55
"publisher": "Pilliage",
66
"icon": "images/backdoor.png",
7-
"version": "1.3.0",
7+
"version": "1.3.1",
88
"repository": {
99
"type": "git",
1010
"url": "https://github.com/Latrodect/Backdoor-VSCode-Extension-for-K8S-Setup-and-Code-Review"

src/commands/generateKubernetesFiles.ts

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,7 @@ export async function generateKubernetesFiles() {
4545
vscode.window.showInformationMessage('Jobs Folder not created.');
4646

4747
}
48-
let jobNames: string[] = []
49-
if(jobsInput){
50-
jobNames = checkSpacesAndReplace(jobsInput.split(',').map(name => name.trim()));
51-
}
48+
5249

5350
// Folder Generation
5451
const kubernetesFolder = vscode.Uri.joinPath(vscode.workspace.workspaceFolders[0].uri, 'kubernetes');
@@ -65,8 +62,7 @@ export async function generateKubernetesFiles() {
6562
const secretsFolder = vscode.Uri.joinPath(kubernetesFolder, 'secrets');
6663
fs.mkdirSync(secretsFolder.fsPath, { recursive: true });
6764

68-
const jobsFolder = vscode.Uri.joinPath(kubernetesFolder, 'jobs');
69-
fs.mkdirSync(jobsFolder.fsPath, { recursive: true });
65+
7066

7167
// Deployment Yaml fs operations
7268
const namespaceYAML = `
@@ -170,29 +166,36 @@ data:
170166
vscode.window.showInformationMessage(`${deploymentNames.length} deployment, service, and ingress files generated successfully.`);
171167

172168
// Jobs Yaml fs operations
173-
const jobPromises = jobNames.map(async jobNames => {})
174-
const jobYAML = `
169+
if(jobsInput){
170+
const jobsFolder = vscode.Uri.joinPath(kubernetesFolder, 'jobs');
171+
fs.mkdirSync(jobsFolder.fsPath, { recursive: true });
172+
173+
const jobNames = checkSpacesAndReplace(jobsInput.split(',').map(name => name.trim()));
174+
175+
const jobPromises = jobNames.map(async jobName => {
176+
const jobYAML = `
175177
apiVersion: batch/v1
176178
kind: Job
177179
metadata:
178-
name: ${jobNames}
180+
name: ${jobName}
179181
spec:
180182
completions: 1
181183
template:
182184
metadata:
183-
name: ${jobNames}-pod
185+
name: ${jobName}-pod
184186
spec:
185187
containers:
186-
- name: ${jobNames}-container
188+
- name: ${jobName}-container
187189
image: nginx
188190
restartPolicy: Never
189191
190192
`;
191-
await writeFileWithDirectoryCheck(path.join(jobsFolder.fsPath, `${jobNames}-job.yaml`), jobYAML);
192-
193+
await writeFileWithDirectoryCheck(path.join(jobsFolder.fsPath, `${jobName}-job.yaml`), jobYAML);
194+
})
193195
await Promise.all(jobPromises);
194196
vscode.window.showInformationMessage(`${jobNames.length} deployment, service, and ingress files generated successfully.`);
195197
}
198+
}
196199

197200
async function writeFileWithDirectoryCheck(filePath: string, content: string) {
198201
const folderPath = path.dirname(filePath);

0 commit comments

Comments
 (0)