From 0ddf7bb85399f298ce450dd00ac688075f09aba1 Mon Sep 17 00:00:00 2001
From: Thomas Vitale <ThomasVitale@users.noreply.github.com>
Date: Sun, 3 Sep 2023 15:19:09 +0200
Subject: [PATCH] Use new Flux package

Fixes gh-30
---
 README.md                                        |  2 +-
 .../{fluxcd-source.controller.yml => flux.yml}   | 16 ++++++++--------
 package/config/values-schema.yml                 |  8 +++-----
 test/integration/serving/config/values.yml       |  1 +
 4 files changed, 13 insertions(+), 14 deletions(-)
 rename package/config/{fluxcd-source.controller.yml => flux.yml} (64%)

diff --git a/README.md b/README.md
index 0d5dbd7..a19487a 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ Each Kadras package included in the platform can be configured independently.
 | `cert_manager.issuers` | `{}` | Configuration for the Cert Manager Issuers package. |
 | `contour` | `{}` | Configuration for the Contour package. |
 | `conventions.spring_boot` | `{}` | Configuration for the Spring Boot Conventions package. |
-| `flux.source_controller` | `{}` | Configuration for the FluxCD Source Controller package. |
+| `flux` | `{}` | Configuration for the Flux package. |
 | `knative.serving` | `{}` | Configuration for the Knative Serving package. |
 | `kyverno.core` | `{}` | Configuration for the Kyverno package. |
 | `metrics_server` | `{}` | Configuration for the Metrics Server package. |
diff --git a/package/config/fluxcd-source.controller.yml b/package/config/flux.yml
similarity index 64%
rename from package/config/fluxcd-source.controller.yml
rename to package/config/flux.yml
index bdec9f7..d4878e9 100644
--- a/package/config/fluxcd-source.controller.yml
+++ b/package/config/flux.yml
@@ -3,35 +3,35 @@
 #@ load("@ytt:yaml", "yaml")
 #@ load("/helpers.star", "is_any_profile_enabled", "is_package_enabled", "profiles")
 
-#@ if is_package_enabled("fluxcd-source-controller") and is_any_profile_enabled([profiles.full]):
+#@ if is_package_enabled("flux") and is_any_profile_enabled([profiles.full, profiles.serving]):
 
 #@ def compute_package_values():
-#@   return data.values.flux.source_controller
+#@   return data.values.flux
 #@ end
 
 ---
 apiVersion: packaging.carvel.dev/v1alpha1
 kind: PackageInstall
 metadata:
-  name: fluxcd-source-controller
+  name: flux
   namespace: #@ data.values.platform.namespace
   annotations:
-    kapp.k14s.io/change-group: fluxcd
+    kapp.k14s.io/change-group: flux
     kapp.k14s.io/change-rule.serviceaccount: delete before deleting serviceaccount
 spec:
   serviceAccountName: kadras-install-sa
   packageRef:
-    refName: fluxcd-source-controller.packages.kadras.io
+    refName: flux.packages.kadras.io
     versionSelection:
-      constraints: 1.0.1+kadras.1
+      constraints: 2.1.0+kadras.1
   values:
     - secretRef:
-        name: fluxcd-source-controller-values
+        name: flux-values
 ---
 apiVersion: v1
 kind: Secret
 metadata:
-  name: fluxcd-source-controller-values
+  name: flux-values
   namespace: #@ data.values.platform.namespace
 stringData:
   values.yaml: #@ yaml.encode(compute_package_values())
diff --git a/package/config/values-schema.yml b/package/config/values-schema.yml
index 97bb729..ed53f90 100644
--- a/package/config/values-schema.yml
+++ b/package/config/values-schema.yml
@@ -119,11 +119,9 @@ conventions:
   #@schema/type any=True
   spring_boot: {}
 
-#@schema/desc "Configuration for Flux related packages."
-flux:
-  #@schema/desc "Configuration for the FluxCD Source Controller package."
-  #@schema/type any=True
-  source_controller: {}
+#@schema/desc "Configuration for the Flux package."
+#@schema/type any=True
+flux: {}
 
 #@schema/desc "Configuration for Knative related packages."
 knative:
diff --git a/test/integration/serving/config/values.yml b/test/integration/serving/config/values.yml
index 387b15d..af1d3f4 100644
--- a/test/integration/serving/config/values.yml
+++ b/test/integration/serving/config/values.yml
@@ -12,4 +12,5 @@ stringData:
       ingress:
         domain: 127.0.0.1.sslip.io
       excluded_packages:
+        - flux
         - kyverno