diff --git a/changelog.d/5-bug-fixes/fix-minio-image b/changelog.d/5-bug-fixes/fix-minio-image new file mode 100644 index 000000000..7cfb278d2 --- /dev/null +++ b/changelog.d/5-bug-fixes/fix-minio-image @@ -0,0 +1 @@ +Fixed: use mirror for fetching unavailable Minio images diff --git a/offline/default-build/build.sh b/offline/default-build/build.sh index 239b5937c..93b4d14f0 100755 --- a/offline/default-build/build.sh +++ b/offline/default-build/build.sh @@ -26,7 +26,7 @@ TASKS_DIR="${SCRIPT_DIR}/../tasks" # -------------------------- # pulling the charts based on builds.json, charts to be skipped are passed as arguments HELM_CHART_EXCLUDE_LIST -"${TASKS_DIR}"/proc_pull_charts.sh OUTPUT_DIR="${OUTPUT_DIR}" HELM_CHART_EXCLUDE_LIST="inbucket,wire-server-enterprise,postgresql,rust-sft,fluent-bit" +"${TASKS_DIR}"/proc_pull_charts.sh OUTPUT_DIR="${OUTPUT_DIR}" HELM_CHART_EXCLUDE_LIST="inbucket,wire-server-enterprise,postgresql,rust-sft,fluent-bit,fake-aws-s3" # pulling the charts from helm-charts repo, charts to be included are passed as arguments HELM_CHART_INCLUDE_LIST # "${TASKS_DIR}"/proc_pull_ext_charts.sh OUTPUT_DIR="${OUTPUT_DIR}" HELM_CHART_INCLUDE_LIST="postgresql-external" diff --git a/values/fake-aws-s3/demo-values.example.yaml b/values/fake-aws-s3/demo-values.example.yaml new file mode 100644 index 000000000..a6f24ad0a --- /dev/null +++ b/values/fake-aws-s3/demo-values.example.yaml @@ -0,0 +1,8 @@ +enabled: true +minio: + image: + repository: quay.io/wire/mirror-images/minio/minio + tag: RELEASE.2023-07-07T07-13-57Z + mcImage: + repository: quay.io/wire/mirror-images/minio/mc + tag: RELEASE.2023-06-28T21-54-17Z diff --git a/values/fake-aws-s3/prod-values.example.yaml b/values/fake-aws-s3/prod-values.example.yaml new file mode 100644 index 000000000..c03722b48 --- /dev/null +++ b/values/fake-aws-s3/prod-values.example.yaml @@ -0,0 +1,9 @@ +# Disable since prod should use an externally provided minio +enabled: false +minio: + image: + repository: quay.io/wire/mirror-images/minio/minio + tag: RELEASE.2023-07-07T07-13-57Z + mcImage: + repository: quay.io/wire/mirror-images/minio/mc + tag: RELEASE.2023-06-28T21-54-17Z diff --git a/values/fake-aws/demo-secrets.example.yaml b/values/fake-aws/demo-secrets.example.yaml index 2f475508e..a27832bd5 100644 --- a/values/fake-aws/demo-secrets.example.yaml +++ b/values/fake-aws/demo-secrets.example.yaml @@ -1,4 +1,3 @@ -# Disable since prod should use an externally provided minio fake-aws-s3: enabled: true minio: diff --git a/values/fake-aws/demo-values.example.yaml b/values/fake-aws/demo-values.example.yaml index ad09d557a..21509f24c 100644 --- a/values/fake-aws/demo-values.example.yaml +++ b/values/fake-aws/demo-values.example.yaml @@ -1,3 +1,9 @@ -# Disable since prod should use an externally provided minio fake-aws-s3: enabled: true + minio: + image: + repository: quay.io/wire/mirror-images/minio/minio + tag: RELEASE.2023-07-07T07-13-57Z + mcImage: + repository: quay.io/wire/mirror-images/minio/mc + tag: RELEASE.2023-06-28T21-54-17Z diff --git a/values/fake-aws/prod-values.example.yaml b/values/fake-aws/prod-values.example.yaml index 594c756af..998eeba6e 100644 --- a/values/fake-aws/prod-values.example.yaml +++ b/values/fake-aws/prod-values.example.yaml @@ -1,3 +1,10 @@ # Disable since prod should use an externally provided minio fake-aws-s3: enabled: false + minio: + image: + repository: quay.io/wire/mirror-images/minio/minio + tag: RELEASE.2023-07-07T07-13-57Z + mcImage: + repository: quay.io/wire/mirror-images/minio/mc + tag: RELEASE.2023-06-28T21-54-17Z