Support charts from GitRepository sources

fluxcd · Sep 1, 2020 · a165ff6 · a165ff6
1 parent 3413c76
commit a165ff6
Show file tree

Hide file tree

Showing 37 changed files with 444 additions and 219 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -61,6 +61,7 @@ jobs:
         run: |
           kubectl -n helm-system apply -f config/testdata/podinfo/
           kubectl -n helm-system wait helmreleases/podinfo --for=condition=ready --timeout=4m
+          kubectl -n helm-system wait helmreleases/podinfo-git --for=condition=ready --timeout=4m
       - name: Run dependency tests
         run: |
           kubectl -n helm-system apply -f config/testdata/dependencies

diff --git a/api/v2alpha1/helmrelease_types.go b/api/v2alpha1/helmrelease_types.go
@@ -32,7 +32,8 @@ const HelmReleaseFinalizer = "finalizers.fluxcd.io"
 
 // HelmReleaseSpec defines the desired state of HelmRelease.
 type HelmReleaseSpec struct {
-	// Chart defines the Helm chart name, version and repository.
+	// Chart defines the template of the v1alpha1.HelmChart that should be created
+	// for this HelmRelease.
 	// +required
 	Chart HelmChartTemplate `json:"chart"`
 
@@ -139,41 +140,49 @@ func (in HelmReleaseSpec) GetUninstall() Uninstall {
 	return *in.Uninstall
 }
 
-// HelmChartTemplate defines the template from which the controller
-// will generate a HelmChart object in the same namespace as the HelmRepository.
+// HelmChartTemplate defines the template from which the controller will generate a
+// v1alpha1.HelmChart object in the same namespace as the referenced v1alpha1.Source.
 type HelmChartTemplate struct {
-	// Name of the Helm chart, as made available by the referenced Helm repository.
 	// +required
-	Name string `json:"name"`
+	Spec HelmChartTemplateSpec `json:"spec"`
+}
+
+type HelmChartTemplateSpec struct {
+	// The name or path the Helm chart is available at in the SourceRef.
+	// +required
+	Chart string `json:"chart"`
 
-	// Version semver expression, defaults to latest when omitted.
+	// Version semver expression, ignored for charts from GitRepository sources.
+	// Defaults to latest when omitted.
 	// +optional
 	Version string `json:"version,omitempty"`
 
-	// The name and namespace of the source HelmRepository the chart is available at.
+	// The name and namespace of the v1alpha1.Source the chart is available at.
 	// +required
 	SourceRef CrossNamespaceObjectReference `json:"sourceRef"`
 
-	// Interval at which to check the Helm repository for chart updates.
+	// Interval at which to check the v1alpha1.Source for updates.
 	// Defaults to 'HelmReleaseSpec.Interval'.
 	// +optional
 	Interval *metav1.Duration `json:"interval,omitempty"`
 }
 
-// GetInterval returns the configured interval for the HelmChart, or the given default.
+// GetInterval returns the configured interval for the v1alpha1.HelmChart,
+// or the given default.
 func (in HelmChartTemplate) GetInterval(defaultInterval metav1.Duration) metav1.Duration {
-	if in.Interval == nil {
+	if in.Spec.Interval == nil {
 		return defaultInterval
 	}
-	return *in.Interval
+	return *in.Spec.Interval
 }
 
-// GetNamespace returns the namespace targeted namespace for the HelmChart, or the given default.
+// GetNamespace returns the namespace targeted namespace for the v1alpha1.HelmChart,
+// or the given default.
 func (in HelmChartTemplate) GetNamespace(defaultNamespace string) string {
-	if in.SourceRef.Namespace == "" {
+	if in.Spec.SourceRef.Namespace == "" {
 		return defaultNamespace
 	}
-	return in.SourceRef.Namespace
+	return in.Spec.SourceRef.Namespace
 }
 
 // DeploymentAction defines a consistent interface for Install and Upgrade.

diff --git a/api/v2alpha1/reference_types.go b/api/v2alpha1/reference_types.go
@@ -24,7 +24,7 @@ type CrossNamespaceObjectReference struct {
 	APIVersion string `json:"apiVersion,omitempty"`
 
 	// Kind of the referent.
-	// +kubebuilder:validation:Enum=HelmRepository
+	// +kubebuilder:validation:Enum=HelmRepository;GitRepository
 	// +required
 	Kind string `json:"kind,omitempty"`
 

diff --git a/api/v2alpha1/zz_generated.deepcopy.go b/api/v2alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml b/config/crd/bases/helm.toolkit.fluxcd.io_helmreleases.yaml
@@ -49,44 +49,51 @@ spec:
             description: HelmReleaseSpec defines the desired state of HelmRelease.
             properties:
               chart:
-                description: Chart defines the Helm chart name, version and repository.
+                description: Chart defines the template of the v1alpha1.HelmChart
+                  that should be created for this HelmRelease.
                 properties:
-                  interval:
-                    description: Interval at which to check the Helm repository for
-                      chart updates. Defaults to 'HelmReleaseSpec.Interval'.
-                    type: string
-                  name:
-                    description: Name of the Helm chart, as made available by the
-                      referenced Helm repository.
-                    type: string
-                  sourceRef:
-                    description: The name and namespace of the source HelmRepository
-                      the chart is available at.
+                  spec:
                     properties:
-                      apiVersion:
-                        description: APIVersion of the referent.
+                      chart:
+                        description: The name or path the Helm chart is available
+                          at in the SourceRef.
                         type: string
-                      kind:
-                        description: Kind of the referent.
-                        enum:
-                        - HelmRepository
+                      interval:
+                        description: Interval at which to check the v1alpha1.Source
+                          for updates. Defaults to 'HelmReleaseSpec.Interval'.
                         type: string
-                      name:
-                        description: Name of the referent.
-                        type: string
-                      namespace:
-                        description: Namespace of the referent.
+                      sourceRef:
+                        description: The name and namespace of the v1alpha1.Source
+                          the chart is available at.
+                        properties:
+                          apiVersion:
+                            description: APIVersion of the referent.
+                            type: string
+                          kind:
+                            description: Kind of the referent.
+                            enum:
+                            - HelmRepository
+                            - GitRepository
+                            type: string
+                          name:
+                            description: Name of the referent.
+                            type: string
+                          namespace:
+                            description: Namespace of the referent.
+                            type: string
+                        required:
+                        - name
+                        type: object
+                      version:
+                        description: Version semver expression, ignored for charts
+                          from GitRepository sources. Defaults to latest when omitted.
                         type: string
                     required:
-                    - name
+                    - chart
+                    - sourceRef
                     type: object
-                  version:
-                    description: Version semver expression, defaults to latest when
-                      omitted.
-                    type: string
                 required:
-                - name
-                - sourceRef
+                - spec
                 type: object
               dependsOn:
                 description: DependsOn may contain a list of HelmReleases that must

diff --git a/config/default/kustomization.yaml b/config/default/kustomization.yaml
@@ -5,6 +5,6 @@ resources:
 - ../crd
 - ../rbac
 - ../manager
-- github.com/fluxcd/source-controller/config//crd?ref=v0.0.9
-- github.com/fluxcd/source-controller/config//manager?ref=v0.0.9
+- github.com/fluxcd/source-controller/config//crd?ref=v0.0.13
+- github.com/fluxcd/source-controller/config//manager?ref=v0.0.13
 - namespace.yaml
diff --git a/config/samples/helm_v2alpha1_helmrelease.yaml b/config/samples/helm_v2alpha1_helmrelease.yaml
diff --git a/config/samples/helm_v2alpha1_helmrelease_gitrepository.yaml b/config/samples/helm_v2alpha1_helmrelease_gitrepository.yaml
@@ -0,0 +1,18 @@
+apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+kind: HelmRelease
+metadata:
+  name: podinfo-gitrepository
+spec:
+  interval: 5m
+  chart:
+    spec:
+      chart: ./charts/podinfo
+      sourceRef:
+        kind: GitRepository
+        name: podinfo
+      interval: 1m
+  upgrade:
+    remediation:
+      remediateLastFailure: true
+  test:
+    enable: true
diff --git a/config/samples/helm_v2alpha1_helmrelease_helmrepository.yaml b/config/samples/helm_v2alpha1_helmrelease_helmrepository.yaml
@@ -0,0 +1,19 @@
+apiVersion: helm.toolkit.fluxcd.io/v2alpha1
+kind: HelmRelease
+metadata:
+  name: podinfo-helmrepository
+spec:
+  interval: 5m
+  chart:
+    spec:
+      chart: podinfo
+      version: '>=4.0.0 <5.0.0'
+      sourceRef:
+        kind: HelmRepository
+        name: podinfo
+      interval: 1m
+  upgrade:
+    remediation:
+      remediateLastFailure: true
+  test:
+    enable: true
diff --git a/config/samples/source_v1alpha1_gitrepository.yaml b/config/samples/source_v1alpha1_gitrepository.yaml
@@ -0,0 +1,9 @@
+apiVersion: source.toolkit.fluxcd.io/v1alpha1
+kind: GitRepository
+metadata:
+  name: podinfo
+spec:
+  interval: 1m
+  url: https://github.com/stefanprodan/podinfo
+  ref:
+    branch: master
diff --git a/...ig/samples/source_v1alpha1_helmchart.yaml → ...mples/source_v1alpha1_helmrepository.yaml b/...ig/samples/source_v1alpha1_helmchart.yaml → ...mples/source_v1alpha1_helmrepository.yaml
diff --git a/config/testdata/dependencies/helmrelease-backend.yaml b/config/testdata/dependencies/helmrelease-backend.yaml
@@ -5,12 +5,13 @@ metadata:
 spec:
   interval: 5m
   chart:
-    name: podinfo
-    version: '^4.0.0'
-    sourceRef:
-      kind: HelmRepository
-      name: webapp
-    interval: 1m
+    spec:
+      chart: podinfo
+      version: '>=4.0.0 <5.0.0'
+      sourceRef:
+        kind: HelmRepository
+        name: webapp
+      interval: 1m
   values:
     service:
       grpcService: backend

diff --git a/config/testdata/dependencies/helmrelease-frontend.yaml b/config/testdata/dependencies/helmrelease-frontend.yaml
@@ -5,12 +5,13 @@ metadata:
 spec:
   interval: 5m
   chart:
-    name: podinfo
-    version: '^4.0.0'
-    sourceRef:
-      kind: HelmRepository
-      name: webapp
-    interval: 1m
+    spec:
+      chart: podinfo
+      version: '>=4.0.0 <5.0.0'
+      sourceRef:
+        kind: HelmRepository
+        name: webapp
+      interval: 1m
   dependsOn:
     - backend
   values:

diff --git a/config/testdata/install-fail-remediate/helmrelease.yaml b/config/testdata/install-fail-remediate/helmrelease.yaml
@@ -5,12 +5,13 @@ metadata:
 spec:
   interval: 5m
   chart:
-    name: podinfo
-    version: '^4.0.0'
-    sourceRef:
-      kind: HelmRepository
-      name: podinfo
-    interval: 1m
+    spec:
+      chart: podinfo
+      version: '>=4.0.0 <5.0.0'
+      sourceRef:
+        kind: HelmRepository
+        name: podinfo
+      interval: 1m
   install:
     remediation:
       remediateLastFailure: true

diff --git a/config/testdata/install-fail-retry/helmrelease.yaml b/config/testdata/install-fail-retry/helmrelease.yaml
@@ -5,12 +5,13 @@ metadata:
 spec:
   interval: 5m
   chart:
-    name: podinfo
-    version: '^4.0.0'
-    sourceRef:
-      kind: HelmRepository
-      name: podinfo
-    interval: 1m
+    spec:
+      chart: podinfo
+      version: '>=4.0.0 <5.0.0'
+      sourceRef:
+        kind: HelmRepository
+        name: podinfo
+      interval: 1m
   install:
     remediation:
       retries: 1

diff --git a/config/testdata/install-fail/helmrelease.yaml b/config/testdata/install-fail/helmrelease.yaml
@@ -5,12 +5,13 @@ metadata:
 spec:
   interval: 5m
   chart:
-    name: podinfo
-    version: '^4.0.0'
-    sourceRef:
-      kind: HelmRepository
-      name: podinfo
-    interval: 1m
+    spec:
+      chart: podinfo
+      version: '>=4.0.0 <5.0.0'
+      sourceRef:
+        kind: HelmRepository
+        name: podinfo
+      interval: 1m
   values:
     resources:
       requests: