Plum through extraVars to the helm chart:

This allows adding arbitrary --set values to
the helm chart install. Also, update the chart
name and namespace to be Tinkerbell.

Signed-off-by: Jacob Weinstock <[email protected]>

Author: jacobweinstock

capt/config.yaml

@@ -1,14 +1,14 @@
 ---
 clusterName: "capt-playground"
 outputDir: "output"
-namespace: "tink"
+namespace: "tinkerbell"
 counts:
   controlPlanes: 1
   workers: 1
   spares: 1
 versions:
   capt: v0.6.5
-  chart: v0.18.1
+  chart: v0.19.0
   kube: v1.29.4
   os: 20.04
   kubevip: 0.9.1
@@ -17,7 +17,11 @@ capt:
   #providerRepository: "/home/tink/repos/tinkerbell/cluster-api-provider-tinkerbell/out/release/infrastructure-tinkerbell"
 chart:
   location: "oci://ghcr.io/tinkerbell/charts/tinkerbell"
-  #location: "/home/tink/repos/tinkerbell/charts/tinkerbell/stack"
+  #location: "/home/tink/repos/tinkerbell/tinkerbell/helm/tinkerbell"
+  extraVars:
+  #- deployment.image=your.registry.com/tinkerbell/tinkerbell
+  #- deployment.imageTag=v0.19.1
+  #- deployment.agentImageTag=latest
 os:
   registry: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell
   distro: ubuntu

capt/scripts/generate_state.sh

@@ -5,22 +5,31 @@
 cat <<EOF >/dev/null
 ---
 clusterName: "capt-playground"
-outputDir: "/home/tink/repos/tinkerbell/cluster-api-provider-tinkerbell/playground/output"
+outputDir: "/home/tink/repos/tinkerbell/playground/capt/output"
 namespace: "tink"
 counts:
   controlPlanes: 1
   workers: 1
   spares: 1
 versions:
-  capt: 0.5.3
-  chart: 0.5.0
-  kube: v1.28.8
-  os: 22.04
+  capt: v0.6.5
+  chart: v0.19.0
+  kube: v1.29.4
+  os: 20.04
+  kubevip: 0.9.1
+capt:
+  providerRepository: "https://github.com/tinkerbell/cluster-api-provider-tinkerbell/releases"
+chart:
+  location: "oci://ghcr.io/tinkerbell/charts/tinkerbell"
+  extraVars:
+    - deployment.image=custom.registry/tinkerbell/tinkerbell
+    - deployment.imageTag=v0.19.1
+    - deployment.agentImageTag=latest
 os:
-  registry: reg.weinstocklabs.com/tinkerbell/cluster-api-provider-tinkerbell
+  registry: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell
   distro: ubuntu
-  sshKey: ""
-  version: "2204"
+  sshKey: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH9a2GwjgVfnpjOvIqNuJTwazS3tqJ9xzcepXzKMccVf capt-playground"
+  version: "2004"
 vm:
   baseName: "node"
   cpusPerVM: 2
@@ -51,24 +60,24 @@ vm:
       gateway: 172.18.0.1
 virtualBMC:
   containerName: "virtualbmc"
-  image: ghcr.io/jacobweinstock/virtualbmc
+  image: ghcr.io/jacobweinstock/virtualbmc:latest
   user: "root"
   pass: "calvin"
   ip: 172.18.0.3
+bootMode: netboot
 totalNodes: 3
 kind:
-  kubeconfig: /home/tink/repos/tinkerbell/cluster-api-provider-tinkerbell/playground/output/kind.kubeconfig
+  kubeconfig: /home/tink/repos/tinkerbell/playground/capt/output/kind.kubeconfig
   gatewayIP: 172.18.0.1
   nodeIPBase: 172.18.10.20
-  bridgeName: br-d086780dac6b
+  bridgeName: br-3d1549d4f99f
 tinkerbell:
   vip: 172.18.10.74
   hookosVip: 172.18.10.73
 cluster:
   controlPlane:
     vip: 172.18.10.75
   podCIDR: 172.100.0.0/16
-bootMode: netboot
 EOF
 
 set -euo pipefail
@@ -145,6 +154,8 @@ function main() {
       exit 1
     fi
     yq e -i ".os.sshKey = \"$ssh_key\"" "$state_file"
+    # populate the config file with the generated SSH key
+    # so that we don't re-generate it every time
     yq e -i ".os.sshKey = \"$ssh_key\"" "$config_file"
   fi
 }

capt/tasks/Taskfile-create.yaml

@@ -115,21 +115,23 @@ tasks:
         sh: yq eval '.namespace' {{.STATE_FILE_FQ_PATH}}
       LOCATION:
         sh: yq eval '.chart.location' {{.STATE_FILE_FQ_PATH}}
-      CHART_NAME: tink-stack
+      CHART_NAME: tinkerbell
       BOOTMODE:
         sh: yq eval '.bootMode' {{.STATE_FILE_FQ_PATH}}
       GLOBAL_VARS:
         - trustedProxies={"{{.TRUSTED_PROXIES}}"}
         - publicIP={{.LB_IP}}
-        - artifactsFileServer=http://{{.LB_IP2}}:8080
+        - artifactsFileServer=http://{{.LB_IP2}}:7173
       ISO_VARS:
         - deployment.envs.smee.dhcpEnabled=false
-        - hookos.extension=both
-        - deployment.envs.smee.isoUpstreamURL=http://{{.LB_IP2}}:8080/hook-latest-lts-x86_64-efi-initrd.iso
+        - optional.hookos.extension=both
+        - deployment.envs.smee.isoUpstreamURL=http://{{.LB_IP2}}:7173/hook-latest-lts-x86_64-efi-initrd.iso
+      EXTRA_VARS:
+        sh: yq eval '.chart.extraVars | .[]' {{.STATE_FILE_FQ_PATH}} | xargs
     cmds:
-      - KUBECONFIG="{{.KUBECONFIG}}" helm install {{.CHART_NAME}} {{.LOCATION}} --version "{{.STACK_CHART_VERSION}}" --create-namespace --namespace {{.NAMESPACE}} --wait {{range .GLOBAL_VARS}}--set "{{.}}" {{end}} {{- if eq .BOOTMODE "isoboot" }} {{- range .ISO_VARS }}--set "{{.}}" {{end}} {{end}}
+      - KUBECONFIG="{{.KUBECONFIG}}" helm upgrade --install {{.CHART_NAME}} {{.LOCATION}} --version "{{.STACK_CHART_VERSION}}" --create-namespace --namespace {{.NAMESPACE}} --wait {{range .GLOBAL_VARS}}--set "{{.}}" {{end}} {{- if eq .BOOTMODE "isoboot" }} {{- range .ISO_VARS }}--set "{{.}}" {{ end }} {{ end }} {{- if .EXTRA_VARS }} {{- range (splitList " " .EXTRA_VARS ) }}--set "{{.}}" {{ end }} {{ end }}
     status:
-      - KUBECONFIG="{{.KUBECONFIG}}" helm list -n {{.NAMESPACE}} | grep -q {{.CHART_NAME}}
+      - helm_status=$(KUBECONFIG="{{.KUBECONFIG}}" helm status -n {{.NAMESPACE}} {{.CHART_NAME}} -o yaml | yq .info.status); [[ "$helm_status" == "deployed" ]]
 
   vms:
     run: once