Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(orchestrator): Apply the x-infra-instance to fileserver pod #1517

Merged
merged 3 commits into from
Nov 16, 2023
Merged

fix(orchestrator): Apply the x-infra-instance to fileserver pod #1517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c31b51
fix(orchestrator): Apply the x-infra-instance to fileserver pod
pepoviola Nov 16, 2023
7fd95dd
add xinfra to words
pepoviola Nov 16, 2023
dda3c51
fmt
pepoviola Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions javascript/packages/orchestrator/src/providers/k8s/kubeClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,10 +543,7 @@ export class KubeClient extends Client {
},
{
type: "deployment",
files: [
settings.backchannel ? "backchannel-pod.yaml" : null,
"fileserver-pod.yaml",
],
files: [settings.backchannel ? "backchannel-pod.yaml" : null],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
files: [settings.backchannel ? "backchannel-pod.yaml" : null],
files: settings.backchannel ? ["backchannel-pod.yaml"] : [],

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, I didn't saw this before merge. Can you add it in a follow up pr?
Thx!

},
];

Expand All @@ -557,6 +554,10 @@ export class KubeClient extends Client {
}

// wait until fileserver is ready, fix race condition #700.
const xinfra = process.env.X_INFRA_INSTANCE || "ondemand";
await this.createStaticResource("fileserver-pod.yaml", this.namespace, {
xinfra,
});
await this.waitPodReady("fileserver");
sleep(3 * 1000);
let fileServerOk = false;
Expand Down
3 changes: 2 additions & 1 deletion javascript/packages/orchestrator/static-configs/fileserver-pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"metadata": {
"name": "fileserver",
"labels": {
"app": "fileserver"
"app": "fileserver",
"x-infra-instance": "{{xinfra}}"
}
},
"spec": {
Expand Down
1 change: 1 addition & 0 deletions javascript/words.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ westend
westmint
willbe
xcmp
xinfra
xzvf
zipkin
zndsl
Expand Down
Loading