refactor(staging): Add flux ocirepositories

szinn · Mar 4, 2025 · cc4cfba · cc4cfba
1 parent 79ac35d
commit cc4cfba
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 19 deletions.
diff --git a/kubernetes/repositories/oci/flux-instance.yaml b/kubernetes/repositories/oci/flux-instance.yaml
@@ -0,0 +1,17 @@
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1beta2.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: flux-instance
+  namespace: flux-system
+spec:
+  interval: 1h
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 0.17.0
+  url: oci://ghcr.io/controlplaneio-fluxcd/charts/flux-instance
+  verify:
+    provider: cosign
diff --git a/kubernetes/repositories/oci/flux-operator.yaml b/kubernetes/repositories/oci/flux-operator.yaml
@@ -0,0 +1,17 @@
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/ocirepository_v1beta2.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  name: flux-operator
+  namespace: flux-system
+spec:
+  interval: 1h
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 0.17.0
+  url: oci://ghcr.io/controlplaneio-fluxcd/charts/flux-operator
+  verify:
+    provider: cosign
diff --git a/kubernetes/repositories/oci/kustomization.yaml b/kubernetes/repositories/oci/kustomization.yaml
@@ -4,4 +4,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
   - app-template.yaml
+  - flux-instance.yaml
+  - flux-operator.yaml
   - k8s-ycl.yaml
diff --git a/kubernetes/staging/apps/flux-system/flux-operator/install.yaml b/kubernetes/staging/apps/flux-system/flux-operator/install.yaml
@@ -10,7 +10,7 @@ spec:
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/staging/apps/flux-system/flux-operator/app
+  path: ./kubernetes/staging/apps/flux-system/flux-operator/operator
   sourceRef:
     kind: GitRepository
     name: flux-system

diff --git a/kubernetes/staging/apps/flux-system/flux-operator/instance/helmrelease.yaml b/kubernetes/staging/apps/flux-system/flux-operator/instance/helmrelease.yaml
@@ -5,15 +5,11 @@ kind: HelmRelease
 metadata:
   name: flux-instance
 spec:
-  interval: 30m
-  chart:
-    spec:
-      chart: flux-instance
-      version: 0.17.0
-      sourceRef:
-        kind: HelmRepository
-        name: controlplaneio-charts
-        namespace: flux-system
+  interval: 1h
+  chartRef:
+    kind: OCIRepository
+    name: flux-instance
+    namespace: flux-system
   install:
     remediation:
       retries: 3

diff --git a/...system/flux-operator/app/helmrelease.yaml → ...m/flux-operator/operator/helmrelease.yaml b/...system/flux-operator/app/helmrelease.yaml → ...m/flux-operator/operator/helmrelease.yaml
@@ -5,15 +5,11 @@ kind: HelmRelease
 metadata:
   name: flux-operator
 spec:
-  interval: 30m
-  chart:
-    spec:
-      chart: flux-operator
-      version: 0.17.0
-      sourceRef:
-        kind: HelmRepository
-        name: controlplaneio-charts
-        namespace: flux-system
+  interval: 1h
+  chartRef:
+    kind: OCIRepository
+    name: flux-operator
+    namespace: flux-system
   install:
     remediation:
       retries: 3

diff --git a/...stem/flux-operator/app/kustomization.yaml → ...flux-operator/operator/kustomization.yaml b/...stem/flux-operator/app/kustomization.yaml → ...flux-operator/operator/kustomization.yaml
diff --git a/...em/flux-operator/app/kustomizeconfig.yaml → ...ux-operator/operator/kustomizeconfig.yaml b/...em/flux-operator/app/kustomizeconfig.yaml → ...ux-operator/operator/kustomizeconfig.yaml
diff --git a/...flux-system/flux-operator/app/values.yaml → ...system/flux-operator/operator/values.yaml b/...flux-system/flux-operator/app/values.yaml → ...system/flux-operator/operator/values.yaml