From 6563fcf7b19a50f8bcd780464a8552bbf59b8d0c Mon Sep 17 00:00:00 2001 From: Martin Hrabovcin Date: Fri, 11 Oct 2024 17:56:20 +0200 Subject: [PATCH] fix: helm repository path for older kafka operator (2.12) (#165) * fix(kafka-operator): use helm mirrors * fix: helm repository path for older kafka operator --- .../banzaicloud-mirror/banzaicloud-mirror.yaml | 11 +++++++++++ .../banzaicloud-mirror/kustomization.yaml | 4 ++++ helm-repositories/kustomization.yaml | 1 + services/kafka-operator/0.20.0/kafka-operator.yaml | 2 +- services/kafka-operator/0.20.0/kustomization.yaml | 2 +- services/kafka-operator/0.20.2/kafka-operator.yaml | 2 +- services/kafka-operator/0.20.2/kustomization.yaml | 2 +- .../kafka-operator/0.23.0-dev.0/kafka-operator.yaml | 2 +- .../kafka-operator/0.23.0-dev.0/kustomization.yaml | 2 +- 9 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 helm-repositories/banzaicloud-mirror/banzaicloud-mirror.yaml create mode 100644 helm-repositories/banzaicloud-mirror/kustomization.yaml diff --git a/helm-repositories/banzaicloud-mirror/banzaicloud-mirror.yaml b/helm-repositories/banzaicloud-mirror/banzaicloud-mirror.yaml new file mode 100644 index 00000000..df018ea3 --- /dev/null +++ b/helm-repositories/banzaicloud-mirror/banzaicloud-mirror.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: HelmRepository +metadata: + name: kubernetes-charts.banzaicloud.com-mirror + namespace: ${workspaceNamespace} + labels: + kommander.d2iq.io/dkp-airgapped: supported +spec: + url: "${helmMirrorURL:=https://mesosphere.github.io/charts/staging}" + interval: 10m diff --git a/helm-repositories/banzaicloud-mirror/kustomization.yaml b/helm-repositories/banzaicloud-mirror/kustomization.yaml new file mode 100644 index 00000000..d647f07f --- /dev/null +++ b/helm-repositories/banzaicloud-mirror/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - banzaicloud-mirror.yaml diff --git a/helm-repositories/kustomization.yaml b/helm-repositories/kustomization.yaml index b32ebdf0..b9e7e88b 100644 --- a/helm-repositories/kustomization.yaml +++ b/helm-repositories/kustomization.yaml @@ -2,4 +2,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - banzaicloud + - banzaicloud-mirror - pravega diff --git a/services/kafka-operator/0.20.0/kafka-operator.yaml b/services/kafka-operator/0.20.0/kafka-operator.yaml index f42a06eb..e42cdebd 100644 --- a/services/kafka-operator/0.20.0/kafka-operator.yaml +++ b/services/kafka-operator/0.20.0/kafka-operator.yaml @@ -10,7 +10,7 @@ spec: chart: kafka-operator sourceRef: kind: HelmRepository - name: kubernetes-charts.banzaicloud.com + name: kubernetes-charts.banzaicloud.com-mirror namespace: ${workspaceNamespace} version: 0.20.0 interval: 15s diff --git a/services/kafka-operator/0.20.0/kustomization.yaml b/services/kafka-operator/0.20.0/kustomization.yaml index 83ec5f10..bcb29207 100644 --- a/services/kafka-operator/0.20.0/kustomization.yaml +++ b/services/kafka-operator/0.20.0/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - kafka-operator.yaml - - ../../../helm-repositories/banzaicloud + - ../../../helm-repositories/banzaicloud-mirror diff --git a/services/kafka-operator/0.20.2/kafka-operator.yaml b/services/kafka-operator/0.20.2/kafka-operator.yaml index 153816cf..d1d170fb 100644 --- a/services/kafka-operator/0.20.2/kafka-operator.yaml +++ b/services/kafka-operator/0.20.2/kafka-operator.yaml @@ -10,7 +10,7 @@ spec: chart: kafka-operator sourceRef: kind: HelmRepository - name: kubernetes-charts.banzaicloud.com + name: kubernetes-charts.banzaicloud.com-mirror namespace: ${workspaceNamespace} version: 0.20.2 interval: 15s diff --git a/services/kafka-operator/0.20.2/kustomization.yaml b/services/kafka-operator/0.20.2/kustomization.yaml index 83ec5f10..bcb29207 100644 --- a/services/kafka-operator/0.20.2/kustomization.yaml +++ b/services/kafka-operator/0.20.2/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - kafka-operator.yaml - - ../../../helm-repositories/banzaicloud + - ../../../helm-repositories/banzaicloud-mirror diff --git a/services/kafka-operator/0.23.0-dev.0/kafka-operator.yaml b/services/kafka-operator/0.23.0-dev.0/kafka-operator.yaml index 083c6495..fa5a2ccf 100644 --- a/services/kafka-operator/0.23.0-dev.0/kafka-operator.yaml +++ b/services/kafka-operator/0.23.0-dev.0/kafka-operator.yaml @@ -10,7 +10,7 @@ spec: chart: kafka-operator sourceRef: kind: HelmRepository - name: kubernetes-charts.banzaicloud.com + name: kubernetes-charts.banzaicloud.com-mirror namespace: ${workspaceNamespace} version: 0.23.0-dev.0 interval: 15s diff --git a/services/kafka-operator/0.23.0-dev.0/kustomization.yaml b/services/kafka-operator/0.23.0-dev.0/kustomization.yaml index 83ec5f10..bcb29207 100644 --- a/services/kafka-operator/0.23.0-dev.0/kustomization.yaml +++ b/services/kafka-operator/0.23.0-dev.0/kustomization.yaml @@ -2,4 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - kafka-operator.yaml - - ../../../helm-repositories/banzaicloud + - ../../../helm-repositories/banzaicloud-mirror