[UpdateCLI] Improve Klipper Helm and Helm controller bumps (#7146)

updatecli/updatecli.d/helm-controller.yaml → updatecli/updatecli.d/klipper-helm-and-controller.yaml

 ---
-name: "Bump Helm Controller version"
+name: "Bump Klipper Helm and Helm Controller version"
 scms:
   k3s:
     kind: "github"
@@ -12,17 +12,28 @@ scms:
       repository: "{{ .k3s.repo }}"
       branch: "{{ .k3s.branch }}"
       commitmessage:
-        title: "Bump Helm Controller version"
+        title: "Bump Klipper Helm and Helm Controller version"
+  helm-controller:
+    kind: "github"
+    spec:
+      user: "{{ .github.user }}"
+      email: "{{ .github.email }}"
+      username: "{{ .github.username }}"
+      token: "{{ requiredEnv .github.token }}"
+      owner: "{{ .helm_controller.org }}"
+      repository: "{{ .helm_controller.repo }}"
+      branch: "{{ .helm_controller.branch }}"
 
 actions:
   github:
-    title: "Bump Helm Controller version"
+    title: "Bump Klipper Helm and Helm Controller version"
     kind: "github/pullrequest"
     scmid: "k3s"
     spec:
       automerge: false
       mergemethod: "squash"
       usetitleforautomerge: true
+      parent: false
       labels: 
         - "dependencies"
 
@@ -37,6 +48,16 @@ sources:
       token: "{{ requiredEnv .github.token }}"
       versionfilter:
         kind: "latest"
+  klipper-helm:
+    name: "Get Klipper Helm latest release version"
+    kind: "githubrelease"
+    spec:
+      owner: "{{ .klipper_helm.org }}"
+      repository: "{{ .klipper_helm.repo }}"
+      branch: "{{ .klipper_helm.branch }}"
+      token: "{{ requiredEnv .github.token }}"
+      versionfilter:
+        kind: "latest"
   get-pwd:
     name: "Run Updatecli execution directory"
     kind: "shell"
@@ -47,6 +68,12 @@ sources:
         - name: PATH
 
 conditions:
+  klipper-helm:
+    name: "Check rancher/klipper-helm image version in DockerHub"
+    kind: "dockerimage"
+    sourceid: "klipper-helm"
+    spec:
+      image: "rancher/klipper-helm"
   helm-controller:
     name: "Check Helm Controller usage in go.mod"
     kind: "file"
@@ -55,6 +82,14 @@ conditions:
     spec:
       file: "go.mod"
       matchpattern: 'github.com/k3s-io/helm-controller'
+  klipper-helm-in-helm-controller:
+    name: "Check rancher/klipper-helm image version in Helm Controller"
+    kind: "file"
+    scmid: "helm-controller"
+    disablesourceinput: true
+    spec:
+      file: "pkg/controllers/chart/chart.go"
+      matchpattern: 'rancher/klipper-helm:{{ source "klipper-helm" }}'
 
 targets:
   go-mod:
@@ -67,4 +102,13 @@ targets:
       environments:
         - name: PATH
         - name: HOME
+  klipper-helm:
+    name: "Update rancher/klipper-helm image version"
+    kind: "file"
+    scmid: "k3s"
+    sourceid: "klipper-helm"
+    spec:
+      file: "scripts/airgap/image-list.txt"
+      matchpattern: 'rancher/klipper-helm:v\d+\.\d+\.\d+(-\w+)?'
+      replacepattern: 'rancher/klipper-helm:{{ source "klipper-helm" }}'
 

updatecli/updatecli.d/klipper.yaml → updatecli/updatecli.d/klipper-lb.yaml

 ---
-name: "Bump Klipper Helm and LB versions"
+name: "Bump Klipper LB version"
 scms:
   k3s:
     kind: "github"
@@ -12,17 +12,7 @@ scms:
       repository: "{{ .k3s.repo }}"
       branch: "{{ .k3s.branch }}"
       commitmessage:
-        title: "Bump Klipper version"
-  klipper-helm:
-    kind: "github"
-    spec:
-      user: "{{ .github.user }}"
-      email: "{{ .github.email }}"
-      username: "{{ .github.username }}"
-      token: "{{ requiredEnv .github.token }}"
-      owner: "{{ .k3s.org }}"
-      repository: "{{ .klipper_helm.repo }}"
-      branch: "{{ .klipper_helm.branch }}"
+        title: "Bump Klipper LB version"
   klipper-lb:
     kind: "github"
     spec:
@@ -36,32 +26,23 @@ scms:
 
 actions:
   github:
-    title: "Bump Klipper Helm and LB versions"
+    title: "Bump Klipper LB version"
     kind: "github/pullrequest"
     scmid: "k3s"
     spec:
       automerge: false
       mergemethod: "squash"
       usetitleforautomerge: true
+      parent: false
       labels: 
         - "dependencies"
 
 sources:
-  klipper-helm:
-    name: "Get Klipper Helm latest release version"
-    kind: "githubrelease"
-    spec:
-      owner: "{{ .klipper_helm.org }}"
-      repository: "{{ .klipper_helm.repo }}"
-      branch: "{{ .klipper_helm.branch }}"
-      token: "{{ requiredEnv .github.token }}"
-      versionfilter:
-        kind: "latest"
   klipper-lb:
     name: "Get Klipper LB latest release version"
     kind: "githubrelease"
     spec:
-      owner: "{{ .klipper_helm.org }}"
+      owner: "{{ .klipper_lb.org }}"
       repository: "{{ .klipper_lb.repo }}"
       branch: "{{ .klipper_lb.branch }}"
       token: "{{ requiredEnv .github.token }}"
@@ -69,12 +50,6 @@ sources:
         kind: "latest"
 
 conditions:
-  klipper-helm:
-    name: "Check rancher/klipper-helm image version in DockerHub"
-    kind: "dockerimage"
-    sourceid: "klipper-helm"
-    spec:
-      image: "rancher/klipper-helm"
   klipper-lb:
     name: "Check rancher/klipper-lb image version in DockerHub"
     kind: "dockerimage"
@@ -94,12 +69,3 @@ targets:
         - "scripts/airgap/image-list.txt"
       matchpattern: 'rancher/klipper-lb:v\d+\.\d+\.\d+(-\w+)?'
       replacepattern: 'rancher/klipper-lb:{{ source "klipper-lb" }}'
-  klipper-helm:
-    name: "Update rancher/klipper-helm image versions"
-    kind: "file"
-    scmid: "k3s"
-    sourceid: "klipper-helm"
-    spec:
-      file: "scripts/airgap/image-list.txt"
-      matchpattern: 'rancher/klipper-helm:v\d+\.\d+\.\d+(-\w+)?'
-      replacepattern: 'rancher/klipper-helm:{{ source "klipper-helm" }}'