From 92fdcc8112c78f47481e66a9d784969b971b4372 Mon Sep 17 00:00:00 2001 From: Tiago Loureiro Date: Thu, 29 Oct 2020 11:23:57 +0100 Subject: [PATCH 1/8] Migrate fake-aws --- charts/fake-aws-s3/requirements.yaml | 4 ++-- charts/fake-aws-s3/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 From fbd2156a1320ce26a0b2c57ad6aed5337760c1e1 Mon Sep 17 00:00:00 2001 From: Tiago Loureiro Date: Thu, 29 Oct 2020 13:46:42 +0100 Subject: [PATCH 2/8] Fixed redis-ephemeral --- charts/redis-ephemeral/requirements.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 99c9eed171b7bb09970495b1a8ab0fe3b0302728 Mon Sep 17 00:00:00 2001 From: Tiago Loureiro Date: Thu, 29 Oct 2020 13:47:20 +0100 Subject: [PATCH 3/8] Added cassandra-ephemeral --- charts/cassandra-ephemeral/requirements.yaml | 5 +++-- charts/cassandra-ephemeral/values.yaml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/charts/cassandra-ephemeral/requirements.yaml b/charts/cassandra-ephemeral/requirements.yaml index 053c4eab1..6eaad8be0 100644 --- a/charts/cassandra-ephemeral/requirements.yaml +++ b/charts/cassandra-ephemeral/requirements.yaml @@ -1,5 +1,6 @@ dependencies: - name: cassandra - version: 0.13.3 - repository: https://kubernetes-charts-incubator.storage.googleapis.com + version: 0.15.2 + # Published from https://github.com/wireapp/charts/blob/master/incubator/cassandra + repository: https://s3-eu-west-1.amazonaws.com/public.wire.com/charts alias: cassandra-ephemeral 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 From a2d8684122e624cc8a573eb4770856474a00a3b0 Mon Sep 17 00:00:00 2001 From: Tiago Loureiro Date: Thu, 29 Oct 2020 15:54:25 +0100 Subject: [PATCH 4/8] Move from googlestorage to our own mirror --- charts/cassandra-ephemeral/requirements.yaml | 5 +++-- charts/elasticsearch-curator/requirements.yaml | 2 +- charts/fluent-bit/requirements.yaml | 2 +- charts/kibana/requirements.yaml | 2 +- charts/metallb/requirements.yaml | 2 +- charts/nginx-ingress-controller/requirements.yaml | 2 +- charts/wire-server-metrics/requirements.yaml | 4 +++- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/charts/cassandra-ephemeral/requirements.yaml b/charts/cassandra-ephemeral/requirements.yaml index 6eaad8be0..13aa01a92 100644 --- a/charts/cassandra-ephemeral/requirements.yaml +++ b/charts/cassandra-ephemeral/requirements.yaml @@ -1,6 +1,7 @@ dependencies: - name: cassandra version: 0.15.2 - # Published from https://github.com/wireapp/charts/blob/master/incubator/cassandra - repository: https://s3-eu-west-1.amazonaws.com/public.wire.com/charts + 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/elasticsearch-curator/requirements.yaml b/charts/elasticsearch-curator/requirements.yaml index d52a2eec3..c7e6f42ac 100644 --- a/charts/elasticsearch-curator/requirements.yaml +++ b/charts/elasticsearch-curator/requirements.yaml @@ -1,4 +1,4 @@ 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 diff --git a/charts/fluent-bit/requirements.yaml b/charts/fluent-bit/requirements.yaml index 52368c82f..e3d456096 100644 --- a/charts/fluent-bit/requirements.yaml +++ b/charts/fluent-bit/requirements.yaml @@ -1,4 +1,4 @@ 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 diff --git a/charts/kibana/requirements.yaml b/charts/kibana/requirements.yaml index 6ad2ebe5d..4d3bcbfb8 100644 --- a/charts/kibana/requirements.yaml +++ b/charts/kibana/requirements.yaml @@ -1,4 +1,4 @@ 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 diff --git a/charts/metallb/requirements.yaml b/charts/metallb/requirements.yaml index db29ea58c..cbcddbab3 100644 --- a/charts/metallb/requirements.yaml +++ b/charts/metallb/requirements.yaml @@ -1,4 +1,4 @@ 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 diff --git a/charts/nginx-ingress-controller/requirements.yaml b/charts/nginx-ingress-controller/requirements.yaml index 280bf1ca7..9958cbd04 100644 --- a/charts/nginx-ingress-controller/requirements.yaml +++ b/charts/nginx-ingress-controller/requirements.yaml @@ -1,4 +1,4 @@ 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 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 From 029653245b1e8253bf2bbcb0cc662d15f0351a39 Mon Sep 17 00:00:00 2001 From: Tiago Loureiro Date: Thu, 29 Oct 2020 16:13:42 +0100 Subject: [PATCH 5/8] Added comments --- charts/elasticsearch-curator/requirements.yaml | 4 ++++ charts/fluent-bit/requirements.yaml | 2 ++ charts/kibana/requirements.yaml | 2 ++ charts/metallb/requirements.yaml | 2 ++ charts/nginx-ingress-controller/requirements.yaml | 2 ++ 5 files changed, 12 insertions(+) diff --git a/charts/elasticsearch-curator/requirements.yaml b/charts/elasticsearch-curator/requirements.yaml index c7e6f42ac..17c8a0c38 100644 --- a/charts/elasticsearch-curator/requirements.yaml +++ b/charts/elasticsearch-curator/requirements.yaml @@ -2,3 +2,7 @@ dependencies: - name: elasticsearch-curator version: 1.5.0 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/fluent-bit/requirements.yaml b/charts/fluent-bit/requirements.yaml index e3d456096..241c588b0 100644 --- a/charts/fluent-bit/requirements.yaml +++ b/charts/fluent-bit/requirements.yaml @@ -2,3 +2,5 @@ dependencies: - name: fluent-bit version: 2.7.0 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 4d3bcbfb8..cf89b68a8 100644 --- a/charts/kibana/requirements.yaml +++ b/charts/kibana/requirements.yaml @@ -2,3 +2,5 @@ dependencies: - name: kibana version: 2.2.0 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 cbcddbab3..d85da6b89 100644 --- a/charts/metallb/requirements.yaml +++ b/charts/metallb/requirements.yaml @@ -2,3 +2,5 @@ dependencies: - name: metallb version: 0.8.0 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 9958cbd04..d510f5243 100644 --- a/charts/nginx-ingress-controller/requirements.yaml +++ b/charts/nginx-ingress-controller/requirements.yaml @@ -2,3 +2,5 @@ dependencies: - name: nginx-ingress version: 1.33.3 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 From 84df65f584c51224959583847cc546f3b7b7b181 Mon Sep 17 00:00:00 2001 From: Tiago Loureiro Date: Thu, 29 Oct 2020 16:39:15 +0100 Subject: [PATCH 6/8] Fix the sync.sh script --- bin/sync.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bin/sync.sh b/bin/sync.sh index aabf9fc12..e104d6906 100755 --- a/bin/sync.sh +++ b/bin/sync.sh @@ -38,6 +38,9 @@ TOP_LEVEL_DIR=$SCRIPT_DIR/.. CHART_DIR=$TOP_LEVEL_DIR/charts cd "$TOP_LEVEL_DIR" +echo $CHART_DIR +asdf + chart_dir=$1 # If ./sync.sh is run with a parameter, only synchronize one chart @@ -49,6 +52,9 @@ else charts=( $(find $CHART_DIR/ -maxdepth 1 -type d | sed -n "s=$CHART_DIR/\(.\+\)=\1 =p") ) fi +echo $charts +safs + # install s3 plugin if not present # See https://github.com/hypnoglow/helm-s3/pull/56 for reason to use fork s3_plugin_version=$(helm plugin list | grep "^s3 " | awk '{print $2}' || true) @@ -73,6 +79,8 @@ 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 rm ./*.tgz &> /dev/null || true # clean any packaged files, if any for chart in "${charts[@]}"; do From 62a2ef694ad3e3121fd7c8b06cd05cd477a51e47 Mon Sep 17 00:00:00 2001 From: Tiago Loureiro Date: Thu, 29 Oct 2020 16:43:40 +0100 Subject: [PATCH 7/8] Bad push --- bin/sync.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/bin/sync.sh b/bin/sync.sh index e104d6906..fe1f43be6 100755 --- a/bin/sync.sh +++ b/bin/sync.sh @@ -38,9 +38,6 @@ TOP_LEVEL_DIR=$SCRIPT_DIR/.. CHART_DIR=$TOP_LEVEL_DIR/charts cd "$TOP_LEVEL_DIR" -echo $CHART_DIR -asdf - chart_dir=$1 # If ./sync.sh is run with a parameter, only synchronize one chart @@ -52,9 +49,6 @@ else charts=( $(find $CHART_DIR/ -maxdepth 1 -type d | sed -n "s=$CHART_DIR/\(.\+\)=\1 =p") ) fi -echo $charts -safs - # install s3 plugin if not present # See https://github.com/hypnoglow/helm-s3/pull/56 for reason to use fork s3_plugin_version=$(helm plugin list | grep "^s3 " | awk '{print $2}' || true) From db6c71f9ec4518c97da2afb6365c672877fc1c01 Mon Sep 17 00:00:00 2001 From: Tiago Loureiro Date: Thu, 29 Oct 2020 16:50:24 +0100 Subject: [PATCH 8/8] More repos --- bin/sync.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bin/sync.sh b/bin/sync.sh index fe1f43be6..52ad46bf0 100755 --- a/bin/sync.sh +++ b/bin/sync.sh @@ -75,6 +75,10 @@ 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