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.

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

Adding ipv6 to all applications #2993

Merged
merged 4 commits into from
Jun 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions packages/playground/src/components/caprover_worker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
:small="{ cpu: 1, memory: 2, disk: 50 }"
:medium="{ cpu: 2, memory: 4, disk: 100 }"
/>
<Networks v-model:mycelium="$props.modelValue.mycelium" />
<Networks v-model:mycelium="$props.modelValue.mycelium" v-model:ipv6="$props.modelValue.ipv6" />

<input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
<v-switch color="primary" inset label="Dedicated" v-model="$props.modelValue.dedicated" />
Expand All @@ -34,6 +34,7 @@
<TfSelectionDetails
:filters="{
ipv4: true,
ipv6: $props.modelValue.ipv6,
certified: $props.modelValue.certified,
dedicated: $props.modelValue.dedicated,
cpu: $props.modelValue.solution?.cpu,
Expand All @@ -58,7 +59,7 @@ import { generateName } from "../utils/strings";
import SelectSolutionFlavor from "./select_solution_flavor.vue";

export function createWorker(name: string = generateName({ prefix: "wr" })): CaproverWorker {
return { name, mycelium: true };
return { name, mycelium: true, ipv6: false };
}

export default {
Expand Down
1 change: 1 addition & 0 deletions packages/playground/src/types/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ export interface CaproverWorker {
certified?: boolean;
selectionDetails?: SelectionDetails;
mycelium: boolean;
ipv6: boolean;
}

export interface FarmInterface {
Expand Down
5 changes: 4 additions & 1 deletion packages/playground/src/weblets/freeflow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
:large="{ cpu: 4, memory: 32, disk: 1000 }"
/>

<Networks v-model:ipv4="ipv4"></Networks>
<Networks v-model:ipv4="ipv4" v-model:ipv6="ipv6"></Networks>

<input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
<v-switch color="primary" inset label="Dedicated" v-model="dedicated" hide-details />
Expand All @@ -59,6 +59,7 @@
<TfSelectionDetails
:filters="{
ipv4,
ipv6,
certified,
dedicated,
cpu: solution?.cpu,
Expand Down Expand Up @@ -103,6 +104,7 @@ const disks = ref<Disk[]>([]);
const dedicated = ref(false);
const certified = ref(false);
const ipv4 = ref(false);
const ipv6 = ref(false);
const rootFilesystemSize = computed(() =>
calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
);
Expand Down Expand Up @@ -162,6 +164,7 @@ async function deploy() {
flist: flist?.value!.value,
entryPoint: flist.value!.entryPoint,
publicIpv4: ipv4.value,
publicIpv6: ipv6.value,
envs: [
{ key: "SSH_KEY", value: selectedSSHKeys.value },
{ key: "USER_ID", value: threebotName.value },
Expand Down
5 changes: 4 additions & 1 deletion packages/playground/src/weblets/tf_algorand.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<v-text-field label="Name" v-model="name" v-bind="props" />
</input-tooltip>
</input-validator>
<Networks v-model:mycelium="mycelium" v-model:planetary="planetary" v-model:ipv4="ipv4" />
<Networks v-model:mycelium="mycelium" v-model:planetary="planetary" v-model:ipv4="ipv4" v-model:ipv6="ipv6" />
<AlgorandCapacity
:network="network"
:type="type"
Expand Down Expand Up @@ -83,6 +83,7 @@
}"
:filters="{
ipv4,
ipv6,
certified,
dedicated,
cpu,
Expand Down Expand Up @@ -121,6 +122,7 @@ const flist: Flist = {
};
const name = ref(generateName({ prefix: "al" }));
const ipv4 = ref(false);
const ipv6 = ref(false);
const planetary = ref(true);
const mycelium = ref(true);
const cpu = ref() as Ref<number>;
Expand Down Expand Up @@ -171,6 +173,7 @@ async function deploy() {
: [],
rootFilesystemSize: rootFilesystemSize.value,
publicIpv4: ipv4.value,
publicIpv6: ipv6.value,
mycelium: mycelium.value,
planetary: planetary.value,
nodeId: selectionDetails.value!.node!.nodeId,
Expand Down
2 changes: 2 additions & 0 deletions packages/playground/src/weblets/tf_caprover.vue
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,8 @@ function normalizeCaproverWorker(worker: CW, envs: Env[]): Machine {
publicIpv4: true,
planetary: true,
mycelium: worker.mycelium || false,
publicIpv6: worker.ipv6 || false,

rootFilesystemSize: calculateRootFileSystem({
CPUCores: worker.solution!.cpu,
RAMInMegaBytes: worker.solution!.memory,
Expand Down
5 changes: 4 additions & 1 deletion packages/playground/src/weblets/tf_casperlabs.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
:large="{ cpu: 8, memory: 32, disk: 1000 }"
/>

<Networks v-model:ipv4="ipv4" v-model:planetary="planetary" v-model:mycelium="mycelium" />
<Networks v-model:ipv4="ipv4" v-model:planetary="planetary" v-model:mycelium="mycelium" v-model:ipv6="ipv6" />

<input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
<v-switch color="primary" inset label="Dedicated" v-model="dedicated" hide-details />
Expand All @@ -50,6 +50,7 @@
<TfSelectionDetails
:filters="{
ipv4,
ipv6,
certified,
dedicated,
cpu: solution?.cpu,
Expand Down Expand Up @@ -97,6 +98,7 @@ const flist: Flist = {
const dedicated = ref(false);
const certified = ref(false);
const ipv4 = ref(false);
const ipv6 = ref(false);
const mycelium = ref(true);
const planetary = ref(false);
const rootFilesystemSize = computed(() =>
Expand Down Expand Up @@ -151,6 +153,7 @@ async function deploy() {
flist: flist.value,
entryPoint: flist.entryPoint,
publicIpv4: ipv4.value,
publicIpv6: ipv6.value,
mycelium: mycelium.value,
planetary: planetary.value,
envs: [
Expand Down
5 changes: 4 additions & 1 deletion packages/playground/src/weblets/tf_discourse.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
:medium="{ cpu: 2, memory: 4, disk: 50 }"
:large="{ cpu: 4, memory: 16, disk: 100 }"
/>
<Networks v-model:mycelium="mycelium" v-model:planetary="planetary" v-model:ipv4="ipv4" />
<Networks v-model:mycelium="mycelium" v-model:planetary="planetary" v-model:ipv4="ipv4" v-model:ipv6="ipv6" />

<input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
<v-switch color="primary" inset label="Dedicated" v-model="dedicated" hide-details />
Expand All @@ -71,6 +71,7 @@
<TfSelectionDetails
:filters="{
ipv4,
ipv6,
certified,
dedicated,
cpu: solution?.cpu,
Expand Down Expand Up @@ -122,6 +123,7 @@ const name = ref(generateName({ prefix: "dc" }));
const email = ref(profileManager.profile?.email || "");
const solution = ref() as Ref<SolutionFlavor>;
const ipv4 = ref(false);
const ipv6 = ref(false);
const mycelium = ref(true);
const planetary = ref(true);
const smtp = ref(createSMTPServer());
Expand Down Expand Up @@ -183,6 +185,7 @@ async function deploy() {
entryPoint: flist.entryPoint,
rootFilesystemSize: rootFilesystemSize.value,
publicIpv4: ipv4.value,
publicIpv6: ipv6.value,
planetary: planetary.value,
mycelium: mycelium.value,
envs: [
Expand Down
5 changes: 4 additions & 1 deletion packages/playground/src/weblets/tf_funkwhale.vue
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
:small="{ cpu: 1, memory: 2, disk: 50 }"
:medium="{ cpu: 2, memory: 4, disk: 100 }"
/>
<Networks v-model:ipv4="ipv4" v-model:planetary="planetary" v-model:mycelium="mycelium" />
<Networks v-model:ipv4="ipv4" v-model:planetary="planetary" v-model:mycelium="mycelium" v-model:ipv6="ipv6" />

<input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
<v-switch color="primary" inset label="Dedicated" v-model="dedicated" hide-details />
Expand All @@ -102,6 +102,7 @@
<TfSelectionDetails
:filters="{
ipv4,
ipv6,
certified,
dedicated,
cpu: solution?.cpu,
Expand Down Expand Up @@ -154,6 +155,7 @@ const flist: Flist = {
const dedicated = ref(false);
const certified = ref(false);
const ipv4 = ref(false);
const ipv6 = ref(false);
const mycelium = ref(true);
const planetary = ref(false);
const selectionDetails = ref<SelectionDetails>();
Expand Down Expand Up @@ -209,6 +211,7 @@ async function deploy() {
flist: flist.value,
entryPoint: flist.entryPoint,
publicIpv4: ipv4.value,
publicIpv6: ipv6.value,
mycelium: mycelium.value,
planetary: planetary.value,
envs: [
Expand Down
5 changes: 4 additions & 1 deletion packages/playground/src/weblets/tf_mattermost.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
:medium="{ cpu: 2, memory: 4, disk: 50 }"
:large="{ cpu: 4, memory: 16, disk: 100 }"
/>
<Networks v-model:mycelium="mycelium" v-model:planetary="planetary" v-model:ipv4="ipv4" />
<Networks v-model:mycelium="mycelium" v-model:planetary="planetary" v-model:ipv4="ipv4" v-model:ipv6="ipv6" />

<input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
<v-switch color="primary" inset label="Dedicated" v-model="dedicated" hide-details />
Expand All @@ -55,6 +55,7 @@
<TfSelectionDetails
:filters="{
ipv4,
ipv6,
certified,
dedicated,
cpu: solution?.cpu,
Expand Down Expand Up @@ -106,6 +107,7 @@ const flist: Flist = {
const dedicated = ref(false);
const certified = ref(false);
const ipv4 = ref(false);
const ipv6 = ref(false);
const planetary = ref(true);
const smtp = ref(createSMTPServer());
const rootFilesystemSize = computed(() =>
Expand Down Expand Up @@ -167,6 +169,7 @@ async function deploy() {
entryPoint: flist.entryPoint,
rootFilesystemSize: rootFilesystemSize.value,
publicIpv4: ipv4.value,
publicIpv6: ipv6.value,
planetary: planetary.value,
mycelium: mycelium.value,
envs: [
Expand Down
5 changes: 4 additions & 1 deletion packages/playground/src/weblets/tf_nextcloud.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
:large="{ cpu: 4, memory: 16, disk: 1000 }"
v-model="solution"
/>
<Networks v-model:ipv4="ipv4" v-model:mycelium="mycelium" v-model:planetary="planetary" />
<Networks v-model:ipv4="ipv4" v-model:mycelium="mycelium" v-model:planetary="planetary" v-model:ipv6="ipv6" />

<input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
<v-switch color="primary" inset label="Dedicated" v-model="dedicated" hide-details />
Expand All @@ -49,6 +49,7 @@
<TfSelectionDetails
:filters="{
ipv4,
ipv6,
certified,
dedicated,
cpu: solution?.cpu,
Expand Down Expand Up @@ -96,6 +97,7 @@ const flist: Flist = {
const dedicated = ref(false);
const certified = ref(false);
const ipv4 = ref(false);
const ipv6 = ref(false);
const mycelium = ref(true);
const planetary = ref(false);
const rootFilesystemSize = computed(() =>
Expand Down Expand Up @@ -161,6 +163,7 @@ async function deploy() {
flist: flist.value,
entryPoint: flist.entryPoint,
publicIpv4: ipv4.value,
publicIpv6: ipv6.value,
planetary: planetary.value,
mycelium: mycelium.value,
envs: [
Expand Down
5 changes: 4 additions & 1 deletion packages/playground/src/weblets/tf_owncloud.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
:medium="{ cpu: 4, memory: 16, disk: 500 }"
:large="{ cpu: 8, memory: 32, disk: 1000 }"
/>
<Networks v-model:ipv4="ipv4" v-model:mycelium="mycelium" />
<Networks v-model:ipv4="ipv4" v-model:mycelium="mycelium" v-model:ipv6="ipv6" />
<input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
<v-switch color="primary" inset label="Dedicated" v-model="dedicated" hide-details />
</input-tooltip>
Expand All @@ -92,6 +92,7 @@
<TfSelectionDetails
:filters="{
ipv4,
ipv6,
certified,
dedicated,
cpu: solution?.cpu,
Expand Down Expand Up @@ -150,6 +151,7 @@ const flist: Flist = {
const dedicated = ref(false);
const certified = ref(false);
const ipv4 = ref(false);
const ipv6 = ref(false);
const mycelium = ref(true);
const smtp = ref(createSMTPServer());
const rootFilesystemSize = computed(() =>
Expand Down Expand Up @@ -207,6 +209,7 @@ async function deploy() {
entryPoint: flist.entryPoint,
rootFilesystemSize: rootFilesystemSize.value,
publicIpv4: ipv4.value,
publicIpv6: ipv6.value,
planetary: true,
mycelium: mycelium.value,
envs: [
Expand Down
5 changes: 4 additions & 1 deletion packages/playground/src/weblets/tf_peertube.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</password-input-wrapper>

<SelectSolutionFlavor v-model="solution" />
<Networks v-model:mycelium="mycelium" v-model:planetary="planetary" />
<Networks v-model:mycelium="mycelium" v-model:planetary="planetary" v-model:ipv6="ipv6" />

<input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
<v-switch color="primary" inset label="Dedicated" v-model="dedicated" hide-details />
Expand All @@ -76,6 +76,7 @@
<TfSelectionDetails
:filters="{
ipv4,
ipv6,
certified,
dedicated,
cpu: solution?.cpu,
Expand Down Expand Up @@ -123,6 +124,7 @@ const flist: Flist = {
const dedicated = ref(false);
const certified = ref(false);
const ipv4 = ref(false);
const ipv6 = ref(false);
const rootFilesystemSize = computed(() =>
calculateRootFileSystem({ CPUCores: solution.value?.cpu ?? 0, RAMInMegaBytes: solution.value?.memory ?? 0 }),
);
Expand Down Expand Up @@ -180,6 +182,7 @@ async function deploy() {
flist: flist.value,
entryPoint: flist.entryPoint,
publicIpv4: ipv4.value,
publicIpv6: ipv6.value,
planetary: planetary.value,
mycelium: mycelium.value,
envs: [
Expand Down
12 changes: 11 additions & 1 deletion packages/playground/src/weblets/tf_presearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,14 @@
</password-input-wrapper>
</input-validator>

<Network required v-model:ipv4="ipv4" v-model:planetary="planetary" v-model:mycelium="mycelium" ref="network" />
<Network
required
v-model:ipv4="ipv4"
v-model:planetary="planetary"
v-model:mycelium="mycelium"
v-model:ipv6="ipv6"
ref="network"
/>

<input-tooltip inline tooltip="Click to know more about dedicated machines." :href="manual.dedicated_machines">
<v-switch color="primary" inset label="Dedicated" v-model="dedicated" hide-details />
Expand All @@ -69,6 +76,7 @@
<TfSelectionDetails
:filters="{
ipv4,
ipv6,
certified,
dedicated,
cpu,
Expand Down Expand Up @@ -122,6 +130,7 @@ const tabs = ref();
const name = ref(generateName({ prefix: "ps" }));
const code = ref("");
const ipv4 = ref(false);
const ipv6 = ref(false);
const planetary = ref(true);
const cpu = 1;
const memory = 512;
Expand Down Expand Up @@ -170,6 +179,7 @@ async function deploy() {
],
planetary: planetary.value,
publicIpv4: ipv4.value,
publicIpv6: ipv6.value,
mycelium: mycelium.value,
envs: [
{
Expand Down
Loading
Loading