Skip to content

Commit

Permalink
[dev-v2.9] forward-port after 2.8.10 to dev 2.9 (#4736)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicholasSUSE authored Nov 11, 2024
1 parent 02974b1 commit d7456fe
Show file tree
Hide file tree
Showing 149 changed files with 22,233 additions and 57 deletions.
Binary file not shown.
Binary file added assets/elemental/elemental-103.4.1+up1.6.5.tgz
Binary file not shown.
Binary file not shown.
Binary file added assets/fleet-crd/fleet-crd-103.1.10+up0.9.11.tgz
Binary file not shown.
Binary file added assets/fleet/fleet-103.1.10+up0.9.11.tgz
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
11 changes: 11 additions & 0 deletions charts/elemental-crd/103.4.1+up1.6.5/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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.5
description: A Helm chart for deploying Rancher Elemental Operator CRDs
name: elemental-crd
type: application
version: 103.4.1+up1.6.5
3,747 changes: 3,747 additions & 0 deletions charts/elemental-crd/103.4.1+up1.6.5/templates/crds.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -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 -}}
20 changes: 20 additions & 0 deletions charts/elemental/103.4.1+up1.6.5/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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.8.0-0 < 2.9.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.5
apiVersion: v2
appVersion: 1.6.5
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: 103.4.1+up1.6.5
5 changes: 5 additions & 0 deletions charts/elemental/103.4.1+up1.6.5/README.md
Original file line number Diff line number Diff line change
@@ -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/).
5 changes: 5 additions & 0 deletions charts/elemental/103.4.1+up1.6.5/app-readme.md
Original file line number Diff line number Diff line change
@@ -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/).
27 changes: 27 additions & 0 deletions charts/elemental/103.4.1+up1.6.5/questions.yaml
Original file line number Diff line number Diff line change
@@ -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"
17 changes: 17 additions & 0 deletions charts/elemental/103.4.1+up1.6.5/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -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 -}}
9 changes: 9 additions & 0 deletions charts/elemental/103.4.1+up1.6.5/templates/apiservice.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
kind: APIService
apiVersion: management.cattle.io/v3
metadata:
name: {{ .Release.Name }}
spec:
secretName: elemental-operator
secretNamespace: {{ .Release.Namespace }}
pathPrefixes:
- /elemental/
10 changes: 10 additions & 0 deletions charts/elemental/103.4.1+up1.6.5/templates/capi_rbac.yaml
Original file line number Diff line number Diff line change
@@ -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: ["*"]
13 changes: 13 additions & 0 deletions charts/elemental/103.4.1+up1.6.5/templates/channel-dev.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
30 changes: 30 additions & 0 deletions charts/elemental/103.4.1+up1.6.5/templates/channels.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
Loading

0 comments on commit d7456fe

Please sign in to comment.