fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #260 from fluxcd/watch-chart-sources 

Align HelmChart source indexer and watches
This commit is contained in:
Hidde Beydals 2021-01-18 17:25:24 +01:00 committed by GitHub
parent 97b6bed825 34c4290cda
commit 2c7c1888e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/v1beta1/source.go
View File

@ -21,15 +21,9 @@ import (
)
const (
// GitRepositoryIndexKey is the key used for indexing resources
// resources based on their GitRepository source.
GitRepositoryIndexKey string = ".metadata.gitRepository"
// HelmRepositoryIndexKey is the key used for indexing resources
// resources based on their HelmRepository source.
HelmRepositoryIndexKey string = ".meta.helmRepository"
// BucketIndexKey is the key used for indexing resources based on
// their Bucket source.
BucketIndexKey string = ".meta.bucket"
// SourceIndexKey is the key used for indexing resources
// resources based on their Source.
SourceIndexKey string = ".metadata.source"
)
// Source interface must be supported by all API types.

9
controllers/helmchart_controller.go
View File

@ -86,7 +86,7 @@ func (r *HelmChartReconciler) SetupWithManagerAndOptions(mgr ctrl.Manager, opts
r.indexHelmRepositoryByURL); err != nil {
return fmt.Errorf("failed setting index fields: %w", err)
}
if err := mgr.GetCache().IndexField(context.TODO(), &sourcev1.HelmChart{}, sourcev1.GitRepositoryIndexKey,
if err := mgr.GetCache().IndexField(context.TODO(), &sourcev1.HelmChart{}, sourcev1.SourceIndexKey,
r.indexHelmChartBySource); err != nil {
return fmt.Errorf("failed setting index fields: %w", err)
}
@ -845,7 +845,7 @@ func (r *HelmChartReconciler) requestsForHelmRepositoryChange(o client.Object) [
ctx := context.Background()
var list sourcev1.HelmChartList
if err := r.List(ctx, &list, client.MatchingFields{
sourcev1.HelmRepositoryIndexKey: util.ObjectKey(o).String(),
sourcev1.SourceIndexKey: fmt.Sprintf("%s/%s", sourcev1.HelmRepositoryKind, repo.Name),
}); err != nil {
return nil
}
@ -866,6 +866,7 @@ func (r *HelmChartReconciler) requestsForGitRepositoryChange(o client.Object) []
if !ok {
panic(fmt.Sprintf("Expected a GitRepository, got %T", o))
}
// If we do not have an artifact, we have no requests to make
if repo.GetArtifact() == nil {
return nil
@ -873,7 +874,7 @@ func (r *HelmChartReconciler) requestsForGitRepositoryChange(o client.Object) []
var list sourcev1.HelmChartList
if err := r.List(context.TODO(), &list, client.MatchingFields{
sourcev1.GitRepositoryIndexKey: util.ObjectKey(o).String(),
sourcev1.SourceIndexKey: fmt.Sprintf("%s/%s", sourcev1.GitRepositoryKind, repo.Name),
}); err != nil {
return nil
}
@ -902,7 +903,7 @@ func (r *HelmChartReconciler) requestsForBucketChange(o client.Object) []reconci
var list sourcev1.HelmChartList
if err := r.List(context.TODO(), &list, client.MatchingFields{
sourcev1.BucketIndexKey: util.ObjectKey(o).String(),
sourcev1.SourceIndexKey: fmt.Sprintf("%s/%s", sourcev1.BucketKind, bucket.Name),
}); err != nil {
return nil
}