Merge pull request #1 from stefanprodan/vendor-helm-chart

Vendor the Helm chart in the local registry
fluxcd · Nov 22, 2023 · 3bb0130 · 3bb0130
2 parents e0a07b1 + 6a47c1d
commit 3bb0130
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 7 deletions.
diff --git a/Brewfile b/Brewfile
@@ -2,6 +2,7 @@
 brew "kubectl"
 brew "kind"
 brew "helm"
+brew "crane"
 
 # Flux
 tap "fluxcd/tap"

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ git clone https://github.com/stefanprodan/flux-benchmark.git
 cd flux-benchmark
 ```
 
-Install Kubernetes kind, flux, timoni and other CLI tools with Homebrew:
+Install Kubernetes kind, flux, timoni, crane and other CLI tools with Homebrew:
 
 ```shell
 make tools

diff --git a/manifests/bases/source-controller/kustomization.yaml b/manifests/bases/source-controller/kustomization.yaml
@@ -1,7 +1,8 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-- https://github.com/fluxcd/source-controller/releases/download/v1.1.2/source-controller.crds.yaml
+#- https://github.com/fluxcd/source-controller/releases/download/v1.1.2/source-controller.crds.yaml
+- https://github.com/fluxcd/source-controller/config/crd?ref=helm-repo-insecure
 - https://github.com/fluxcd/source-controller/releases/download/v1.1.2/source-controller.deployment.yaml
 - account.yaml
 transformers:

diff --git a/manifests/install/kustomization.yaml b/manifests/install/kustomization.yaml
@@ -16,11 +16,12 @@ transformers:
 images:
   - name: fluxcd/source-controller
     newName: ghcr.io/fluxcd/source-controller
+    newTag: preview-4b230f30
   - name: fluxcd/kustomize-controller
     newName: ghcr.io/fluxcd/kustomize-controller
   - name: fluxcd/helm-controller
     newName: ghcr.io/fluxcd/helm-controller
-    newTag: v2beta2-07bf73ee
+    newTag: v2beta2-c520a3e7
   - name: fluxcd/notification-controller
     newName: ghcr.io/fluxcd/notification-controller
   - name: fluxcd/image-reflector-controller

diff --git a/scripts/timoni-push.sh b/scripts/timoni-push.sh
@@ -7,3 +7,4 @@ repo_root=$(git rev-parse --show-toplevel)
 timoni mod push $repo_root/timoni/modules/flux-hr-bench oci://localhost:5555/modules/flux-hr-bench -v 1.0.0
 timoni mod push $repo_root/timoni/modules/flux-ks-bench oci://localhost:5555/modules/flux-ks-bench -v 1.0.0
 timoni artifact push oci://localhost:5555/manifests/podinfo -f $repo_root/manifests/podinfo -t 1.0.0 -t latest
+crane copy ghcr.io/stefanprodan/charts/podinfo:6.5.3 localhost:5555/charts/podinfo:6.5.3
diff --git a/timoni/bundles/flux-benchmark.cue b/timoni/bundles/flux-benchmark.cue
@@ -23,7 +23,7 @@ bundle: {
 				values: {
 					chart: {
 						name:     "podinfo"
-						version:  "6.5.3"
+						version:  "*"
 						interval: 60
 					}
 					releases: _hr

diff --git a/...s/flux-hr-bench/cue.mod/gen/source.toolkit.fluxcd.io/helmrepository/v1beta1/types_gen.cue b/...s/flux-hr-bench/cue.mod/gen/source.toolkit.fluxcd.io/helmrepository/v1beta1/types_gen.cue
@@ -1,6 +1,6 @@
 // Code generated by timoni. DO NOT EDIT.
 
-//timoni:generate timoni vendor crd -f https://github.com/fluxcd/source-controller/releases/download/v1.1.2/source-controller.crds.yaml
+//timoni:generate timoni vendor crd -f https://raw.githubusercontent.com/fluxcd/source-controller/helm-repo-insecure/config/crd/bases/source.toolkit.fluxcd.io_helmrepositories.yaml
 
 package v1beta1
 

diff --git a/...s/flux-hr-bench/cue.mod/gen/source.toolkit.fluxcd.io/helmrepository/v1beta2/types_gen.cue b/...s/flux-hr-bench/cue.mod/gen/source.toolkit.fluxcd.io/helmrepository/v1beta2/types_gen.cue
@@ -1,6 +1,6 @@
 // Code generated by timoni. DO NOT EDIT.
 
-//timoni:generate timoni vendor crd -f https://github.com/fluxcd/source-controller/releases/download/v1.1.2/source-controller.crds.yaml
+//timoni:generate timoni vendor crd -f https://raw.githubusercontent.com/fluxcd/source-controller/helm-repo-insecure/config/crd/bases/source.toolkit.fluxcd.io_helmrepositories.yaml
 
 package v1beta2
 
@@ -64,6 +64,11 @@ import "strings"
 		name: string
 	}
 
+	// Insecure allows connecting to a non-TLS HTTP container
+	// registry. This field is only taken into account if the
+	// .spec.type field is set to 'oci'.
+	insecure?: bool
+
 	// Interval at which the HelmRepository URL is checked for
 	// updates. This interval is approximate and may be subject to
 	// jitter to ensure efficient use of resources.

diff --git a/timoni/modules/flux-hr-bench/templates/config.cue b/timoni/modules/flux-hr-bench/templates/config.cue
@@ -21,7 +21,7 @@ import (
 	role: "namespace-admin" | "cluster-admin" | *"namespace-admin"
 
 	repository: {
-		url:  string | *"oci://ghcr.io/stefanprodan/charts"
+		url:  string | *"oci://flux-registry:5000/charts"
 		type: string | *"oci"
 	}
 

diff --git a/timoni/modules/flux-hr-bench/templates/helmrepository.cue b/timoni/modules/flux-hr-bench/templates/helmrepository.cue
@@ -10,6 +10,7 @@ import (
 	spec:     fluxv1.#HelmRepositorySpec & {
 		interval: "12h"
 		timeout:  "2m"
+		insecure: true
 
 		url:  _config.repository.url
 		type: _config.repository.type