Adding ipv6 to caprover, owncloud and freeflow

threefoldtech · Jun 23, 2024 · a545262 · a545262
1 parent be0b48e
commit a545262
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/packages/playground/src/components/caprover_worker.vue b/packages/playground/src/components/caprover_worker.vue
@@ -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" />
@@ -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,
@@ -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 {

diff --git a/packages/playground/src/types/index.ts b/packages/playground/src/types/index.ts
@@ -73,6 +73,7 @@ export interface CaproverWorker {
   certified?: boolean;
   selectionDetails?: SelectionDetails;
   mycelium: boolean;
+  ipv6: boolean;
 }
 
 export interface FarmInterface {

diff --git a/packages/playground/src/weblets/freeflow.vue b/packages/playground/src/weblets/freeflow.vue
@@ -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 />
@@ -59,6 +59,7 @@
       <TfSelectionDetails
         :filters="{
           ipv4,
+          ipv6,
           certified,
           dedicated,
           cpu: solution?.cpu,
@@ -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(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
 const selectionDetails = ref<SelectionDetails>();
 const selectedSSHKeys = ref("");
@@ -160,6 +162,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 },

diff --git a/packages/playground/src/weblets/tf_caprover.vue b/packages/playground/src/weblets/tf_caprover.vue
@@ -169,6 +169,8 @@ function normalizeCaproverWorker(worker: CW, envs: Env[]): Machine {
     publicIpv4: true,
     planetary: true,
     mycelium: worker.mycelium || false,
+    publicIpv6: worker.ipv6 || false,
+
     rootFilesystemSize: rootFs(worker.solution!.cpu, worker.solution!.memory),
     disks: [
       {

diff --git a/packages/playground/src/weblets/tf_owncloud.vue b/packages/playground/src/weblets/tf_owncloud.vue
@@ -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>
@@ -92,6 +92,7 @@
         <TfSelectionDetails
           :filters="{
             ipv4,
+            ipv6,
             certified,
             dedicated,
             cpu: solution?.cpu,
@@ -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(() => rootFs(solution.value?.cpu ?? 0, solution.value?.memory ?? 0));
@@ -205,6 +207,7 @@ async function deploy() {
           entryPoint: flist.entryPoint,
           rootFilesystemSize: rootFilesystemSize.value,
           publicIpv4: ipv4.value,
+          publicIpv6: ipv6.value,
           planetary: true,
           mycelium: mycelium.value,
           envs: [