From 598f2a4201d171306c1680d491424a01ec21eb78 Mon Sep 17 00:00:00 2001 From: Scotte Zinn Date: Tue, 4 Mar 2025 06:48:27 -0500 Subject: [PATCH] refactor(staging): Add flux ocirepositories (#5275) --- kubernetes/repositories/oci/flux-instance.yaml | 17 +++++++++++++++++ kubernetes/repositories/oci/flux-operator.yaml | 17 +++++++++++++++++ kubernetes/repositories/oci/kustomization.yaml | 2 ++ .../apps/flux-system/flux-operator/install.yaml | 2 +- .../flux-operator/instance/helmrelease.yaml | 14 +++++--------- .../{app => operator}/helmrelease.yaml | 14 +++++--------- .../{app => operator}/kustomization.yaml | 0 .../{app => operator}/kustomizeconfig.yaml | 0 .../flux-operator/{app => operator}/values.yaml | 0 9 files changed, 47 insertions(+), 19 deletions(-) create mode 100644 kubernetes/repositories/oci/flux-instance.yaml create mode 100644 kubernetes/repositories/oci/flux-operator.yaml rename kubernetes/staging/apps/flux-system/flux-operator/{app => operator}/helmrelease.yaml (67%) rename kubernetes/staging/apps/flux-system/flux-operator/{app => operator}/kustomization.yaml (100%) rename kubernetes/staging/apps/flux-system/flux-operator/{app => operator}/kustomizeconfig.yaml (100%) rename kubernetes/staging/apps/flux-system/flux-operator/{app => operator}/values.yaml (100%) diff --git a/kubernetes/repositories/oci/flux-instance.yaml b/kubernetes/repositories/oci/flux-instance.yaml new file mode 100644 index 0000000000..f71b28e8d5 --- /dev/null +++ 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 new file mode 100644 index 0000000000..f2c4425cc0 --- /dev/null +++ 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 index 2b9cd7da35..8472627f70 100644 --- 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 index 574c9cdf0b..c0a7bc3984 100644 --- 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 index d53b0d6e8a..8cb5cf1d7e 100644 --- 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/kubernetes/staging/apps/flux-system/flux-operator/app/helmrelease.yaml b/kubernetes/staging/apps/flux-system/flux-operator/operator/helmrelease.yaml similarity index 67% rename from kubernetes/staging/apps/flux-system/flux-operator/app/helmrelease.yaml rename to kubernetes/staging/apps/flux-system/flux-operator/operator/helmrelease.yaml index fe1bc365b9..81feb30201 100644 --- a/kubernetes/staging/apps/flux-system/flux-operator/app/helmrelease.yaml +++ b/kubernetes/staging/apps/flux-system/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/kubernetes/staging/apps/flux-system/flux-operator/app/kustomization.yaml b/kubernetes/staging/apps/flux-system/flux-operator/operator/kustomization.yaml similarity index 100% rename from kubernetes/staging/apps/flux-system/flux-operator/app/kustomization.yaml rename to kubernetes/staging/apps/flux-system/flux-operator/operator/kustomization.yaml diff --git a/kubernetes/staging/apps/flux-system/flux-operator/app/kustomizeconfig.yaml b/kubernetes/staging/apps/flux-system/flux-operator/operator/kustomizeconfig.yaml similarity index 100% rename from kubernetes/staging/apps/flux-system/flux-operator/app/kustomizeconfig.yaml rename to kubernetes/staging/apps/flux-system/flux-operator/operator/kustomizeconfig.yaml diff --git a/kubernetes/staging/apps/flux-system/flux-operator/app/values.yaml b/kubernetes/staging/apps/flux-system/flux-operator/operator/values.yaml similarity index 100% rename from kubernetes/staging/apps/flux-system/flux-operator/app/values.yaml rename to kubernetes/staging/apps/flux-system/flux-operator/operator/values.yaml