[dev-v2.9] elemental 104.2.0+up1.6.4 update (#4434)

Signed-off-by: Francesco Giudici <francesco.giudici@suse.com>
2024-09-16 10:44:23 +02:00 · 2024-09-16 10:44:23 +02:00 · e8910c742f
parent a4e73c281a
commit e8910c742f
33 changed files with 4493 additions and 15 deletions
--- a/assets/elemental-crd/elemental-crd-104.2.0+up1.6.4.tgz
+++ b/assets/elemental-crd/elemental-crd-104.2.0+up1.6.4.tgz
--- a/assets/elemental/elemental-104.2.0+up1.6.4.tgz
+++ b/assets/elemental/elemental-104.2.0+up1.6.4.tgz
--- a/charts/elemental-crd/104.2.0+up1.6.4/Chart.yaml
+++ b/charts/elemental-crd/104.2.0+up1.6.4/Chart.yaml
@ -0,0 +1,11 @@
+annotations:
+  catalog.cattle.io/certified: rancher
+  catalog.cattle.io/hidden: "true"
+  catalog.cattle.io/namespace: cattle-elemental-system
+  catalog.cattle.io/release-name: elemental-operator-crds
+apiVersion: v2
+appVersion: 1.6.4
+description: A Helm chart for deploying Rancher Elemental Operator CRDs
+name: elemental-crd
+type: application
+version: 104.2.0+up1.6.4
--- a/charts/elemental-crd/104.2.0+up1.6.4/templates/crds.yaml
+++ b/charts/elemental-crd/104.2.0+up1.6.4/templates/crds.yaml
--- a/charts/elemental-crd/104.2.0+up1.6.4/templates/validate-no-pending-deletions.yaml
+++ b/charts/elemental-crd/104.2.0+up1.6.4/templates/validate-no-pending-deletions.yaml
@ -0,0 +1,17 @@
+{{- $crds := list
+  "machineinventories.elemental.cattle.io"
+  "machineinventoryselectors.elemental.cattle.io"
+  "machineinventoryselectortemplates.elemental.cattle.io"
+  "machineregistrations.elemental.cattle.io"
+  "managedosimages.elemental.cattle.io"
+  "managedosversionchannels.elemental.cattle.io"
+  "managedosversions.elemental.cattle.io"
+  "seedimages.elemental.cattle.io"
+  "metadata.elemental.cattle.io"
+-}}
+{{- range $index, $crd := $crds -}}
+  {{- $obj := lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" $.Release.Namespace $crd -}}
+  {{- if and $obj $obj.metadata.deletionTimestamp -}}
+    {{- required "CRDs from previous installations are pending to be removed (deletionTimestamp is set). Fully deleting them before (re-)installing is required" "" -}}
+  {{- end -}}
+{{- end -}}
--- a/charts/elemental/104.2.0+up1.6.4/Chart.yaml
+++ b/charts/elemental/104.2.0+up1.6.4/Chart.yaml
@ -0,0 +1,20 @@
+annotations:
+  catalog.cattle.io/auto-install: elemental-crd=match
+  catalog.cattle.io/certified: rancher
+  catalog.cattle.io/display-name: Elemental
+  catalog.cattle.io/kube-version: '>= 1.23.0-0'
+  catalog.cattle.io/namespace: cattle-elemental-system
+  catalog.cattle.io/os: linux
+  catalog.cattle.io/permits-os: linux
+  catalog.cattle.io/provides-gvr: elemental.cattle.io/v1beta1
+  catalog.cattle.io/rancher-version: '>= 2.9.0-0 < 2.10.0-0'
+  catalog.cattle.io/release-name: elemental-operator
+  catalog.cattle.io/scope: management
+  catalog.cattle.io/type: cluster-tool
+  catalog.cattle.io/upstream-version: 1.6.4
+apiVersion: v2
+appVersion: 1.6.4
+description: Elemental provides Cloud Native OS Management for Cluster Nodes.
+icon: https://raw.githubusercontent.com/rancher/elemental/main/logo/icon-elemental.svg
+name: elemental
+version: 104.2.0+up1.6.4
--- a/charts/elemental/104.2.0+up1.6.4/README.md
+++ b/charts/elemental/104.2.0+up1.6.4/README.md
@ -0,0 +1,5 @@
+# Elemental Operator Helm Chart
+
+This chart bootstraps an elemental-operator deployment on a [Rancher Manager](https://rancher.com/docs/rancher/) cluster using the [Helm](https://helm.sh) package manager.
+
+Check out the [Elemental Operator Helm Chart documentation](https://elemental.docs.rancher.com/elementaloperatorchart-reference/) in the official [Elemental guide](https://elemental.docs.rancher.com/).
--- a/charts/elemental/104.2.0+up1.6.4/app-readme.md
+++ b/charts/elemental/104.2.0+up1.6.4/app-readme.md
@ -0,0 +1,5 @@
+# Elemental
+
+Elemental brings to Rancher the ability to install and manage the OS of bare metal and virtualized machines.
+
+For more information on how to deploy an Elemental Cluster, follow the [official documentation](https://elemental.docs.rancher.com/).
--- a/charts/elemental/104.2.0+up1.6.4/questions.yaml
+++ b/charts/elemental/104.2.0+up1.6.4/questions.yaml
@ -0,0 +1,27 @@
+questions:
+- variable: channel.defaultChannel
+  default: "true"
+  description: "Provide an Elemental OS Channel container image"
+  label: Elemental OS Channel
+  type: boolean
+  show_subquestion_if: true
+  group: "Elemental OS Channel"
+  subquestions:
+  - variable: channel.image
+    default: "registry.suse.com/rancher/elemental-channel/sl-micro"
+    description: "Specify the Elemental OS channel: for air-gapped scenarios you need to provide your own OS channel image (see https://elemental.docs.rancher.com/airgap for detailed instructions)"
+    type: string
+    label: Elemental OS Channel Image
+    group: "Elemental OS Channel"
+  - variable: channel.tag
+    default: "6.0-baremetal"
+    description: "Specify Elemental OS channel image tag"
+    type: string
+    label: "Elemental OS Channel Tag"
+    group: "Elemental OS Channel"
+- variable: debug
+  default: "false"
+  description: "Enable debug logging in the Elemental operator"
+  type: boolean
+  label: "Enable Debug Logging"
+  group: "Logging"
--- a/charts/elemental/104.2.0+up1.6.4/templates/_helpers.tpl
+++ b/charts/elemental/104.2.0+up1.6.4/templates/_helpers.tpl
@ -0,0 +1,17 @@
+{{- define "system_default_registry" -}}
+{{- if .Values.global.cattle.systemDefaultRegistry -}}
+{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}
+
+{{- define "registry_url" -}}
+{{- if .Values.global.cattle.systemDefaultRegistry -}}
+{{ include "system_default_registry" . }}
+{{- else if .Values.registryUrl -}}
+{{- printf "%s/" .Values.registryUrl -}}
+{{- else -}}
+{{- "" -}}
+{{- end -}}
+{{- end -}}
--- a/charts/elemental/104.2.0+up1.6.4/templates/apiservice.yaml
+++ b/charts/elemental/104.2.0+up1.6.4/templates/apiservice.yaml
@ -0,0 +1,9 @@
+kind: APIService
+apiVersion: management.cattle.io/v3
+metadata:
+  name: {{ .Release.Name }}
+spec:
+  secretName: elemental-operator
+  secretNamespace: {{ .Release.Namespace }}
+  pathPrefixes:
+  - /elemental/
--- a/charts/elemental/104.2.0+up1.6.4/templates/capi_rbac.yaml
+++ b/charts/elemental/104.2.0+up1.6.4/templates/capi_rbac.yaml
@ -0,0 +1,10 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: elemental-capi-role
+  labels:
+    cluster.x-k8s.io/aggregate-to-manager: "true"
+rules:
+  - apiGroups: ["elemental.cattle.io"]
+    resources: ["*"]
+    verbs: ["*"]
--- a/charts/elemental/104.2.0+up1.6.4/templates/channel-dev.yaml
+++ b/charts/elemental/104.2.0+up1.6.4/templates/channel-dev.yaml
@ -0,0 +1,13 @@
+# Unstable channel for testing isv:Rancher:Elemental OBS projects
+# it is only rendered if the registryUrl value includes a known OBS project reference
+{{ if and (hasPrefix "registry.opensuse.org" .Values.registryUrl) (contains "isv/rancher/elemental" .Values.registryUrl) }}
+apiVersion: elemental.cattle.io/v1beta1
+kind: ManagedOSVersionChannel
+metadata:
+  name: unstable-testing-channel
+  namespace: fleet-default
+spec:
+  options:
+    image: {{ .Values.registryUrl }}/rancher/elemental-unstable-channel:latest
+  type: custom
+{{ end }}
--- a/charts/elemental/104.2.0+up1.6.4/templates/channels.yaml
+++ b/charts/elemental/104.2.0+up1.6.4/templates/channels.yaml
@ -0,0 +1,30 @@
+{{ $defChannelName := "" }}
+{{ if and .Values.channel .Values.channel.image .Values.channel.tag .Values.channel.name }}
+{{ $defChannelName := .Values.channel.name }}
+apiVersion: elemental.cattle.io/v1beta1
+kind: ManagedOSVersionChannel
+metadata:
+  name: {{ .Values.channel.name }}
+  namespace: fleet-default
+spec:
+  options:
+    image: {{ .Values.channel.image }}:{{ .Values.channel.tag }}
+  type: custom
+{{ end }}
+
+# Keep pre-existing channels managed by Helm if they do not match with the current default
+# this way if an upgrade introduces a new channel any pre-existing channel managed by Helm is not deleted
+{{ range $index, $channel := (lookup "elemental.cattle.io/v1beta1" "ManagedOSVersionChannel" "fleet-default" "").items }}
+  {{ if and (eq (index $channel.metadata.labels "app.kubernetes.io/managed-by") "Helm") (ne $channel.metadata.name $defChannelName) }}
+---
+apiVersion: elemental.cattle.io/v1beta1
+kind: ManagedOSVersionChannel
+metadata:
+  name: {{ $channel.metadata.name }}
+  namespace: fleet-default
+spec:
+  options:
+    image: {{ $channel.spec.options.image }}
+  type: custom
+  {{ end }}
+{{ end }}
--- a/charts/elemental/104.2.0+up1.6.4/templates/cluster_role.yaml
+++ b/charts/elemental/104.2.0+up1.6.4/templates/cluster_role.yaml
@ -0,0 +1,268 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: '{{ .Release.Name }}'
+rules:
+- apiGroups:
+  - ""
+  resources:
+  - configmaps
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - events
+  verbs:
+  - create
+  - patch
+- apiGroups:
+  - ""
+  resources:
+  - pods
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - pods/log
+  verbs:
+  - get
+- apiGroups:
+  - ""
+  resources:
+  - pods/status
+  verbs:
+  - get
+- apiGroups:
+  - ""
+  resources:
+  - secrets
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - serviceaccounts
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - services
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - ""
+  resources:
+  - services/status
+  verbs:
+  - get
+- apiGroups:
+  - cluster.x-k8s.io
+  resources:
+  - machines
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - machineinventories
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - machineinventories/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - machineinventoryselectors
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - machineinventoryselectors/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - machineregistrations
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - machineregistrations/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - managedosimages
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - managedosimages/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - managedosversionchannels
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - managedosversionchannels/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - managedosversions
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - managedosversions/status
+  verbs:
+  - get
+  - list
+  - patch
+  - update
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - seedimages
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - patch
+  - update
+  - watch
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - seedimages/status
+  verbs:
+  - get
+  - patch
+  - update
+- apiGroups:
+  - fleet.cattle.io
+  resources:
+  - bundles
+  verbs:
+  - create
+  - get
+  - list
+  - update
+  - watch
+- apiGroups:
+  - management.cattle.io
+  resources:
+  - settings
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - rbac.authorization.k8s.io
+  resources:
+  - rolebindings
+  - roles
+  verbs:
+  - create
+  - delete
+  - list
+  - watch
--- a/charts/elemental/104.2.0+up1.6.4/templates/cluster_role_binding.yaml
+++ b/charts/elemental/104.2.0+up1.6.4/templates/cluster_role_binding.yaml
@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: {{ .Release.Name }}
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: {{ .Release.Name }}
+subjects:
+- kind: ServiceAccount
+  name: {{ .Release.Name }}
+  namespace: {{.Release.Namespace}}
+
--- a/charts/elemental/104.2.0+up1.6.4/templates/deployment.yaml
+++ b/charts/elemental/104.2.0+up1.6.4/templates/deployment.yaml
@ -0,0 +1,50 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Release.Name }}
+spec:
+  replicas: {{ .Values.replicas }}
+  selector:
+    matchLabels:
+      app: elemental-operator
+  template:
+    metadata:
+      labels:
+        app: elemental-operator
+    spec:
+      containers:
+      - env:
+        - name: NO_PROXY
+          value: {{ .Values.noProxy }}
+        {{- if .Values.proxy }}
+        - name: HTTP_PROXY
+          value: {{ .Values.proxy }}
+        - name: HTTPS_PROXY
+          value: {{ .Values.proxy }}
+        {{- end }}
+        name: {{ .Release.Name }}
+        imagePullPolicy: "{{ .Values.image.imagePullPolicy }}"
+        image: {{ template "registry_url" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
+        args:
+        - operator
+        {{- if .Values.debug }}
+        - --v=5
+        - --debug
+        {{- end }}
+        - --namespace
+        - {{ .Release.Namespace }}
+        - --operator-image
+        - {{ template "registry_url" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}
+        - --seedimage-image
+        - {{ template "registry_url" . }}{{ .Values.seedImage.repository }}:{{ .Values.seedImage.tag | default .Chart.AppVersion }}
+        - --seedimage-image-pullpolicy
+        - {{ .Values.seedImage.imagePullPolicy}}
+      serviceAccountName: {{ .Release.Name }}
+      {{- with .Values.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.nodeSelector }}
+      nodeSelector:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
--- a/charts/elemental/104.2.0+up1.6.4/templates/globalrole.yaml
+++ b/charts/elemental/104.2.0+up1.6.4/templates/globalrole.yaml
@ -0,0 +1,16 @@
+apiVersion: management.cattle.io/v3
+builtin: false
+description: "Elemental Administrator Role"
+displayName: Elemental Administrator
+kind: GlobalRole
+metadata:
+  labels:
+    cattle.io/creator: norman
+  name: {{ .Release.Name }}
+rules:
+- apiGroups:
+  - elemental.cattle.io
+  resources:
+  - '*'
+  verbs:
+  - '*'
--- a/charts/elemental/104.2.0+up1.6.4/templates/metadata.yaml
+++ b/charts/elemental/104.2.0+up1.6.4/templates/metadata.yaml
@ -0,0 +1,10 @@
+apiVersion: elemental.cattle.io/v1beta1
+kind: Metadata
+metadata:
+  name: {{ .Release.Name }}
+spec:
+  appVersion: {{ .Chart.AppVersion }}
+  annotations:
+  {{- range $key, $value := .Chart.Annotations }}
+    {{ $key }}: {{ toYaml $value }}
+  {{- end }}
--- a/charts/elemental/104.2.0+up1.6.4/templates/serviceaccount.yaml
+++ b/charts/elemental/104.2.0+up1.6.4/templates/serviceaccount.yaml
@ -0,0 +1,4 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}
--- a/charts/elemental/104.2.0+up1.6.4/templates/validate-install-crd.yaml
+++ b/charts/elemental/104.2.0+up1.6.4/templates/validate-install-crd.yaml
@ -0,0 +1,26 @@
+{{ if gt (len (lookup "rbac.authorization.k8s.io/v1" "ClusterRole" "" "")) 0 }}
+  {{ $apis := dict
+    "elemental.cattle.io/v1beta1/MachineInventory" "machineinventories"
+    "elemental.cattle.io/v1beta1/MachineInventorySelector" "machineinventoryselectors"
+    "elemental.cattle.io/v1beta1/MachineInventorySelectorTemplate" "machineinventoryselectortemplates"
+    "elemental.cattle.io/v1beta1/MachineRegistration" "machineregistrations"
+    "elemental.cattle.io/v1beta1/ManagedOSImage" "managedosimages"
+    "elemental.cattle.io/v1beta1/ManagedOSVersionChannel" "managedosversionchannels"
+    "elemental.cattle.io/v1beta1/ManagedOSVersion" "managedosversions"
+    "elemental.cattle.io/v1beta1/SeedImage" "seedimages"
+    "elemental.cattle.io/v1beta1/Metadata" "metadata"
+  }}
+  {{- range $api, $crd := $apis -}}
+    {{- if not ($.Capabilities.APIVersions.Has $api) -}}
+      {{- required "Required CRDs are missing. Please install the corresponding CRD chart before installing this chart." "" -}}
+    {{- end -}}
+    {{- $crdobj := lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" "" (print $crd ".elemental.cattle.io") -}}
+    {{- if not $crdobj -}}
+      {{- print "Cannot lookup " $crd ".elemental.cattle.io crd object" | fail -}}
+    {{- end -}}
+    {{- $crdrelease := index $crdobj.metadata.annotations "meta.helm.sh/release-name" -}}
+    {{- if eq $crdrelease $.Release.Name -}}
+      {{- required "Elemental CRDs should be moved to the new elemental-operator-crds chart before upgrading this operator." "" -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
--- a/charts/elemental/104.2.0+up1.6.4/values.yaml
+++ b/charts/elemental/104.2.0+up1.6.4/values.yaml
@ -0,0 +1,43 @@
+image:
+  empty: rancher/pause:3.1
+  repository: "rancher/mirrored-elemental-operator"
+  tag: "1.6.4"
+  imagePullPolicy: IfNotPresent
+
+seedImage:
+  repository: "rancher/mirrored-elemental-seedimage-builder"
+  tag: "1.6.4"
+  imagePullPolicy: IfNotPresent
+
+channel:
+  name: "sl-micro-6.0-baremetal-channel"
+  image: "registry.suse.com/rancher/elemental-channel/sl-micro"
+  tag: "6.0-baremetal"
+
+# number of operator replicas to deploy
+replicas: 1
+
+# http[s] proxy server
+# proxy: http://<username>@<password>:<url>:<port>
+
+# comma separated list of domains or ip addresses that will not use the proxy
+noProxy: 127.0.0.0/8,10.0.0.0/8,172.16.0.0/12,192.168.0.0/16,.svc,.cluster.local
+
+global:
+  cattle:
+    systemDefaultRegistry: ""
+
+# used only if systemDefaultRegistry is empty
+registryUrl: ""
+
+# enable debug output for operator
+debug: false
+
+nodeSelector:
+  kubernetes.io/os: linux
+
+tolerations:
+  - key: cattle.io/os
+    operator: "Equal"
+    value: "linux"
+    effect: NoSchedule
--- a/index.yaml
+++ b/index.yaml
@ -1,6 +1,30 @@
 apiVersion: v1
 entries:
  elemental:
+  - annotations:
+      catalog.cattle.io/auto-install: elemental-crd=match
+      catalog.cattle.io/certified: rancher
+      catalog.cattle.io/display-name: Elemental
+      catalog.cattle.io/kube-version: '>= 1.23.0-0'
+      catalog.cattle.io/namespace: cattle-elemental-system
+      catalog.cattle.io/os: linux
+      catalog.cattle.io/permits-os: linux
+      catalog.cattle.io/provides-gvr: elemental.cattle.io/v1beta1
+      catalog.cattle.io/rancher-version: '>= 2.9.0-0 < 2.10.0-0'
+      catalog.cattle.io/release-name: elemental-operator
+      catalog.cattle.io/scope: management
+      catalog.cattle.io/type: cluster-tool
+      catalog.cattle.io/upstream-version: 1.6.4
+    apiVersion: v2
+    appVersion: 1.6.4
+    created: "2024-09-16T09:04:49.464086037+02:00"
+    description: Elemental provides Cloud Native OS Management for Cluster Nodes.
+    digest: bc1430695cee7aabbe82b45974db6983a027bd33546855d9b720d4c96f31e939
+    icon: https://raw.githubusercontent.com/rancher/elemental/main/logo/icon-elemental.svg
+    name: elemental
+    urls:
+    - assets/elemental/elemental-104.2.0+up1.6.4.tgz
+    version: 104.2.0+up1.6.4
  - annotations:
      catalog.cattle.io/auto-install: elemental-crd=match
      catalog.cattle.io/certified: rancher
@ -194,6 +218,21 @@ entries:
    - assets/elemental/elemental-103.0.0+up1.3.4.tgz
    version: 103.0.0+up1.3.4
  elemental-crd:
+  - annotations:
+      catalog.cattle.io/certified: rancher
+      catalog.cattle.io/hidden: "true"
+      catalog.cattle.io/namespace: cattle-elemental-system
+      catalog.cattle.io/release-name: elemental-operator-crds
+    apiVersion: v2
+    appVersion: 1.6.4
+    created: "2024-09-16T09:05:35.592272975+02:00"
+    description: A Helm chart for deploying Rancher Elemental Operator CRDs
+    digest: 7598580c433730b8069bf50f0271543a546eb91a389f33a58b0eac0c8b9ea072
+    name: elemental-crd
+    type: application
+    urls:
+    - assets/elemental-crd/elemental-crd-104.2.0+up1.6.4.tgz
+    version: 104.2.0+up1.6.4
  - annotations:
      catalog.cattle.io/certified: rancher
      catalog.cattle.io/hidden: "true"
--- a/packages/elemental/elemental-crd/generated-changes/patch/Chart.yaml.patch
+++ b/packages/elemental/elemental-crd/generated-changes/patch/Chart.yaml.patch
@ -2,9 +2,9 @@
 +++ charts/Chart.yaml
@@ -6,5 +6,6 @@
 apiVersion: v2
- appVersion: 1.5.4
+ appVersion: 1.6.4
 description: A Helm chart for deploying Rancher Elemental Operator CRDs
 -name: elemental-operator-crds
 +name: elemental-crd
 +type: application
- version: 1.5.4
+ version: 1.6.4
--- a/packages/elemental/elemental-crd/generated-changes/patch/templates/crds.yaml.patch
+++ b/packages/elemental/elemental-crd/generated-changes/patch/templates/crds.yaml.patch
@ -0,0 +1,74 @@
+--- charts-original/templates/crds.yaml
+++ charts/templates/crds.yaml
+@@ -9,7 +9,6 @@
+   labels:
+     cluster.x-k8s.io/provider: infrastructure-elemental
+     cluster.x-k8s.io/v1beta1: v1beta1
+-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
+     release-name: '{{ .Release.Name }}'
+   name: machineinventories.elemental.cattle.io
+ spec:
+@@ -209,7 +208,6 @@
+   labels:
+     cluster.x-k8s.io/provider: infrastructure-elemental
+     cluster.x-k8s.io/v1beta1: v1beta1
+-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
+     release-name: '{{ .Release.Name }}'
+   name: machineinventoryselectors.elemental.cattle.io
+ spec:
+@@ -420,7 +418,6 @@
+   labels:
+     cluster.x-k8s.io/provider: infrastructure-elemental
+     cluster.x-k8s.io/v1beta1: v1beta1
+-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
+     release-name: '{{ .Release.Name }}'
+   name: machineinventoryselectortemplates.elemental.cattle.io
+ spec:
+@@ -659,7 +656,6 @@
+   labels:
+     cluster.x-k8s.io/provider: infrastructure-elemental
+     cluster.x-k8s.io/v1beta1: v1beta1
+-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
+     release-name: '{{ .Release.Name }}'
+   name: machineregistrations.elemental.cattle.io
+ spec:
+@@ -987,7 +983,6 @@
+   labels:
+     cluster.x-k8s.io/provider: infrastructure-elemental
+     cluster.x-k8s.io/v1beta1: v1beta1
+-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
+     release-name: '{{ .Release.Name }}'
+   name: managedosimages.elemental.cattle.io
+ spec:
+@@ -2529,7 +2524,6 @@
+   labels:
+     cluster.x-k8s.io/provider: infrastructure-elemental
+     cluster.x-k8s.io/v1beta1: v1beta1
+-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
+     release-name: '{{ .Release.Name }}'
+   name: managedosversionchannels.elemental.cattle.io
+ spec:
+@@ -3029,7 +3023,6 @@
+   labels:
+     cluster.x-k8s.io/provider: infrastructure-elemental
+     cluster.x-k8s.io/v1beta1: v1beta1
+-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
+     release-name: '{{ .Release.Name }}'
+   name: managedosversions.elemental.cattle.io
+ spec:
+@@ -3439,7 +3432,6 @@
+   labels:
+     cluster.x-k8s.io/provider: infrastructure-elemental
+     cluster.x-k8s.io/v1beta1: v1beta1
+-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
+     release-name: '{{ .Release.Name }}'
+   name: metadata.elemental.cattle.io
+ spec:
+@@ -3500,7 +3492,6 @@
+   labels:
+     cluster.x-k8s.io/provider: infrastructure-elemental
+     cluster.x-k8s.io/v1beta1: v1beta1
+-    helm.sh/chart: '{{ .Chart.Name }}-{{ .Chart.Version }}'
+     release-name: '{{ .Release.Name }}'
+   name: seedimages.elemental.cattle.io
+ spec:
--- a/packages/elemental/elemental-crd/package.yaml
+++ b/packages/elemental/elemental-crd/package.yaml
@ -1,2 +1,2 @@
-url: oci://registry.suse.com/rancher/elemental-operator-crds-chart:1.5.4
-version: 104.1.1
+url: oci://registry.suse.com/rancher/elemental-operator-crds-chart:1.6.4
+version: 104.2.0
--- a/packages/elemental/elemental/generated-changes/patch/Chart.yaml.patch
+++ b/packages/elemental/elemental/generated-changes/patch/Chart.yaml.patch
@ -17,11 +17,11 @@
   catalog.cattle.io/scope: management
   catalog.cattle.io/type: cluster-tool
 -  catalog.cattle.io/upstream-version: '%VERSION'
-+  catalog.cattle.io/upstream-version: 1.5.4
+  catalog.cattle.io/upstream-version: 1.6.4
 apiVersion: v2
- appVersion: 1.5.4
+ appVersion: 1.6.4
 description: Elemental provides Cloud Native OS Management for Cluster Nodes.
 icon: https://raw.githubusercontent.com/rancher/elemental/main/logo/icon-elemental.svg
 -name: elemental-operator
 +name: elemental
- version: 1.5.4
+ version: 1.6.4
--- a/packages/elemental/elemental/generated-changes/patch/questions.yaml.patch
+++ b/packages/elemental/elemental/generated-changes/patch/questions.yaml.patch
@ -5,14 +5,14 @@
   subquestions:
   - variable: channel.image
 -    default: "%%IMG_REPO%%/rancher/elemental-channel"
-+    default: "registry.suse.com/rancher/elemental-channel"
+    default: "registry.suse.com/rancher/elemental-channel/sl-micro"
     description: "Specify the Elemental OS channel: for air-gapped scenarios you need to provide your own OS channel image (see https://elemental.docs.rancher.com/airgap for detailed instructions)"
     type: string
     label: Elemental OS Channel Image
     group: "Elemental OS Channel"
   - variable: channel.tag
-    default: "%VERSION%"
-+    default: "1.5.4"
+-    default: "1.6.4"
+    default: "6.0-baremetal"
     description: "Specify Elemental OS channel image tag"
     type: string
     label: "Elemental OS Channel Tag"
--- a/packages/elemental/elemental/generated-changes/patch/templates/deployment.yaml.patch
+++ b/packages/elemental/elemental/generated-changes/patch/templates/deployment.yaml.patch
@ -0,0 +1,12 @@
+--- charts-original/templates/deployment.yaml
+++ charts/templates/deployment.yaml
+@@ -1,9 +1,6 @@
+ apiVersion: apps/v1
+ kind: Deployment
+ metadata:
+-  labels:
+-    app.kubernetes.io/name: {{ .Chart.Name }}
+-    app.kubernetes.io/version: {{ .Chart.Version }}
+   name: {{ .Release.Name }}
+ spec:
+   replicas: {{ .Values.replicas }}
--- a/packages/elemental/elemental/generated-changes/patch/templates/validate-install-crd.yaml.patch
+++ b/packages/elemental/elemental/generated-changes/patch/templates/validate-install-crd.yaml.patch
@ -0,0 +1,12 @@
+--- charts-original/templates/validate-install-crd.yaml
+++ charts/templates/validate-install-crd.yaml
+@@ -22,9 +22,5 @@
+     {{- if eq $crdrelease $.Release.Name -}}
+       {{- required "Elemental CRDs should be moved to the new elemental-operator-crds chart before upgrading this operator." "" -}}
+     {{- end -}}
+-    {{- $crdversion := index $crdobj.metadata.annotations "app.kubernetes.io/version" -}}
+-    {{- if or (not $crdversion) (ne $crdversion $.Chart.Version) -}}
+-      {{- required "Elemental Operator CRDs chart version must match the version of this chart. Please install the corresponding CRD chart before." "" -}}
+-    {{- end -}}
+   {{- end -}}
+ {{- end -}}
--- a/packages/elemental/elemental/generated-changes/patch/values.yaml.patch
+++ b/packages/elemental/elemental/generated-changes/patch/values.yaml.patch
@ -5,16 +5,16 @@
   empty: rancher/pause:3.1
 -  repository: "rancher/elemental-operator"
 +  repository: "rancher/mirrored-elemental-operator"
-   tag: "1.5.4"
+   tag: "1.6.4"
   imagePullPolicy: IfNotPresent
 
 seedImage:
 -  repository: "rancher/seedimage-builder"
 +  repository: "rancher/mirrored-elemental-seedimage-builder"
-   tag: "1.5.4"
+   tag: "1.6.4"
   imagePullPolicy: IfNotPresent
 
-@@ -27,7 +27,7 @@
+@@ -28,7 +28,7 @@
     systemDefaultRegistry: ""
 
 # used only if systemDefaultRegistry is empty
--- a/packages/elemental/elemental/package.yaml
+++ b/packages/elemental/elemental/package.yaml
@ -1,2 +1,2 @@
-url: oci://registry.suse.com/rancher/elemental-operator-chart:1.5.4
-version: 104.1.1
+url: oci://registry.suse.com/rancher/elemental-operator-chart:1.6.4
+version: 104.2.0
--- a/release.yaml
+++ b/release.yaml
@ -1,3 +1,7 @@
+elemental:
+  - 104.2.0+up1.6.4
+elemental-crd:
+  - 104.2.0+up1.6.4
 harvester-cloud-provider:
  - 104.0.2+up0.2.6
 rancher-logging: