WIP fix. It's ugly, but overrides work at all levels if we're VERY careful. WDYT?

Signed-off-by: Scott Rigby <[email protected]>

Author: scottrigby

applications/wg-easy/Taskfile.yaml

@@ -34,14 +34,25 @@ tasks:
     cmds:
       - task: container:exec
         vars:
-          CMD: 'task {{.TASK}}'
+          CMD: 'task {{.TASK}} {{.EMBEDDED}} {{.LICENSE_ID}} {{.TIMEOUT}} {{.TTL}} {{.DISTRIBUTION}} {{.K8S_VERSION}} {{.DISK_SIZE}} {{.INSTANCE_TYPE}}'
+    vars:
+      EMBEDDED: "{{if .EMBEDDED}}EMBEDDED={{.EMBEDDED}}{{end}}"
+      LICENSE_ID: "{{if .LICENSE_ID}}LICENSE_ID={{.LICENSE_ID}}{{end}}"
+      TIMEOUT: "{{if .TIMEOUT}}TIMEOUT={{.TIMEOUT}}{{end}}"
+      TTL: "{{if .TTL}}TTL={{.TTL}}{{end}}"
+      DISTRIBUTION: "{{if .DISTRIBUTION}}DISTRIBUTION={{.DISTRIBUTION}}{{end}}"
+      K8S_VERSION: "{{if .K8S_VERSION}}K8S_VERSION={{.K8S_VERSION}}{{end}}"
+      DISK_SIZE: "{{if .DISK_SIZE}}DISK_SIZE={{.DISK_SIZE}}{{end}}"
+      INSTANCE_TYPE: "{{if .INSTANCE_TYPE}}INSTANCE_TYPE={{.INSTANCE_TYPE}}{{end}}"
 
   cluster-list:
     desc: List the cluster
     cmds:
       - task: container:exec
         vars:
-          CMD: 'task {{.TASK}}'
+          CMD: 'task {{.TASK}} {{.CLUSTER_NAME}}'
+    vars:
+      CLUSTER_NAME: "{{if .CLUSTER_NAME}}CLUSTER_NAME={{.CLUSTER_NAME}}{{end}}"
 
   test:
     desc: Run a basic test suite
@@ -55,14 +66,32 @@ tasks:
     cmds:
       - task: container:exec
         vars:
-          CMD: 'task {{.TASK}}'
+          CMD: 'task {{.TASK}} {{.CLUSTER_NAME}}'
+    vars:
+      CLUSTER_NAME: "{{if .CLUSTER_NAME}}CLUSTER_NAME={{.CLUSTER_NAME}}{{end}}"
 
+  # deps:
+  #   - cluster-create
+  #   - verify-kubeconfig
   setup-kubeconfig:
     desc: Get kubeconfig and prepare cluster for application deployment
     cmds:
       - task: container:exec
         vars:
-          CMD: 'task {{.TASK}}'
+          CMD: 'task {{.TASK}} {{.DISTRIBUTION}} {{.EMBEDDED}} {{.LICENSE_ID}} {{.TIMEOUT}} {{.TTL}} {{.DISTRIBUTION}} {{.K8S_VERSION}} {{.DISK_SIZE}} {{.INSTANCE_TYPE}} {{.CLUSTER_NAME}}'
+    vars:
+      DISTRIBUTION: "{{if .DISTRIBUTION}}DISTRIBUTION={{.DISTRIBUTION}}{{end}}"
+      # from deps cluster-create
+      EMBEDDED: "{{if .EMBEDDED}}EMBEDDED={{.EMBEDDED}}{{end}}"
+      LICENSE_ID: "{{if .LICENSE_ID}}LICENSE_ID={{.LICENSE_ID}}{{end}}"
+      TIMEOUT: "{{if .TIMEOUT}}TIMEOUT={{.TIMEOUT}}{{end}}"
+      TTL: "{{if .TTL}}TTL={{.TTL}}{{end}}"
+      DISTRIBUTION: "{{if .DISTRIBUTION}}DISTRIBUTION={{.DISTRIBUTION}}{{end}}"
+      K8S_VERSION: "{{if .K8S_VERSION}}K8S_VERSION={{.K8S_VERSION}}{{end}}"
+      DISK_SIZE: "{{if .DISK_SIZE}}DISK_SIZE={{.DISK_SIZE}}{{end}}"
+      INSTANCE_TYPE: "{{if .INSTANCE_TYPE}}INSTANCE_TYPE={{.INSTANCE_TYPE}}{{end}}"
+      # from deps verify-kubeconfig
+      CLUSTER_NAME: "{{if .CLUSTER_NAME}}CLUSTER_NAME={{.CLUSTER_NAME}}{{end}}"
 
   dependencies-update:
     desc: Update Helm dependencies for all charts
@@ -76,14 +105,41 @@ tasks:
     cmds:
       - task: container:exec
         vars:
-          CMD: 'task {{.TASK}}'
+          CMD: 'task {{.TASK}} {{.CLUSTER_NAME}} {{.OPERATION}}'
+    vars:
+      CLUSTER_NAME: "{{if .CLUSTER_NAME}}CLUSTER_NAME={{.CLUSTER_NAME}}{{end}}"
+      # from task: utils:port-operations
+      OPERATION: "{{if .OPERATION}}OPERATION={{.OPERATION}}{{end}}"
+      # CLUSTER_NAME already above
 
+  # deps:
+  #     - setup-kubeconfig
+  #     - cluster-ports-expose
   helm-install:
     desc: Deploy all charts using helmfile
     cmds:
       - task: container:exec
         vars:
-          CMD: 'task {{.TASK}}'
+          CMD: 'task {{.TASK}} {{.DISTRIBUTION}} {{.EMBEDDED}} {{.LICENSE_ID}} {{.TIMEOUT}} {{.TTL}} {{.DISTRIBUTION}} {{.K8S_VERSION}} {{.DISK_SIZE}} {{.INSTANCE_TYPE}} {{.CLUSTER_NAME}} {{.OPERATION}}'
+    vars:
+      # from deps setup-kubeconfig
+      DISTRIBUTION: "{{if .DISTRIBUTION}}DISTRIBUTION={{.DISTRIBUTION}}{{end}}"
+      # from deps cluster-create
+      EMBEDDED: "{{if .EMBEDDED}}EMBEDDED={{.EMBEDDED}}{{end}}"
+      LICENSE_ID: "{{if .LICENSE_ID}}LICENSE_ID={{.LICENSE_ID}}{{end}}"
+      TIMEOUT: "{{if .TIMEOUT}}TIMEOUT={{.TIMEOUT}}{{end}}"
+      TTL: "{{if .TTL}}TTL={{.TTL}}{{end}}"
+      DISTRIBUTION: "{{if .DISTRIBUTION}}DISTRIBUTION={{.DISTRIBUTION}}{{end}}"
+      K8S_VERSION: "{{if .K8S_VERSION}}K8S_VERSION={{.K8S_VERSION}}{{end}}"
+      DISK_SIZE: "{{if .DISK_SIZE}}DISK_SIZE={{.DISK_SIZE}}{{end}}"
+      INSTANCE_TYPE: "{{if .INSTANCE_TYPE}}INSTANCE_TYPE={{.INSTANCE_TYPE}}{{end}}"
+      ## from deps verify-kubeconfig
+      CLUSTER_NAME: "{{if .CLUSTER_NAME}}CLUSTER_NAME={{.CLUSTER_NAME}}{{end}}"
+      # from deps cluster-ports-expose
+      ## CLUSTER_NAME: "{{if .CLUSTER_NAME}}CLUSTER_NAME={{.CLUSTER_NAME}}{{end}}"
+      ## from task: utils:port-operations
+      OPERATION: "{{if .OPERATION}}OPERATION={{.OPERATION}}{{end}}"
+      ## CLUSTER_NAME already above
 
   cluster-delete:
     desc: Delete all test clusters with matching name and clean up kubeconfig
@@ -111,7 +167,7 @@ tasks:
     cmds:
       - task: container:exec
         vars:
-          CMD: 'task {{.TASK}}'
+          CMD: 'task {{.TASK}} CUSTOMER_NAME={{.CUSTOMER_NAME}} CUSTOMER_EMAIL={{.CUSTOMER_EMAIL}} LICENSE_TYPE={{.LICENSE_TYPE}} EXPIRES_IN={{.EXPIRES_IN}}'
 
   gcp-vm-create:
     desc: Create a simple GCP VM instance

applications/wg-easy/taskfiles/internal.yaml

@@ -2,15 +2,20 @@ version: "3"
 
 includes:
   utils: ./taskfiles/utils.yml
-  dev: ./taskfiles/container.yml
 
+## TO-DO: clean our vars usage
+# - some are global, but unused
+# - some are global, but also re-stated as task vars
+# - some are "requires.vars[]", even though they're set as global vars
+# - some are "requires.vars[]", even though they're set as task vars
+# - some are only set as task vars
 vars:
   # Application configuration
   APP_NAME: '{{.REPLICATED_APP | default "wg-easy"}}'
-  APP_SLUG: '{{.REPLICATED_APP_SLUG | default "wg-easy-cre"}}'
+  APP_SLUG: '{{.APP_SLUG | default "wg-easy-cre"}}'
 
   # Release configuration
-  RELEASE_CHANNELd: '{{.RELEASE_CHANNEL | default "Unstable"}}'
+  RELEASE_CHANNEL: '{{.RELEASE_CHANNEL | default "Unstable"}}'
   RELEASE_VERSION: '{{.RELEASE_VERSION | default "0.0.1"}}'
   RELEASE_NOTES: '{{.RELEASE_NOTES | default "Release created via task release-create"}}'
 
@@ -20,6 +25,7 @@ vars:
   DISK_SIZE: '{{.DISK_SIZE | default "100"}}'
   INSTANCE_TYPE: '{{.INSTANCE_TYPE | default "r1.small"}}'
   DISTRIBUTION: '{{.DISTRIBUTION | default "k3s"}}'
+  # can not override
   KUBECONFIG_FILE: './{{.CLUSTER_NAME}}.kubeconfig'
 
   # Ports configuration
@@ -297,12 +303,12 @@ tasks:
     requires:
       vars: [APP_SLUG, VERSION]
     cmds:
-      - echo "Creating and promoting release for {{.APP_SLUG}} to channel {{.CHANNEL}}..."
+      - echo "Creating and promoting release for {{.APP_SLUG}} to channel {{.RELEASE_CHANNEL}}..."
       - |
         # Create and promote the release in one step
         echo "Creating release from files in ./release directory..."
-        replicated release create --app {{.APP_SLUG}} --yaml-dir ./release --release-notes "{{.RELEASE_NOTES}}" --promote {{.CHANNEL}} --version {{.VERSION}}
-        echo "Release version {{.VERSION}} created and promoted to channel {{.CHANNEL}}"
+        replicated release create --app {{.APP_SLUG}} --yaml-dir ./release --release-notes "{{.RELEASE_NOTES}}" --promote {{.RELEASE_CHANNEL}} --version {{.RELEASE_VERSION}}
+        echo "Release version {{.RELEASE_VERSION}} created and promoted to channel {{.RELEASE_CHANNEL}}"
     deps:
       - release-prepare
 
@@ -338,7 +344,7 @@ tasks:
           --app {{.APP_SLUG}} \
           --name {{.CUSTOMER_NAME}} \
           --email {{.CUSTOMER_EMAIL}} \
-          --channel {{.CHANNEL}} \
+          --channel {{.RELEASE_CHANNEL}} \
           --type {{.LICENSE_TYPE}} \
           --output json"
 

applications/wg-easy/taskfiles/utils.yml

@@ -271,10 +271,10 @@ tasks:
           gcloud compute ssh {{.VM_NAME}} --project={{.GCP_PROJECT}} --zone={{.GCP_ZONE}} --command="
             set -e
             echo 'Downloading {{.APP_NAME}} installer...'
-            curl -f 'https://replicated.app/embedded/{{.APP_NAME}}/{{.CHANNEL}}' -H 'Authorization: {{.AUTH_TOKEN}}' -o {{.APP_NAME}}-{{.CHANNEL}}.tgz
+            curl -f 'https://replicated.app/embedded/{{.APP_NAME}}/{{.RELEASE_CHANNEL}}' -H 'Authorization: {{.AUTH_TOKEN}}' -o {{.APP_NAME}}-{{.RELEASE_CHANNEL}}.tgz
             
             echo 'Extracting installer...'
-            tar -xvzf {{.APP_NAME}}-{{.CHANNEL}}.tgz
+            tar -xvzf {{.APP_NAME}}-{{.RELEASE_CHANNEL}}.tgz
           "
           
           echo "Embedded cluster setup initiated on VM {{.VM_NAME}}"