feat(chart): Migrate Apps to HelmReleases.

.abs/ct.yaml

@@ -1,2 +1,3 @@
 chart-repos:
 - cluster-catalog=https://giantswarm.github.io/cluster-catalog
+- cluster-test-catalog=https://giantswarm.github.io/cluster-test-catalog

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - CI: Run the full set of E2E test suites automatically on release PRs, via `.github/release-pr-body.md`. Towards https://github.com/giantswarm/roadmap/issues/4334
 
+### Changed
+
+- Chart: Migrate Apps to HelmReleases.
+
 ## [3.0.0] - 2026-08-05
 
 ### Changed

helm/cluster-eks/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: cluster
-  repository: https://giantswarm.github.io/cluster-catalog
-  version: 7.0.0
-digest: sha256:b1971f0a99f42529ed3db7813ad8733bb5eb8b88b9466b13f2887b33e530f25e
-generated: "2026-08-04T16:37:38.471331591Z"
+  repository: https://giantswarm.github.io/cluster-test-catalog
+  version: 7.0.1-dev.migrate-app--elmreleases.2026-08-12.04-26-42.h82cca4e
+digest: sha256:2c0dabf890a88a927b8f0f9df0d3d3bfaa558abddeeaa23e06c2c914596394e8
+generated: "2026-08-12T04:28:18.46402263Z"

helm/cluster-eks/Chart.yaml

@@ -1,21 +1,25 @@
 apiVersion: v2
 name: cluster-eks
-home: https://github.com/giantswarm/cluster-eks
-sources:
-  - https://github.com/giantswarm/cluster-eks
-description: A helm chart for creating Cluster API EKS clusters with the AWS infrastructure provider (CAPA).
-icon: https://s.giantswarm.io/app-icons/aws/2/dark.svg
-type: application
+description: A helm chart for creating Cluster API EKS clusters with the AWS provider (CAPA).
 version: 3.0.0
 appVersion: 3.0.0
+home: https://github.com/giantswarm/cluster-eks
+icon: https://s.giantswarm.io/app-icons/aws/2/dark.svg
+sources:
+- https://github.com/giantswarm/cluster-eks
+maintainers:
+- name: Team Phoenix
+  email: team-phoenix@giantswarm.io
+keywords:
+- capa
+- aws
 annotations:
-  application.giantswarm.io/team: "phoenix"
-  application.giantswarm.io/app-type: "cluster"
+  application.giantswarm.io/app-type: cluster
+  application.giantswarm.io/team: phoenix
 restrictions:
   compatibleProviders:
-    - aws
-    - capa
+  - aws
 dependencies:
-  - name: cluster
-    version: "7.0.0"
-    repository: https://giantswarm.github.io/cluster-catalog
+- repository: https://giantswarm.github.io/cluster-test-catalog
+  name: cluster
+  version: 7.0.1-dev.migrate-app--elmreleases.2026-08-12.04-26-42.h82cca4e

helm/cluster-eks/templates/helmreleases/aws-ebs-csi-driver-helmrelease.yaml

@@ -1,77 +1,101 @@
-{{/* Default Helm values for the app */}}
-{{/* See schema for the appropriate app version here https://github.com/giantswarm/aws-ebs-csi-driver-app/blob/master/helm/aws-ebs-csi-driver-bundle/values.schema.json */}}
-{{- define "defaultAwsEbsCsiDriverHelmValues" }}
-clusterID: {{ include "resource.default.name" $ }}
-clusterName: {{ include "resource.default.name" $ }}
+{{- define "defaultAwsEbsCsiDriverHelmValues" -}}
+clusterID: {{ include "resource.default.name" . }}
+clusterName: {{ include "resource.default.name" . }}
 extraVolumeTags: {{ include "resource.default.additionalTags" . | nindent 2 }}
 {{- if (.Values.global.connectivity.proxy).enabled }}
 proxy:
-  noProxy: "{{ include "cluster.connectivity.proxy.noProxy" (dict "global" $.Values.global "providerIntegration" $.Values.cluster.providerIntegration) }}"
   http: {{ .Values.global.connectivity.proxy.httpProxy | quote }}
   https: {{ .Values.global.connectivity.proxy.httpsProxy | quote }}
+  noProxy: {{ include "cluster.connectivity.proxy.noProxy" (dict "global" .Values.global "providerIntegration" .Values.cluster.providerIntegration) | quote }}
 {{- end }}
 global:
   image:
-    registry: {{ include "awsContainerImageRegistry" $ }}
+    registry: {{ include "awsContainerImageRegistry" . }}
   podSecurityStandards:
-    {{/* PolicyException CRD only available with security-bundle installed */}}
-    enforced: {{ and .Values.global.podSecurityStandards.enforced $.Values.cluster.providerIntegration.apps.securityBundle.enable }}
-{{- if not $.Values.cluster.providerIntegration.apps.verticalPodAutoscalerCrd.enable }}
+    {{- /* PolicyException CRD only available with security-bundle installed */}}
+    enforced: {{ and .Values.global.podSecurityStandards.enforced .Values.cluster.providerIntegration.apps.securityBundle.enable }}
+{{- if not .Values.cluster.providerIntegration.apps.verticalPodAutoscalerCrd.enable }}
 verticalPodAutoscaler:
   enabled: false
 {{- end }}
-{{- if not $.Values.cluster.providerIntegration.apps.observabilityBundle.enable }}
+{{- if not .Values.cluster.providerIntegration.apps.observabilityBundle.enable }}
 upstream:
   controller:
     enableMetrics: false
     serviceMonitor:
       forceEnable: false
 {{- end }}
 {{- end }}
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: {{ include "resource.default.name" . }}-aws-ebs-csi-driver-bundle
+  namespace: {{ .Release.Namespace }}
+  annotations:
+    cluster.giantswarm.io/description: {{ .Values.global.metadata.description | quote }}
+  labels:
+    cluster-apps-operator.giantswarm.io/watching: ""
+    {{- include "labels.common" . | nindent 4 }}
+spec:
+  {{- $_ := set $ "appName" "aws-ebs-csi-driver" }}
+  url: oci://gsoci.azurecr.io/charts/giantswarm/aws-ebs-csi-driver-bundle
+  ref:
+    tag: {{ include "cluster.app.version" . }}
+  interval: 24h
+  timeout: 60s
+---
 apiVersion: helm.toolkit.fluxcd.io/v2
 kind: HelmRelease
 metadata:
-  name: {{ include "resource.default.name" $ }}-aws-ebs-csi-driver-bundle
-  namespace: {{ $.Release.Namespace }}
+  name: {{ include "resource.default.name" . }}-aws-ebs-csi-driver-bundle
+  namespace: {{ .Release.Namespace }}
   annotations:
-    cluster.giantswarm.io/description: "{{ .Values.global.metadata.description }}"
+    cluster.giantswarm.io/description: {{ .Values.global.metadata.description | quote }}
   labels:
     cluster-apps-operator.giantswarm.io/watching: ""
     {{- include "labels.common" . | nindent 4 }}
 spec:
-  releaseName: {{ include "resource.default.name" $ }}-aws-ebs-csi-driver-bundle
-  targetNamespace: {{ $.Release.Namespace | quote }}
-  storageNamespace: {{ $.Release.Namespace | quote }}
-  chart:
-    spec:
-      chart: aws-ebs-csi-driver-bundle
-      {{- $_ := set $ "appName" "aws-ebs-csi-driver" }}
-      version: {{ include "cluster.app.version" $ }}
-      sourceRef:
-        kind: HelmRepository
-        name: {{ include "resource.default.name" $ }}-{{ include "cluster.app.catalog" $ }}
+  releaseName: {{ include "resource.default.name" . }}-aws-ebs-csi-driver-bundle
+  targetNamespace: {{ .Release.Namespace | quote }}
+  storageNamespace: {{ .Release.Namespace | quote }}
+  chartRef:
+    kind: OCIRepository
+    name: {{ include "resource.default.name" . }}-aws-ebs-csi-driver-bundle
   serviceAccountName: automation
+  {{- if or .Values.cluster.providerIntegration.apps.securityBundle.enable .Values.cluster.providerIntegration.apps.verticalPodAutoscalerCrd.enable }}
+  dependsOn:
+  {{- if .Values.cluster.providerIntegration.apps.securityBundle.enable }}
+  - name: {{ include "resource.default.name" . }}-kyverno-crds
+    namespace: {{ .Release.Namespace }}
+  {{- end }}
+  {{- if .Values.cluster.providerIntegration.apps.verticalPodAutoscalerCrd.enable }}
+  - name: {{ include "resource.default.name" . }}-vertical-pod-autoscaler-crd
+    namespace: {{ .Release.Namespace }}
+  {{- end }}
+  {{- end }}
   interval: 5m
   install:
     remediation:
       retries: -1
   upgrade:
     remediation:
       retries: -1
-  {{- $awsEbsCsiDriverHelmValues := (include "defaultAwsEbsCsiDriverHelmValues" .) | fromYaml -}}
-  {{- $customAwsEbsCsiDriverHelmValues := ((($.Values.global).apps).awsEbsCsiDriver).values -}}
+  {{- $awsEbsCsiDriverHelmValues := include "defaultAwsEbsCsiDriverHelmValues" . | fromYaml }}
+  {{- $customAwsEbsCsiDriverHelmValues := (((.Values.global).apps).awsEbsCsiDriver).values }}
   {{- if $customAwsEbsCsiDriverHelmValues }}
-  {{- $awsEbsCsiDriverHelmValues = merge (deepCopy $customAwsEbsCsiDriverHelmValues) $awsEbsCsiDriverHelmValues -}}
+  {{- $awsEbsCsiDriverHelmValues = merge (deepCopy $customAwsEbsCsiDriverHelmValues) $awsEbsCsiDriverHelmValues }}
   {{- end }}
   {{- if $awsEbsCsiDriverHelmValues }}
-  values: {{- $awsEbsCsiDriverHelmValues | toYaml | nindent 4 }}
+  values:
+    {{- $awsEbsCsiDriverHelmValues | toYaml | nindent 4 }}
   {{- end }}
-  {{- if ((($.Values.global).apps).awsEbsCsiDriver).extraConfigs }}
+  {{- if (((.Values.global).apps).awsEbsCsiDriver).extraConfigs }}
   valuesFrom:
-    {{- range $config := ((($.Values.global).apps).awsEbsCsiDriver).extraConfigs }}
-    - kind: {{ $config.kind }}
-      name: {{ $config.name }}
-      valuesKey: values
-      optional: {{ $config.optional | default false  }}
-    {{- end }}
+  {{- range $config := (((.Values.global).apps).awsEbsCsiDriver).extraConfigs }}
+  - kind: {{ $config.kind }}
+    name: {{ $config.name }}
+    valuesKey: values
+    optional: {{ $config.optional | default false }}
+  {{- end }}
   {{- end }}