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

Jump to bottom

remove initContainers from podman #501

Merged
merged 2 commits into from
Oct 21, 2022
Merged

remove initContainers from podman #501

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbaff13
remove initContainers from podman
pepoviola Oct 21, 2022
9f69c52
fmt
pepoviola Oct 21, 2022
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
25 changes: 4 additions & 21 deletions javascript/packages/orchestrator/src/providers/podman/dynResourceDefinition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,11 @@ import { resolve } from "path";
import { genCmd, genCumulusCollatorCmd } from "../../cmdGenerator";
import { getUniqueName } from "../../configGenerator";
import {
FINISH_MAGIC_FILE,
INTROSPECTOR_POD_NAME,
P2P_PORT,
PROMETHEUS_PORT,
RPC_HTTP_PORT,
RPC_WS_PORT,
TRANSFER_CONTAINER_NAME,
} from "../../constants";
import { Network } from "../../network";
import { Node } from "../../types";
Expand All @@ -23,7 +21,6 @@ export async function genBootnodeDef(
): Promise<any> {
const [volume_mounts, devices] = await make_volume_mounts(nodeSetup.name);
const container = await make_main_container(nodeSetup, volume_mounts);
const transferContainter = make_transfer_containter();
return {
apiVersion: "v1",
kind: "Pod",
Expand All @@ -41,7 +38,7 @@ export async function genBootnodeDef(
spec: {
hostname: "bootnode",
containers: [container],
initContainers: [transferContainter],
initContainers: [],
restartPolicy: "OnFailure",
volumes: devices,
},
Expand Down Expand Up @@ -339,7 +336,6 @@ export async function genNodeDef(
): Promise<any> {
const [volume_mounts, devices] = await make_volume_mounts(nodeSetup.name);
const container = await make_main_container(nodeSetup, volume_mounts);
const transferContainter = make_transfer_containter();

return {
apiVersion: "v1",
Expand All @@ -362,30 +358,17 @@ export async function genNodeDef(
spec: {
hostname: nodeSetup.name,
containers: [container],
initContainers: [transferContainter],
initContainers: [],
restartPolicy: "OnFailure",
volumes: devices,
},
};
}

function make_transfer_containter(): any {
return {
name: TRANSFER_CONTAINER_NAME,
image: "docker.io/alpine",
imagePullPolicy: "Always",
volumeMounts: [{ name: "tmp-cfg", mountPath: "/cfg", readOnly: false }],
command: [
"ash",
"-c",
`until [ -f ${FINISH_MAGIC_FILE} ]; do echo waiting for tar to finish; sleep 1; done; echo copy files has finished`,
],
};
}
async function make_volume_mounts(name: string): Promise<[any, any]> {
const volume_mounts = [
{ name: "tmp-cfg", mountPath: "/cfg", readOnly: false },
{ name: "tmp-data", mountPath: "/data", readOnly: false },
{ name: "tmp-cfg", mountPath: "/cfg:U", readOnly: false },
{ name: "tmp-data", mountPath: "/data:U", readOnly: false },
];

const client = getClient();
Expand Down