Use helm-chart-collator for all charts

- Update the helm-chart-collator image to one which: - uses versions unique to the git source [0] - includes all helm charts used by treasuremap [1] - Rewire all the HelmReleases to point at the hcc HelmRepository - Removes all the other HelmRepositories and associated config [0]: https://review.opendev.org/c/airship/images/+/794657 [1]: https://review.opendev.org/c/airship/images/+/794838 Relates-To: #162 Relates-To: #164 Signed-off-by: Sean Eagan <seaneagan1@gmail.com> Change-Id: Ia96820b627d76feee7909471dd98a27de8594bf1
2021-06-17 12:40:57 -05:00 · 2021-06-17 12:40:57 -05:00 · a0c1fc7756
parent 6a8e9ee2a0
commit a0c1fc7756
47 changed files with 28 additions and 256 deletions
--- 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
--- 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
--- 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
--- 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
--- 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:
--- 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
--- 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:
--- 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: {}
--- a/manifests/function/elasticsearch/helmrepository.yaml
+++ b/manifests/function/elasticsearch/helmrepository.yaml
@ -1,6 +0,0 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: HelmRepository
-metadata:
-  name: elasticsearch
-spec:
-  interval: 10m
--- a/manifests/function/elasticsearch/kustomization.yaml
+++ b/manifests/function/elasticsearch/kustomization.yaml
@ -1,3 +1,2 @@
 resources:
-  - helmrepository.yaml
  - helmrelease.yaml
--- 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
--- 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
--- a/manifests/function/grafana/helmrepository.yaml
+++ b/manifests/function/grafana/helmrepository.yaml
@ -1,6 +0,0 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: HelmRepository
-metadata:
-  name: grafana
-spec:
-  interval: 10m
--- a/manifests/function/grafana/kustomization.yaml
+++ b/manifests/function/grafana/kustomization.yaml
@ -1,3 +1,2 @@
 resources:
-  - helmrepository.yaml
  - helmrelease.yaml
--- 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
--- 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
--- 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:
--- a/manifests/function/ingress/helmrepository.yaml
+++ b/manifests/function/ingress/helmrepository.yaml
@ -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
--- 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
--- 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
--- 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: {}
--- a/manifests/function/kibana/helmrepository.yaml
+++ b/manifests/function/kibana/helmrepository.yaml
@ -1,6 +0,0 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: HelmRepository
-metadata:
-  name: kibana
-spec:
-  interval: 10m
--- a/manifests/function/kibana/kustomization.yaml
+++ b/manifests/function/kibana/kustomization.yaml
@ -1,3 +1,2 @@
 resources:
-  - helmrepository.yaml
  - helmrelease.yaml
--- 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
--- 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
--- a/manifests/function/kube-prometheus-stack/helmrepository.yaml
+++ b/manifests/function/kube-prometheus-stack/helmrepository.yaml
@ -1,7 +0,0 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: HelmRepository
-metadata:
-  name: prometheus-community
-  namespace: monitoring
-spec:
-  interval: 10m
--- 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
--- 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:
--- 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
--- 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
--- a/manifests/function/logging-operator/helmrepository.yaml
+++ b/manifests/function/logging-operator/helmrepository.yaml
@ -1,6 +0,0 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: HelmRepository
-metadata:
-  name: banzaicloud
-spec:
-  interval: 10m
--- 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

--- 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:
--- 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
--- a/manifests/function/minio/helmrepository.yaml
+++ b/manifests/function/minio/helmrepository.yaml
@ -1,7 +0,0 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: HelmRepository
-metadata:
-  name: minio
-spec:
-  url: https://helm.min.io/
-  interval: 10m
--- a/manifests/function/minio/kustomization.yaml
+++ b/manifests/function/minio/kustomization.yaml
@ -1,3 +1,2 @@
 resources:
  - helmrelease.yaml
-  - helmrepository.yaml
--- 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
--- 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
--- a/manifests/function/prometheus-elasticsearch-exporter/helmrepository.yaml
+++ b/manifests/function/prometheus-elasticsearch-exporter/helmrepository.yaml
@ -1,6 +0,0 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: HelmRepository
-metadata:
-  name: prometheus-elasticsearch-exporter
-spec:
-  interval: 10m
--- 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
--- 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
--- 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
--- a/manifests/function/thanos-operator/helmrepository.yaml
+++ b/manifests/function/thanos-operator/helmrepository.yaml
@ -1,6 +0,0 @@
-apiVersion: source.toolkit.fluxcd.io/v1beta1
-kind: HelmRepository
-metadata:
-  name: thanos
-spec:
-  interval: 10m
--- a/manifests/function/thanos-operator/kustomization.yaml
+++ b/manifests/function/thanos-operator/kustomization.yaml
@ -1,3 +1,2 @@
 resources:
  - helmrelease.yaml
-  - helmrepository.yaml
--- 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
--- 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
  #   <function>:
@ -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
--- 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: {}