Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WPB-4470 Upgrade minio #645

Merged
merged 14 commits into from
Sep 18, 2023
Merged

WPB-4470 Upgrade minio #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
25f2224
offline.yml: Upgrade minion server / client to RELEASE.2023-07-07*
smatting Sep 6, 2023
4d89a23
list_of_docker_images.txt Upgrade minio to RELEASE.2023-07-07T07-13-57Z
smatting Sep 6, 2023
6eb9fce
Update ansible-minio
smatting Sep 6, 2023
a4e1ad7
Add jammy-updates to the mirror
smatting Sep 8, 2023
f3b4c93
fix typo
smatting Sep 8, 2023
bc12331
hi github actions
smatting Sep 8, 2023
89e7171
Run gh action on wire-server-deploy group
smatting Sep 11, 2023
143fdc3
Update runs-on
smatting Sep 11, 2023
f1a3f80
fix typo
smatting Sep 11, 2023
8607c1b
Adjust binaries
smatting Sep 11, 2023
71995a0
fix incorrect sha256sum
smatting Sep 11, 2023
58640aa
Revert "Update runs-on"
smatting Sep 13, 2023
a82abd4
Set minio_*_upgrade_from_checksums
smatting Sep 18, 2023
d553c05
upgrade ansible-minio
smatting Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 2 additions & 15 deletions .github/workflows/offline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,9 @@ jobs:
name: Prepare offline package
# Useful to skip expensive CI when writing docs
if: "!contains(github.event.head_commit.message, 'skip ci')"
runs-on: ubuntu-latest
runs-on:
group: wire-server-deploy
steps:
- name: "HACK: Free up 24GB of disk space"
run: |
sudo rm -rf /usr/share/dotnet
sudo rm -rf /usr/local/share/boost
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
# - name: Maximize build space
# uses: easimon/maximize-build-space@master
# with:
# root-reserve-mb: 4096
# temp-reserve-mb: 300
# swap-size-mb: 192
# remove-dotnet: 'true'
# remove-android: 'true'
# remove-haskell: 'true'
- uses: actions/checkout@v2
with:
submodules: true
Expand Down
2 changes: 1 addition & 1 deletion ansible/files/registry/list_of_docker_images.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ localstack/localstack:0.8.7
mesosphere/aws-cli:1.14.5
metallb/controller:v0.7.3
metallb/speaker:v0.7.3
minio/minio:RELEASE.2019-04-09T01-22-30Z
minio/minio:RELEASE.2023-07-07T07-13-57Z
namshi/smtp:latest
library/nginx:1.15
quay.io/coreos/configmap-reload:v0.0.1
Expand Down
11 changes: 7 additions & 4 deletions ansible/inventory/offline/group_vars/all/offline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,13 @@ es_version: "6.8.23"
es_use_repository: false
es_custom_package_url: "{{ binaries_url }}/elasticsearch-oss-6.8.23.deb"

minio_server_artifact_url: "{{ binaries_url }}/minio.RELEASE.2020-10-28T08-16-50Z"
minio_server_artifact_checksum: sha256:2c7e6774a9befbba6a126791f363550f8f14e34008e100d0e0e57e2ad9b2ab8c
minio_client_artifact_url: "{{ binaries_url }}/mc.RELEASE.2020-10-03T02-54-56Z"
minio_client_artifact_checksum: sha256:59e184bd4e2c3a8a19837b0f0da3977bd4e301495a24e4a5d50e291728a1de51
minio_server_artifact_url: "{{ binaries_url }}/minio.RELEASE.2023-07-07T07-13-57Z"
minio_server_artifact_checksum: sha256:f6d1aadf4baec1556880e659748d7fbc6bc8d2dac3554f816e95492d3881660a
minio_server_upgrade_from_checksums : [ "sha256:2c7e6774a9befbba6a126791f363550f8f14e34008e100d0e0e57e2ad9b2ab8c" ]

minio_client_artifact_url: "{{ binaries_url }}/mc.RELEASE.2023-07-07T05-25-51Z"
minio_client_artifact_checksum: sha256:205a2dc5a49dc467f78228c43c7d368e376c6cc14492597a7c4fe195c291f074
minio_client_upgrade_from_checksums : [ "sha256:59e184bd4e2c3a8a19837b0f0da3977bd4e301495a24e4a5d50e291728a1de51" ]

kubeconfig_localhost: true
#resolvconf_mode: none
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles-external/ansible-minio
Open in desktop
Submodule ansible-minio updated 13 files
+0 −0 .travis.disabled.yml
+0 −0 .travis.disabled/releaser.sh
+1 −1 README.md
+14 −3 defaults/main.yml
+4 −4 molecule/alternative/playbook.yml
+1 −0 molecule/client/playbook.yml
+5 −3 molecule/client/verify.yml
+0 −4 molecule/layouts/molecule.yml
+1 −1 molecule/layouts/playbook.yml
+16 −0 tasks/install-client.yml
+65 −1 tasks/install-server.yml
+7 −0 templates/minio.env.j2
+3 −1 test-requirements.txt
8 changes: 4 additions & 4 deletions nix/pkgs/wire-binaries.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ let
};
minio = fetchurl rec {
passthru.url = url;
url = "https://dl.min.io/server/minio/release/linux-amd64/archive/minio.RELEASE.2020-10-28T08-16-50Z";
sha256 = "135bnbcjlzp5w3801q8883ii93qgamiz74b729mbmyxym5s6fzic";
url = "https://dl.min.io/server/minio/release/linux-amd64/archive/minio.RELEASE.2023-07-07T07-13-57Z";
sha256 = "sha256-9tGq30uuwVVogOZZdI1/vGvI0trDVU+BbpVJLTiBZgo=";
};
mc = fetchurl rec {
passthru.url = url;
url = "https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2020-10-03T02-54-56Z";
sha256 = "0lfyl4l1fa8fsnjy892s940y7m3vjyihs3vvhccqlfic9syq9qar";
url = "https://dl.min.io/client/mc/release/linux-amd64/archive/mc.RELEASE.2023-07-07T05-25-51Z";
sha256 = "sha256-IFotxaSdxGf3gijEPH02jjdsbMFEkll6fE/hlcKR8HQ=";
};
elasticsearch = fetchurl rec {
passthru.url = url;
Expand Down
5 changes: 4 additions & 1 deletion nix/scripts/mirror-apt-jammy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,17 +117,20 @@ gpg --list-keys --no-default-keyring --keyring=trustedkeys.gpg

$aptly mirror create -architectures=amd64 -filter="${packages_}" -filter-with-deps jammy http://de.archive.ubuntu.com/ubuntu/ jammy main universe
$aptly mirror create -architectures=amd64 -filter="${packages_}" -filter-with-deps jammy-security http://de.archive.ubuntu.com/ubuntu/ jammy-security main universe
$aptly mirror create -architectures=amd64 -filter="${packages_}" -filter-with-deps jammy-updates http://de.archive.ubuntu.com/ubuntu/ jammy-updates main universe
$aptly mirror create -architectures=amd64 -filter="${docker_packages}" -filter-with-deps docker-ce https://download.docker.com/linux/ubuntu jammy stable

$aptly mirror update jammy
$aptly mirror update jammy-security
$aptly mirror update jammy-updates
$aptly mirror update docker-ce

$aptly snapshot create jammy from mirror jammy
$aptly snapshot create jammy-security from mirror jammy-security
$aptly snapshot create jammy-updates from mirror jammy-updates
$aptly snapshot create docker-ce from mirror docker-ce

$aptly snapshot merge wire jammy jammy-security docker-ce
$aptly snapshot merge wire jammy jammy-security jammy-updates docker-ce

$aptly publish snapshot -gpg-key="[email protected]" -secret-keyring="$GNUPGHOME/secring.gpg" -distribution jammy wire

Expand Down
2 changes: 1 addition & 1 deletion offline/ubuntu22.04_installation.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ Layout - English, Variant -> English --> Done

Select Ubuntu Server (minimized) --> Done

Network connections --> Make suere you get something like "DHCPv4 172.16.0.8/24" --> Done
Network connections --> Make sure you get something like "DHCPv4 172.16.0.8/24" --> Done

Proxy Address - dont change anything --> Done

Expand Down
Loading