diff --git a/bin/sync.sh b/bin/sync.sh index aabf9fc12..52ad46bf0 100755 --- a/bin/sync.sh +++ b/bin/sync.sh @@ -73,6 +73,12 @@ fi helm repo add "$PUBLIC_DIR" "$S3_URL" helm repo add "$REPO_NAME" "$PUBLIC_URL" +# This repo is mirroring the old https://kubernetes-charts.storage.googleapis.com +helm repo add wire-googlestorage-mirror https://s3-eu-west-1.amazonaws.com/public.wire.com/charts-googlestorage-mirror +# Other frequently used repos +helm repo add bitnami https://charts.bitnami.com/bitnami +helm repo add prometheus-community https://prometheus-community.github.io/helm-charts +helm repo add minio https://helm.min.io rm ./*.tgz &> /dev/null || true # clean any packaged files, if any for chart in "${charts[@]}"; do diff --git a/charts/cassandra-ephemeral/requirements.yaml b/charts/cassandra-ephemeral/requirements.yaml index 053c4eab1..13aa01a92 100644 --- a/charts/cassandra-ephemeral/requirements.yaml +++ b/charts/cassandra-ephemeral/requirements.yaml @@ -1,5 +1,7 @@ dependencies: - name: cassandra - version: 0.13.3 - repository: https://kubernetes-charts-incubator.storage.googleapis.com + version: 0.15.2 + repository: https://s3-eu-west-1.amazonaws.com/public.wire.com/charts-googlestorage-mirror alias: cassandra-ephemeral +# Source: https://github.com/wireapp/charts/blob/master/incubator/cassandra +# TODO: For further upgrades, move to https://github.com/bitnami/charts/tree/master/bitnami/cassandra diff --git a/charts/cassandra-ephemeral/values.yaml b/charts/cassandra-ephemeral/values.yaml index e28bc2a52..0e2b7286a 100644 --- a/charts/cassandra-ephemeral/values.yaml +++ b/charts/cassandra-ephemeral/values.yaml @@ -1,4 +1,4 @@ -# See defaults in https://github.com/kubernetes/charts/blob/master/incubator/cassandra/values.yaml +# See defaults in https://github.com/wireapp/charts/blob/master/incubator/cassandra/values.yaml cassandra-ephemeral: persistence: enabled: false diff --git a/charts/elasticsearch-curator/requirements.yaml b/charts/elasticsearch-curator/requirements.yaml index d52a2eec3..17c8a0c38 100644 --- a/charts/elasticsearch-curator/requirements.yaml +++ b/charts/elasticsearch-curator/requirements.yaml @@ -1,4 +1,8 @@ dependencies: - name: elasticsearch-curator version: 1.5.0 - repository: https://kubernetes-charts.storage.googleapis.com + repository: https://s3-eu-west-1.amazonaws.com/public.wire.com/charts-googlestorage-mirror +# Source: https://github.com/wireapp/charts/blob/master/stable/elasticsearch-curator/README.md +# TODO: This chart does not seem to longer be supported. For further upgrades, it's probably +# best to keep looking into https://github.com/helm/charts/blob/master/stable/elasticsearch-curator/README.md +# and https://github.com/elastic/curator diff --git a/charts/fake-aws-s3/requirements.yaml b/charts/fake-aws-s3/requirements.yaml index a39853614..b7b615242 100644 --- a/charts/fake-aws-s3/requirements.yaml +++ b/charts/fake-aws-s3/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: minio - version: 2.5.15 - repository: https://kubernetes-charts.storage.googleapis.com + version: 8.0.0 + repository: https://helm.min.io diff --git a/charts/fake-aws-s3/values.yaml b/charts/fake-aws-s3/values.yaml index 2347e3fd5..a7cac99cb 100644 --- a/charts/fake-aws-s3/values.yaml +++ b/charts/fake-aws-s3/values.yaml @@ -1,4 +1,4 @@ -# See defaults in https://github.com/helm/charts/tree/master/stable/minio +# See defaults in https://github.com/minio/charts/blob/master/minio/values.yaml minio: fullnameOverride: fake-aws-s3 accessKey: dummykey diff --git a/charts/fluent-bit/requirements.yaml b/charts/fluent-bit/requirements.yaml index 52368c82f..241c588b0 100644 --- a/charts/fluent-bit/requirements.yaml +++ b/charts/fluent-bit/requirements.yaml @@ -1,4 +1,6 @@ dependencies: - name: fluent-bit version: 2.7.0 - repository: https://kubernetes-charts.storage.googleapis.com + repository: https://s3-eu-west-1.amazonaws.com/public.wire.com/charts-googlestorage-mirror +# Source: https://github.com/wireapp/charts/blob/master/stable/fluent-bit/README.md +# TODO: For further upgrades, move to https://github.com/fluent/helm-charts/tree/master/charts/fluent-bit diff --git a/charts/kibana/requirements.yaml b/charts/kibana/requirements.yaml index 6ad2ebe5d..cf89b68a8 100644 --- a/charts/kibana/requirements.yaml +++ b/charts/kibana/requirements.yaml @@ -1,4 +1,6 @@ dependencies: - name: kibana version: 2.2.0 - repository: https://kubernetes-charts.storage.googleapis.com + repository: https://s3-eu-west-1.amazonaws.com/public.wire.com/charts-googlestorage-mirror +# Source: https://github.com/wireapp/charts/blob/master/stable/kibana/README.md +# TODO: For further upgrades, move to https://github.com/elastic/helm-charts/tree/master/kibana diff --git a/charts/metallb/requirements.yaml b/charts/metallb/requirements.yaml index db29ea58c..d85da6b89 100644 --- a/charts/metallb/requirements.yaml +++ b/charts/metallb/requirements.yaml @@ -1,4 +1,6 @@ dependencies: - name: metallb version: 0.8.0 - repository: https://kubernetes-charts.storage.googleapis.com + repository: https://s3-eu-west-1.amazonaws.com/public.wire.com/charts-googlestorage-mirror +# Source: https://github.com/wireapp/charts/blob/master/stable/metallb/README.md +# TODO: For further upgrades, move to https://github.com/bitnami/charts/tree/master/bitnami/metallb diff --git a/charts/nginx-ingress-controller/requirements.yaml b/charts/nginx-ingress-controller/requirements.yaml index 280bf1ca7..d510f5243 100644 --- a/charts/nginx-ingress-controller/requirements.yaml +++ b/charts/nginx-ingress-controller/requirements.yaml @@ -1,4 +1,6 @@ dependencies: - name: nginx-ingress version: 1.33.3 - repository: https://kubernetes-charts.storage.googleapis.com + repository: https://s3-eu-west-1.amazonaws.com/public.wire.com/charts-googlestorage-mirror +# Source: https://github.com/wireapp/charts/tree/master/stable/nginx-ingress +# TODO: For further upgrades, https://github.com/kubernetes/ingress-nginx/tree/master/charts/ingress-nginx diff --git a/charts/redis-ephemeral/requirements.yaml b/charts/redis-ephemeral/requirements.yaml index 756dd8e22..ba80bd746 100644 --- a/charts/redis-ephemeral/requirements.yaml +++ b/charts/redis-ephemeral/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: redis - version: 1.1.7 - repository: https://kubernetes-charts.storage.googleapis.com + version: 1.1.12 + repository: https://charts.bitnami.com/bitnami alias: redis-ephemeral diff --git a/charts/wire-server-metrics/requirements.yaml b/charts/wire-server-metrics/requirements.yaml index c3659fe4e..6e7a13a65 100644 --- a/charts/wire-server-metrics/requirements.yaml +++ b/charts/wire-server-metrics/requirements.yaml @@ -2,4 +2,6 @@ dependencies: - name: prometheus-operator version: 6.7.2 - repository: "@stable" + repository: https://s3-eu-west-1.amazonaws.com/public.wire.com/charts-googlestorage-mirror +# Source: https://github.com/wireapp/charts/tree/master/stable/prometheus-operator +# TODO: For further upgrades, move to https://github.com/prometheus-community/helm-charts/tree/main/charts/kube-prometheus-stack