diff --git a/manifests/composite/elastic-stack/elasticsearch-data/kustomization.yaml b/manifests/composite/elastic-stack/elasticsearch-data/kustomization.yaml index d39e8259e..c6cd4aa4f 100644 --- a/manifests/composite/elastic-stack/elasticsearch-data/kustomization.yaml +++ b/manifests/composite/elastic-stack/elasticsearch-data/kustomization.yaml @@ -9,12 +9,4 @@ patches: target: kind: HelmRelease name: elasticsearch - - patch: |- - - op: replace - path: /metadata/name - value: elasticsearch-data - target: - kind: HelmRepository - name: elasticsearch - - path: patches/elasticsearch-data.yaml diff --git a/manifests/composite/elastic-stack/elasticsearch-data/patches/elasticsearch-data.yaml b/manifests/composite/elastic-stack/elasticsearch-data/patches/elasticsearch-data.yaml index b58775f64..befa2e313 100644 --- a/manifests/composite/elastic-stack/elasticsearch-data/patches/elasticsearch-data.yaml +++ b/manifests/composite/elastic-stack/elasticsearch-data/patches/elasticsearch-data.yaml @@ -4,10 +4,6 @@ metadata: name: elasticsearch-data spec: releaseName: elasticsearch-data - chart: - spec: - sourceRef: - name: elasticsearch-data values: nodeGroup: "data" masterService: elasticsearch-ingest diff --git a/manifests/composite/elastic-stack/elasticsearch-data/replacements/versions.yaml b/manifests/composite/elastic-stack/elasticsearch-data/replacements/versions.yaml index 511139341..26090e4a3 100644 --- a/manifests/composite/elastic-stack/elasticsearch-data/replacements/versions.yaml +++ b/manifests/composite/elastic-stack/elasticsearch-data/replacements/versions.yaml @@ -7,16 +7,6 @@ metadata: container: image: localhost/replacement-transformer replacements: -- source: - objref: - kind: VersionsCatalogue - name: versions-treasuremap - fieldref: "{.spec.helm_repositories.elastic.url}" - target: - objref: - kind: HelmRepository - name: elasticsearch-data - fieldrefs: ["{.spec.url}"] - source: objref: kind: VersionsCatalogue diff --git a/manifests/composite/elastic-stack/elasticsearch-ingest/kustomization.yaml b/manifests/composite/elastic-stack/elasticsearch-ingest/kustomization.yaml index 9eba86f6a..e8996d382 100644 --- a/manifests/composite/elastic-stack/elasticsearch-ingest/kustomization.yaml +++ b/manifests/composite/elastic-stack/elasticsearch-ingest/kustomization.yaml @@ -9,11 +9,4 @@ patches: target: kind: HelmRelease name: elasticsearch - - patch: |- - - op: replace - path: /metadata/name - value: elasticsearch-ingest - target: - kind: HelmRepository - name: elasticsearch - path: patches/elasticsearch-ingest.yaml diff --git a/manifests/composite/elastic-stack/elasticsearch-ingest/patches/elasticsearch-ingest.yaml b/manifests/composite/elastic-stack/elasticsearch-ingest/patches/elasticsearch-ingest.yaml index 9d7be3c37..d0c321a9e 100644 --- a/manifests/composite/elastic-stack/elasticsearch-ingest/patches/elasticsearch-ingest.yaml +++ b/manifests/composite/elastic-stack/elasticsearch-ingest/patches/elasticsearch-ingest.yaml @@ -4,10 +4,6 @@ metadata: name: elasticsearch-ingest spec: releaseName: elasticsearch-ingest - chart: - spec: - sourceRef: - name: elasticsearch-ingest values: nodeGroup: "ingest" roles: diff --git a/manifests/composite/elastic-stack/elasticsearch-ingest/replacements/versions.yaml b/manifests/composite/elastic-stack/elasticsearch-ingest/replacements/versions.yaml index e27887d82..b8fca16ca 100644 --- a/manifests/composite/elastic-stack/elasticsearch-ingest/replacements/versions.yaml +++ b/manifests/composite/elastic-stack/elasticsearch-ingest/replacements/versions.yaml @@ -7,16 +7,6 @@ metadata: container: image: localhost/replacement-transformer replacements: -- source: - objref: - kind: VersionsCatalogue - name: versions-treasuremap - fieldref: "{.spec.helm_repositories.elastic.url}" - target: - objref: - kind: HelmRepository - name: elasticsearch-ingest - fieldrefs: ["{.spec.url}"] - source: objref: kind: VersionsCatalogue diff --git a/manifests/function/dex-aio/dex-helmrelease.yaml b/manifests/function/dex-aio/dex-helmrelease.yaml index 42d0f0779..487ca104d 100644 --- a/manifests/function/dex-aio/dex-helmrelease.yaml +++ b/manifests/function/dex-aio/dex-helmrelease.yaml @@ -20,16 +20,10 @@ spec: chart: spec: chart: dex-aio - # Referencing Dex Helm charts from Helm Collator repo sourceRef: kind: HelmRepository - name: collator namespace: helm-chart-collator - # Referencing Dex Helm charts from Git repo - # sourceRef: - # kind: GitRepository - # name: dex-git-repo - # namespace: collator + name: collator values: images: applications: diff --git a/manifests/function/elasticsearch/helmrelease.yaml b/manifests/function/elasticsearch/helmrelease.yaml index 4c294558b..b171d9aaf 100644 --- a/manifests/function/elasticsearch/helmrelease.yaml +++ b/manifests/function/elasticsearch/helmrelease.yaml @@ -9,7 +9,8 @@ spec: spec: sourceRef: kind: HelmRepository - name: elasticsearch + namespace: helm-chart-collator + name: collator interval: 1m timeout: 5m values: {} diff --git a/manifests/function/elasticsearch/helmrepository.yaml b/manifests/function/elasticsearch/helmrepository.yaml deleted file mode 100644 index dba0f02d2..000000000 --- a/manifests/function/elasticsearch/helmrepository.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: elasticsearch -spec: - interval: 10m diff --git a/manifests/function/elasticsearch/kustomization.yaml b/manifests/function/elasticsearch/kustomization.yaml index 25a9bbac8..016463c27 100644 --- a/manifests/function/elasticsearch/kustomization.yaml +++ b/manifests/function/elasticsearch/kustomization.yaml @@ -1,3 +1,2 @@ resources: - - helmrepository.yaml - helmrelease.yaml diff --git a/manifests/function/elasticsearch/replacements/versions.yaml b/manifests/function/elasticsearch/replacements/versions.yaml index b5ba056c3..ef2f2d848 100644 --- a/manifests/function/elasticsearch/replacements/versions.yaml +++ b/manifests/function/elasticsearch/replacements/versions.yaml @@ -7,16 +7,6 @@ metadata: container: image: localhost/replacement-transformer replacements: -- source: - objref: - kind: VersionsCatalogue - name: versions-treasuremap - fieldref: "{.spec.helm_repositories.elastic.url}" - target: - objref: - kind: HelmRepository - name: elasticseach - fieldrefs: ["{.spec.url}"] - source: objref: kind: VersionsCatalogue diff --git a/manifests/function/grafana/helmrelease.yaml b/manifests/function/grafana/helmrelease.yaml index 3765549ba..90c67ba94 100644 --- a/manifests/function/grafana/helmrelease.yaml +++ b/manifests/function/grafana/helmrelease.yaml @@ -9,7 +9,8 @@ spec: spec: sourceRef: kind: HelmRepository - name: grafana + namespace: helm-chart-collator + name: collator interval: 1m timeout: 5m # Reference values at diff --git a/manifests/function/grafana/helmrepository.yaml b/manifests/function/grafana/helmrepository.yaml deleted file mode 100644 index fc9ae2b68..000000000 --- a/manifests/function/grafana/helmrepository.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: grafana -spec: - interval: 10m diff --git a/manifests/function/grafana/kustomization.yaml b/manifests/function/grafana/kustomization.yaml index 25a9bbac8..016463c27 100644 --- a/manifests/function/grafana/kustomization.yaml +++ b/manifests/function/grafana/kustomization.yaml @@ -1,3 +1,2 @@ resources: - - helmrepository.yaml - helmrelease.yaml diff --git a/manifests/function/grafana/replacements/versions.yaml b/manifests/function/grafana/replacements/versions.yaml index 21adb0751..df48567b5 100644 --- a/manifests/function/grafana/replacements/versions.yaml +++ b/manifests/function/grafana/replacements/versions.yaml @@ -7,16 +7,6 @@ metadata: container: image: localhost/replacement-transformer replacements: -- source: - objref: - kind: VersionsCatalogue - name: versions-treasuremap - fieldref: "{.spec.helm_repositories.grafana.url}" - target: - objref: - kind: HelmRepository - name: grafana - fieldrefs: ["{.spec.url}"] - source: objref: kind: VersionsCatalogue diff --git a/manifests/function/helm-chart-repository/helm-repository.yaml b/manifests/function/helm-chart-repository/helm-repository.yaml index be0dcd150..435359316 100644 --- a/manifests/function/helm-chart-repository/helm-repository.yaml +++ b/manifests/function/helm-chart-repository/helm-repository.yaml @@ -2,8 +2,8 @@ apiVersion: source.toolkit.fluxcd.io/v1beta1 kind: HelmRepository metadata: - name: collator namespace: helm-chart-collator + name: collator spec: interval: 5m url: http://helm-chart-collator.helm-chart-collator.svc:8080 \ No newline at end of file diff --git a/manifests/function/ingress/helmrelease.yaml b/manifests/function/ingress/helmrelease.yaml index 0e28f42a5..d61b07d0d 100644 --- a/manifests/function/ingress/helmrelease.yaml +++ b/manifests/function/ingress/helmrelease.yaml @@ -5,11 +5,10 @@ metadata: spec: chart: spec: - chart: ingress-nginx - version: 3.5.1 sourceRef: kind: HelmRepository - name: ingress-nginx + namespace: helm-chart-collator + name: collator interval: 1m values: defaultBackend: diff --git a/manifests/function/ingress/helmrepository.yaml b/manifests/function/ingress/helmrepository.yaml deleted file mode 100644 index 71baee4aa..000000000 --- a/manifests/function/ingress/helmrepository.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: ingress-nginx -spec: - url: https://kubernetes.github.io/ingress-nginx - interval: 10m diff --git a/manifests/function/ingress/kustomization.yaml b/manifests/function/ingress/kustomization.yaml index 6ec3ac5d9..0019f0678 100644 --- a/manifests/function/ingress/kustomization.yaml +++ b/manifests/function/ingress/kustomization.yaml @@ -1,5 +1,4 @@ resources: - helmrelease.yaml - - helmrepository.yaml - namespace.yaml namespace: ingress diff --git a/manifests/function/ingress/replacements/versions.yaml b/manifests/function/ingress/replacements/versions.yaml index f39adc243..5ebe90ba6 100644 --- a/manifests/function/ingress/replacements/versions.yaml +++ b/manifests/function/ingress/replacements/versions.yaml @@ -7,16 +7,6 @@ metadata: container: image: localhost/replacement-transformer replacements: -- source: - objref: - kind: VersionsCatalogue - name: versions-treasuremap - fieldref: "{.spec.helm_repositories.ingress-nginx.url}" - target: - objref: - kind: HelmRepository - name: ingress-nginx - fieldrefs: ["{.spec.url}"] - source: objref: kind: VersionsCatalogue diff --git a/manifests/function/kibana/helmrelease.yaml b/manifests/function/kibana/helmrelease.yaml index ca5254555..8a1bf0669 100644 --- a/manifests/function/kibana/helmrelease.yaml +++ b/manifests/function/kibana/helmrelease.yaml @@ -9,7 +9,8 @@ spec: spec: sourceRef: kind: HelmRepository - name: kibana + namespace: helm-chart-collator + name: collator interval: 1m timeout: 5m values: {} diff --git a/manifests/function/kibana/helmrepository.yaml b/manifests/function/kibana/helmrepository.yaml deleted file mode 100644 index 8ade95e52..000000000 --- a/manifests/function/kibana/helmrepository.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: kibana -spec: - interval: 10m diff --git a/manifests/function/kibana/kustomization.yaml b/manifests/function/kibana/kustomization.yaml index 25a9bbac8..016463c27 100644 --- a/manifests/function/kibana/kustomization.yaml +++ b/manifests/function/kibana/kustomization.yaml @@ -1,3 +1,2 @@ resources: - - helmrepository.yaml - helmrelease.yaml diff --git a/manifests/function/kibana/replacements/versions.yaml b/manifests/function/kibana/replacements/versions.yaml index ef05da7c7..b9ce5e612 100644 --- a/manifests/function/kibana/replacements/versions.yaml +++ b/manifests/function/kibana/replacements/versions.yaml @@ -7,16 +7,6 @@ metadata: container: image: localhost/replacement-transformer replacements: -- source: - objref: - kind: VersionsCatalogue - name: versions-treasuremap - fieldref: "{.spec.helm_repositories.elastic.url}" - target: - objref: - kind: HelmRepository - name: kibana - fieldrefs: ["{.spec.url}"] - source: objref: kind: VersionsCatalogue diff --git a/manifests/function/kube-prometheus-stack/helmrelease.yaml b/manifests/function/kube-prometheus-stack/helmrelease.yaml index ca9be204c..cfe697d06 100644 --- a/manifests/function/kube-prometheus-stack/helmrelease.yaml +++ b/manifests/function/kube-prometheus-stack/helmrelease.yaml @@ -9,7 +9,8 @@ spec: spec: sourceRef: kind: HelmRepository - name: prometheus-community + namespace: helm-chart-collator + name: collator interval: 1m timeout: 5m # Reference values at diff --git a/manifests/function/kube-prometheus-stack/helmrepository.yaml b/manifests/function/kube-prometheus-stack/helmrepository.yaml deleted file mode 100644 index b347c17c5..000000000 --- a/manifests/function/kube-prometheus-stack/helmrepository.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: prometheus-community - namespace: monitoring -spec: - interval: 10m diff --git a/manifests/function/kube-prometheus-stack/kustomization.yaml b/manifests/function/kube-prometheus-stack/kustomization.yaml index 1f8f8d4b1..f9787eec2 100644 --- a/manifests/function/kube-prometheus-stack/kustomization.yaml +++ b/manifests/function/kube-prometheus-stack/kustomization.yaml @@ -1,7 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - helmrepository.yaml - helmrelease.yaml namespace: monitoring diff --git a/manifests/function/kube-prometheus-stack/replacements/versions.yaml b/manifests/function/kube-prometheus-stack/replacements/versions.yaml index d300d3de2..7dcfda99b 100644 --- a/manifests/function/kube-prometheus-stack/replacements/versions.yaml +++ b/manifests/function/kube-prometheus-stack/replacements/versions.yaml @@ -7,18 +7,6 @@ metadata: container: image: localhost/replacement-transformer replacements: -# Helm Repo -- source: - objref: - kind: VersionsCatalogue - name: versions-treasuremap - fieldref: "{.spec.helm_repositories.prometheus_community.url}" - target: - objref: - kind: HelmRepository - name: prometheus-community - fieldrefs: ["{.spec.url}"] - # Chart - source: objref: @@ -40,7 +28,6 @@ replacements: kind: HelmRelease name: kube-prometheus-stack fieldrefs: ["{.spec.chart.spec.version}"] - # Images - source: objref: diff --git a/manifests/function/logging-operator/helmrelease-logging.yaml b/manifests/function/logging-operator/helmrelease-logging.yaml index 40ed891c0..37c3aac34 100644 --- a/manifests/function/logging-operator/helmrelease-logging.yaml +++ b/manifests/function/logging-operator/helmrelease-logging.yaml @@ -9,7 +9,8 @@ spec: spec: sourceRef: kind: HelmRepository - name: banzaicloud + namespace: helm-chart-collator + name: collator interval: 1m timeout: 5m # Reference values at diff --git a/manifests/function/logging-operator/helmrelease-operator.yaml b/manifests/function/logging-operator/helmrelease-operator.yaml index 67ddaed0b..f8a92f6c7 100644 --- a/manifests/function/logging-operator/helmrelease-operator.yaml +++ b/manifests/function/logging-operator/helmrelease-operator.yaml @@ -9,7 +9,8 @@ spec: spec: sourceRef: kind: HelmRepository - name: banzaicloud + namespace: helm-chart-collator + name: collator interval: 1m timeout: 5m # Reference values at diff --git a/manifests/function/logging-operator/helmrepository.yaml b/manifests/function/logging-operator/helmrepository.yaml deleted file mode 100644 index 019fd5fde..000000000 --- a/manifests/function/logging-operator/helmrepository.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: banzaicloud -spec: - interval: 10m diff --git a/manifests/function/logging-operator/kustomization.yaml b/manifests/function/logging-operator/kustomization.yaml index a5f888bf5..d4893f8f6 100644 --- a/manifests/function/logging-operator/kustomization.yaml +++ b/manifests/function/logging-operator/kustomization.yaml @@ -1,7 +1,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - helmrepository.yaml - helmrelease-operator.yaml - helmrelease-logging.yaml diff --git a/manifests/function/logging-operator/replacements/versions.yaml b/manifests/function/logging-operator/replacements/versions.yaml index ce5fe13dc..7822c9238 100644 --- a/manifests/function/logging-operator/replacements/versions.yaml +++ b/manifests/function/logging-operator/replacements/versions.yaml @@ -7,18 +7,6 @@ metadata: container: image: localhost/replacement-transformer replacements: -# Helm Repo (logging-operator and logging-operator-logging charts) -- source: - objref: - kind: VersionsCatalogue - name: versions-treasuremap - fieldref: "{.spec.helm_repositories.banzai_cloud.url}" - target: - objref: - kind: HelmRepository - name: banzaicloud - fieldrefs: ["{.spec.url}"] - # Logging-operator Chart - source: objref: @@ -40,7 +28,6 @@ replacements: kind: HelmRelease name: logging-operator fieldrefs: ["{.spec.chart.spec.version}"] - # Logging-operator-logging Chart - source: objref: @@ -62,7 +49,6 @@ replacements: kind: HelmRelease name: logging-operator-logging fieldrefs: ["{.spec.chart.spec.version}"] - # Logging-operator Chart Image - source: objref: @@ -74,7 +60,6 @@ replacements: kind: HelmRelease name: logging-operator fieldrefs: ["{.spec.values.image}"] - # Logging-operator-logging Chart Images - source: objref: diff --git a/manifests/function/minio/helmrelease.yaml b/manifests/function/minio/helmrelease.yaml index 9ee9ea492..163d8c9cf 100644 --- a/manifests/function/minio/helmrelease.yaml +++ b/manifests/function/minio/helmrelease.yaml @@ -9,7 +9,8 @@ spec: spec: sourceRef: kind: HelmRepository - name: minio + namespace: helm-chart-collator + name: collator interval: 1m timeout: 5m # Reference values at diff --git a/manifests/function/minio/helmrepository.yaml b/manifests/function/minio/helmrepository.yaml deleted file mode 100644 index 9fff1435a..000000000 --- a/manifests/function/minio/helmrepository.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: minio -spec: - url: https://helm.min.io/ - interval: 10m diff --git a/manifests/function/minio/kustomization.yaml b/manifests/function/minio/kustomization.yaml index 8829d5faa..016463c27 100644 --- a/manifests/function/minio/kustomization.yaml +++ b/manifests/function/minio/kustomization.yaml @@ -1,3 +1,2 @@ resources: - helmrelease.yaml - - helmrepository.yaml diff --git a/manifests/function/minio/replacements/versions.yaml b/manifests/function/minio/replacements/versions.yaml index 4b154c925..0cdfce53c 100644 --- a/manifests/function/minio/replacements/versions.yaml +++ b/manifests/function/minio/replacements/versions.yaml @@ -7,17 +7,6 @@ metadata: container: image: localhost/replacement-transformer replacements: -- source: - objref: - kind: VersionsCatalogue - name: versions-treasuremap - fieldref: "{.spec.helm_repositories.minio.url}" - target: - objref: - kind: HelmRepository - name: minio - fieldrefs: ["{.spec.url}"] - - source: objref: kind: VersionsCatalogue @@ -37,8 +26,7 @@ replacements: objref: kind: HelmRelease name: minio - fieldrefs: ["{.spec.chart.version}"] - + fieldrefs: ["{.spec.chart.spec.version}"] - source: objref: kind: VersionsCatalogue @@ -49,7 +37,6 @@ replacements: kind: HelmRelease name: minio fieldrefs: ["{.spec.values.image}"] - - source: objref: kind: VersionsCatalogue diff --git a/manifests/function/prometheus-elasticsearch-exporter/helmrelease.yaml b/manifests/function/prometheus-elasticsearch-exporter/helmrelease.yaml index 070f063e5..8e2765016 100644 --- a/manifests/function/prometheus-elasticsearch-exporter/helmrelease.yaml +++ b/manifests/function/prometheus-elasticsearch-exporter/helmrelease.yaml @@ -9,7 +9,8 @@ spec: spec: sourceRef: kind: HelmRepository - name: prometheus-elasticsearch-exporter + namespace: helm-chart-collator + name: collator interval: 1m timeout: 5m # Reference values at diff --git a/manifests/function/prometheus-elasticsearch-exporter/helmrepository.yaml b/manifests/function/prometheus-elasticsearch-exporter/helmrepository.yaml deleted file mode 100644 index df7d6945a..000000000 --- a/manifests/function/prometheus-elasticsearch-exporter/helmrepository.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: prometheus-elasticsearch-exporter -spec: - interval: 10m diff --git a/manifests/function/prometheus-elasticsearch-exporter/kustomization.yaml b/manifests/function/prometheus-elasticsearch-exporter/kustomization.yaml index 25a9bbac8..016463c27 100644 --- a/manifests/function/prometheus-elasticsearch-exporter/kustomization.yaml +++ b/manifests/function/prometheus-elasticsearch-exporter/kustomization.yaml @@ -1,3 +1,2 @@ resources: - - helmrepository.yaml - helmrelease.yaml diff --git a/manifests/function/prometheus-elasticsearch-exporter/replacements/versions.yaml b/manifests/function/prometheus-elasticsearch-exporter/replacements/versions.yaml index 2d96729fb..572b473ec 100644 --- a/manifests/function/prometheus-elasticsearch-exporter/replacements/versions.yaml +++ b/manifests/function/prometheus-elasticsearch-exporter/replacements/versions.yaml @@ -7,16 +7,6 @@ metadata: container: image: localhost/replacement-transformer replacements: -- source: - objref: - kind: VersionsCatalogue - name: versions-treasuremap - fieldref: "{.spec.helm_repositories.prometheus_community.url}" - target: - objref: - kind: HelmRepository - name: prometheus-elasticsearch-exporter - fieldrefs: ["{.spec.url}"] - source: objref: kind: VersionsCatalogue diff --git a/manifests/function/thanos-operator/helmrelease.yaml b/manifests/function/thanos-operator/helmrelease.yaml index 1ad9cec2c..cbcf3eb14 100644 --- a/manifests/function/thanos-operator/helmrelease.yaml +++ b/manifests/function/thanos-operator/helmrelease.yaml @@ -9,7 +9,8 @@ spec: spec: sourceRef: kind: HelmRepository - name: thanos + namespace: helm-chart-collator + name: collator interval: 1m timeout: 5m # Reference values at diff --git a/manifests/function/thanos-operator/helmrepository.yaml b/manifests/function/thanos-operator/helmrepository.yaml deleted file mode 100644 index 0b7ca91b9..000000000 --- a/manifests/function/thanos-operator/helmrepository.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: source.toolkit.fluxcd.io/v1beta1 -kind: HelmRepository -metadata: - name: thanos -spec: - interval: 10m diff --git a/manifests/function/thanos-operator/kustomization.yaml b/manifests/function/thanos-operator/kustomization.yaml index 8829d5faa..016463c27 100644 --- a/manifests/function/thanos-operator/kustomization.yaml +++ b/manifests/function/thanos-operator/kustomization.yaml @@ -1,3 +1,2 @@ resources: - helmrelease.yaml - - helmrepository.yaml diff --git a/manifests/function/thanos-operator/replacements/versions.yaml b/manifests/function/thanos-operator/replacements/versions.yaml index 20590dc3b..5673627f7 100644 --- a/manifests/function/thanos-operator/replacements/versions.yaml +++ b/manifests/function/thanos-operator/replacements/versions.yaml @@ -7,17 +7,6 @@ metadata: container: image: localhost/replacement-transformer replacements: -- source: - objref: - kind: VersionsCatalogue - name: versions-treasuremap - fieldref: "{.spec.helm_repositories.banzai_cloud.url}" - target: - objref: - kind: HelmRepository - name: thanos - fieldrefs: ["{.spec.url}"] - - source: objref: kind: VersionsCatalogue @@ -38,7 +27,6 @@ replacements: kind: HelmRelease name: thanos-operator fieldrefs: ["{.spec.chart.spec.version}"] - - source: objref: kind: VersionsCatalogue diff --git a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml index c701678fa..0c2ca814a 100644 --- a/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml +++ b/manifests/function/treasuremap-base-catalogues/versions-treasuremap.yaml @@ -15,23 +15,6 @@ spec: checksum: 4a6909d1480ac30d676accd7b37ec711 helm_repositories: - elastic: - url: https://helm.elastic.co - grafana: - url: https://grafana.github.io/helm-charts - prometheus_community: - url: https://prometheus-community.github.io/helm-charts - # NOTE: logging-operator and logging-operator-logging charts share this repository - banzai_cloud: - url: https://kubernetes-charts.banzaicloud.com - minio: - url: https://helm.min.io - ingress-nginx: - url: https://kubernetes.github.io/ingress-nginx - rook-operator: - url: https://charts.rook.io/release - dex-aio: - url: http://helm-chart-collator.collator.svc:8080 helm_chart_collator: url: http://helm-chart-collator.helm-chart-collator.svc:8080 @@ -68,11 +51,10 @@ spec: version: 3.5.1 dex-aio: chart: dex-aio - version: 0.1.0 + version: 0.1.0+source.f0cea38c0ecd319d6996b85d7aab27982704bacd0c843fbecb provisioner: chart: provisioner - version: "" - + version: 2.4.0+source.f7110d65dcdeecd6e7d81b460d72ef7a000457dc5b4e08b152 images: # images are organized by # : @@ -85,7 +67,7 @@ spec: helm_chart_collator: helm_chart_collator: helm_chart_collator: - image: quay.io/airshipit/helm-chart-collator:95036e4d6dae5f7fc8a5c7d2da7f430775d457c5 + image: quay.io/airshipit/helm-chart-collator:62fee9ee1db9a3f9c21f9c83737080032eeeae8a kube_prometheus_stack: prometheus_operator: # NOTE: For prometheus and alertmanager instances managed by the operator diff --git a/manifests/type/multi-tenant/sub-clusters/wordpress/workload/helmrelease.yaml b/manifests/type/multi-tenant/sub-clusters/wordpress/workload/helmrelease.yaml index 60681e532..1a513393f 100644 --- a/manifests/type/multi-tenant/sub-clusters/wordpress/workload/helmrelease.yaml +++ b/manifests/type/multi-tenant/sub-clusters/wordpress/workload/helmrelease.yaml @@ -22,6 +22,6 @@ spec: chart: wordpress sourceRef: kind: HelmRepository - name: wordpress-helm-repo - namespace: wordpress + namespace: helm-chart-collator + name: collator values: {}