Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issue with collecting OCIRepositories during diff #772

Merged
merged 2 commits into from
Aug 7, 2024
Merged

Conversation

allenporter
Copy link
Owner

@allenporter allenporter commented Aug 7, 2024

Adding additional repository examples, but they don't reproduce the issue.

Copy link
Contributor

github-actions bot commented Aug 7, 2024

--- tests/testdata/cluster7/flux/charts Kustomization: flux-system/charts OCIRepository: flux-system/app-template

+++ tests/testdata/cluster7/flux/charts Kustomization: flux-system/charts OCIRepository: flux-system/app-template

@@ -0,0 +1,18 @@

+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  labels:
+    kustomize.toolkit.fluxcd.io/name: charts
+    kustomize.toolkit.fluxcd.io/namespace: flux-system
+  name: app-template
+  namespace: flux-system
+spec:
+  interval: 12h
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 3.3.2
+  url: oci://ghcr.io/bjw-s/helm/app-template
+
--- tests/testdata/cluster7/flux/apps Kustomization: flux-system/apps HelmRelease: flux-system/cloudflared

+++ tests/testdata/cluster7/flux/apps Kustomization: flux-system/apps HelmRelease: flux-system/cloudflared

@@ -0,0 +1,23 @@

+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  labels:
+    kustomize.toolkit.fluxcd.io/name: apps
+    kustomize.toolkit.fluxcd.io/namespace: flux-system
+  name: cloudflared
+  namespace: flux-system
+spec:
+  chartRef:
+    kind: OCIRepository
+    name: app-template
+    namespace: flux-system
+  install:
+    remediation:
+      retries: 3
+  interval: 60m
+  upgrade:
+    cleanupOnFail: true
+    remediation:
+      retries: 3
+

Copy link
Contributor

github-actions bot commented Aug 7, 2024

--- tests/testdata/cluster7/flux/charts Kustomization: flux-system/charts OCIRepository: flux-system/app-template

+++ tests/testdata/cluster7/flux/charts Kustomization: flux-system/charts OCIRepository: flux-system/app-template

@@ -0,0 +1,18 @@

+---
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: OCIRepository
+metadata:
+  labels:
+    kustomize.toolkit.fluxcd.io/name: charts
+    kustomize.toolkit.fluxcd.io/namespace: flux-system
+  name: app-template
+  namespace: flux-system
+spec:
+  interval: 12h
+  layerSelector:
+    mediaType: application/vnd.cncf.helm.chart.content.v1.tar+gzip
+    operation: copy
+  ref:
+    tag: 3.3.2
+  url: oci://ghcr.io/bjw-s/helm/app-template
+
--- tests/testdata/cluster7/flux/apps Kustomization: flux-system/apps HelmRelease: flux-system/cloudflared

+++ tests/testdata/cluster7/flux/apps Kustomization: flux-system/apps HelmRelease: flux-system/cloudflared

@@ -0,0 +1,23 @@

+---
+apiVersion: helm.toolkit.fluxcd.io/v2
+kind: HelmRelease
+metadata:
+  labels:
+    kustomize.toolkit.fluxcd.io/name: apps
+    kustomize.toolkit.fluxcd.io/namespace: flux-system
+  name: cloudflared
+  namespace: flux-system
+spec:
+  chartRef:
+    kind: OCIRepository
+    name: app-template
+    namespace: flux-system
+  install:
+    remediation:
+      retries: 3
+  interval: 60m
+  upgrade:
+    cleanupOnFail: true
+    remediation:
+      retries: 3
+

@codecov-commenter
Copy link

codecov-commenter commented Aug 7, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 93.22%. Comparing base (18bb03c) to head (a898dab).

Additional details and impacted files
@@           Coverage Diff           @@
##             main     #772   +/-   ##
=======================================
  Coverage   93.21%   93.22%           
=======================================
  Files          20       20           
  Lines        2227     2229    +2     
=======================================
+ Hits         2076     2078    +2     
  Misses        151      151           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@allenporter allenporter changed the title Test app-template oci repository example Fix issue with collecting OCIRepositories during diff Aug 7, 2024
@allenporter allenporter merged commit a7a655c into main Aug 7, 2024
39 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants