rancher-turtles: Fix issue in 0.4.0 chart

The previous import was based on a pre-merge copy of the following PR
- an issue was discovered during SV validation which required an
additional change to ensure CRDs are created before creating the
ClusterctlConfig CR

https://github.com/suse-edge/charts/pull/166
(cherry picked from commit 636493adba)

.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"

.obs/workflows.yml

@@ -4,221 +4,225 @@ staging_build:
   steps:
   - branch_package:
       source_package: endpoint-copier-operator
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: endpoint-copier-operator-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: endpoint-copier-operator-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-agent-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-controller-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-dashboard-extension-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-debug-echo-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-onvif-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-opcua-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-udev-discovery-handler-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: akri-webhook-configuration-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: obs-service-set_version
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: cosign
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: frr-k8s
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: kubectl
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: upgrade-controller
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: nm-configurator
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: kube-rbac-proxy
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: edge-image-builder
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: metallb
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: hauler
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: ip-address-manager
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: baremetal-operator
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: cluster-api-provider-metal3
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: cdi-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: cluster-api-provider-metal3-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: metallb-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: sriov-crd-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: upgrade-controller-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: edge-image-builder-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: ironic-ipa-downloader-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: upgrade-controller-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: metal3-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: baremetal-operator-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: sriov-network-operator-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: metallb-controller-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: ip-address-manager-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: metallb-speaker-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: ironic-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: cri-tools
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: crudini
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: fakeroot
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: ipcalc
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: autoconf
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: rancher-turtles-airgap-resources-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: rancher-turtles-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: kube-rbac-proxy-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: ironic-ipa-ramdisk
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: kubevirt-dashboard-extension-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: kiwi-builder-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: kubevirt-chart
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: release-manifest-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
   - branch_package:
       source_package: frr-image
-      source_project: isv:SUSE:Edge:Factory
+      source_project: isv:SUSE:Edge:3.2
-      target_project: isv:SUSE:Edge:Factory:Staging
+      target_project: isv:SUSE:Edge:3.2:Staging
+  - branch_package:
+      source_package: kubectl-image
+      source_project: isv:SUSE:Edge:3.2
+      target_project: isv:SUSE:Edge:3.2:Staging

kubectl-image/Dockerfile

@@ -0,0 +1,34 @@
+# SPDX-License-Identifier: Apache-2.0
+#!BuildTag: %%IMG_PREFIX%%kubectl:1.30.3
+#!BuildTag: %%IMG_PREFIX%%kubectl:1.30.3-%RELEASE%
+#!BuildVersion: 15.6
+ARG SLE_VERSION
+FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
+
+FROM registry.suse.com/bci/bci-base:$SLE_VERSION AS base
+COPY --from=micro / /installroot/
+RUN zypper --installroot /installroot --non-interactive install --no-recommends kubectl; zypper -n clean; rm -rf /var/log/*
+
+FROM micro AS final
+
+# Define labels according to https://en.opensuse.org/Building_derived_containers
+# labelprefix=com.suse.application.kubectl
+LABEL org.opencontainers.image.authors="SUSE LLC (https://www.suse.com/)"
+LABEL org.opencontainers.image.title="SLE kubectl image"
+LABEL org.opencontainers.image.description="kubectl on the SLE Base Container Image."
+LABEL org.opencontainers.image.version="1.30.3"
+LABEL org.opencontainers.image.url="https://www.suse.com/solutions/edge-computing/"
+LABEL org.opencontainers.image.created="%BUILDTIME%"
+LABEL org.opencontainers.image.vendor="SUSE LLC"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%kubectl:1.30.3-%RELEASE%"
+LABEL org.openbuildservice.disturl="%DISTURL%"
+LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
+LABEL com.suse.eula="SUSE Combined EULA February 2024"
+LABEL com.suse.lifecycle-url="https://www.suse.com/lifecycle"
+LABEL com.suse.image-type="application"
+LABEL com.suse.release-stage="released"
+# endlabelprefix
+
+COPY --from=base /installroot /
+
+ENTRYPOINT ["/usr/bin/kubectl"]

kubectl-image/_service

@@ -0,0 +1,12 @@
+<services>
+  <service mode="buildtime" name="kiwi_metainfo_helper"/>
+  <service name="replace_using_env" mode="buildtime">
+    <param name="file">Dockerfile</param>
+    <param name="eval">IMG_PREFIX=$(rpm --macros=/root/.rpmmacros -E %{?img_prefix})</param>
+    <param name="var">IMG_PREFIX</param>
+    <param name="eval">IMG_REPO=$(rpm --macros=/root/.rpmmacros -E %img_repo)</param>
+    <param name="var">IMG_REPO</param>
+    <param name="eval">SUPPORT_LEVEL=$(rpm --macros=/root/.rpmmacros -E %support_level)</param>
+    <param name="var">SUPPORT_LEVEL</param>
+  </service>
+</services>

kubectl/kubectl.spec

@@ -1,6 +1,6 @@
 %global debug_package %{nil}
 
-Name: kubectl-1303
+Name: kubectl
 Version: 1.30.3
 Release: 0
 Summary: Command-line utility for interacting with a Kubernetes cluster

kubevirt-chart/Chart.yaml

@@ -1,5 +1,5 @@
-#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:%%CHART_MAJOR%%.0.0_up0.4.0-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%kubevirt-chart:%%CHART_MAJOR%%.0.0_up0.4.0-%RELEASE%
-#!BuildTag: %%IMG_PREFIX%%sriov-crd-chart:%%CHART_MAJOR%%.0.0_up0.4.0
+#!BuildTag: %%IMG_PREFIX%%kubevirt-chart:%%CHART_MAJOR%%.0.0_up0.4.0
 apiVersion: v2
 appVersion: 1.3.1
 description: A Helm chart for KubeVirt

rancher-turtles-chart/templates/metal3-infrastructure.yaml

@@ -2,17 +2,6 @@
 {{- $namespace := index .Values "cluster-api-operator" "cluster-api" "metal3" "infrastructure" "namespace" }}
 {{- if not (lookup "v1" "Namespace" "" $namespace) }}
 ---
-apiVersion: turtles-capi.cattle.io/v1alpha1
-kind: ClusterctlConfig
-metadata:
-  name: clusterctl-config
-  namespace: rancher-turtles-system
-spec:
-  providers:
-  - name: metal3
-    url: "https://github.com/metal3-io/cluster-api-provider-metal3/releases/v1.7.2/infrastructure-components.yaml"
-    type: InfrastructureProvider
----
 apiVersion: v1
 kind: Namespace
 metadata:
@@ -23,6 +12,20 @@ metadata:
 {{- end }}
 ---
 apiVersion: turtles-capi.cattle.io/v1alpha1
+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
+    url: "https://github.com/metal3-io/cluster-api-provider-metal3/releases/v1.7.2/infrastructure-components.yaml"
+    type: InfrastructureProvider
+---
+apiVersion: turtles-capi.cattle.io/v1alpha1
 kind: CAPIProvider
 metadata:
   name: metal3
@@ -33,8 +36,8 @@ metadata:
 spec:
   name: metal3
   type: infrastructure
-{{- if index .Values  "cluster-api-operator" "cluster-api" "rke2" "version" }}
+{{- if index .Values  "cluster-api-operator" "cluster-api" "metal3" "version" }}
-  version: {{ index .Values "cluster-api-operator" "cluster-api" "rke2" "version" }}
+  version: {{ index .Values "cluster-api-operator" "cluster-api" "metal3" "version" }}
 {{- end }}
   configSecret:
 {{- if index .Values "cluster-api-operator" "cluster-api" "configSecret" "name" }}

rancher-turtles-chart/values.yaml

@@ -52,18 +52,19 @@ cluster-api-operator:
         readOnly: true
   cluster-api:
     enabled: true
+    version: "v1.7.7"
     configSecret:
       name: ""
       defaultName: capi-env-variables
     core:
       namespace: capi-system
-      imageUrl: ""
+      imageUrl: "registry.rancher.com/rancher/cluster-api-controller:v1.7.7"
       fetchConfig:
         url: ""
         selector: ""
     rke2:
       enabled: true
-      version: ""
+      version: "v0.8.0"
       bootstrap:
         namespace: rke2-bootstrap-system
         imageUrl: "registry.rancher.com/rancher/cluster-api-provider-rke2-bootstrap:v0.8.0"
@@ -78,7 +79,7 @@ cluster-api-operator:
           selector: ""
     metal3:
       enabled: true
-      version: ""
+      version: "v1.7.2"
       infrastructure:
         namespace: capm3-system
         imageUrl: "%%IMG_REPO%%/%%IMG_PREFIX%%cluster-api-provider-metal3:1.7.2"
@@ -87,4 +88,4 @@ cluster-api-operator:
           selector: ""
       ipam:
         namespace: capm3-system
-        imageUrl: "%%IMG_REPO%%/%%IMG_PREFIX%%images/ip-address-manager:1.7.2"
+        imageUrl: "%%IMG_REPO%%/%%IMG_PREFIX%%ip-address-manager:1.7.2"