Merge pull request '[3.2 backport] rancher-turtles: Fix issue in 0.4.0 chart' (#37 ) from steven.hardy/Factory:turtles_fix_3.2 into 3.2

Reviewed-on: suse-edge/Factory#37 Reviewed-by: Nicolas Belouin <nbelouin@noreply.src.opensuse.org> Reviewed-by: Denislav Prodanov <dprodanov@noreply.src.opensuse.org>
rancher-turtles: Fix issue in 0.4.0 chart
2024-11-27 14:08:45 +01:00 · 2024-11-27 11:16:59 +00:00 · 2024-11-25 15:59:33 +02:00
3 changed files with 117 additions and 114 deletions
--- a/.obs/common.py
+++ b/.obs/common.py
@ -1,3 +1,3 @@
-PROJECT = "isv:SUSE:Edge:Factory"
+PROJECT = "isv:SUSE:Edge:3.2"
 REPOSITORY = "https://src.opensuse.org/suse-edge/Factory"
-BRANCH = "main"
+BRANCH = "3.2"
--- a/.obs/workflows.yml
+++ b/.obs/workflows.yml
@ -4,225 +4,225 @@ staging_build:
  steps:
  - branch_package:
      source_package: endpoint-copier-operator
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: endpoint-copier-operator-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: endpoint-copier-operator-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-agent-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-controller-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-dashboard-extension-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-debug-echo-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-onvif-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-opcua-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-udev-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: akri-webhook-configuration-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: obs-service-set_version
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cosign
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: frr-k8s
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubectl
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: upgrade-controller
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: nm-configurator
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kube-rbac-proxy
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: edge-image-builder
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: hauler
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ip-address-manager
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: baremetal-operator
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cluster-api-provider-metal3
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cdi-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cluster-api-provider-metal3-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: sriov-crd-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: upgrade-controller-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: edge-image-builder-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ironic-ipa-downloader-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: upgrade-controller-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metal3-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: baremetal-operator-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: sriov-network-operator-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb-controller-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ip-address-manager-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: metallb-speaker-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ironic-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: cri-tools
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: crudini
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: fakeroot
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ipcalc
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: autoconf
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: rancher-turtles-airgap-resources-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: rancher-turtles-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kube-rbac-proxy-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: ironic-ipa-ramdisk
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubevirt-dashboard-extension-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kiwi-builder-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubevirt-chart
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: release-manifest-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: frr-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
  - branch_package:
      source_package: kubectl-image
-      source_project: isv:SUSE:Edge:Factory
-      target_project: isv:SUSE:Edge:Factory:Staging
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging
--- a/rancher-turtles-chart/templates/metal3-infrastructure.yaml
+++ b/rancher-turtles-chart/templates/metal3-infrastructure.yaml
@ -16,6 +16,9 @@ kind: ClusterctlConfig
 metadata:
  name: clusterctl-config
  namespace: rancher-turtles-system
+  annotations:
+    "helm.sh/hook": "post-install, post-upgrade"
+    "helm.sh/hook-weight": "1"
 spec:
  providers:
  - name: metal3