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.

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

Volume preparation using Salt formulas #1513

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
5299969
salt/volume: Installed required dependencies
Ebaneck Aug 12, 2019
101c99a
salt/volume: add helper to convert k8s quantity to bytes
Ebaneck Aug 12, 2019
a6a6c12
salt/volume: Add sparseLoopDevice creation
Ebaneck Aug 12, 2019
8f510a1
salt/volume: add module/state for sparse loop device
slaperche-scality Aug 12, 2019
9e2af17
salt/volume: add module/state for mkfs
slaperche-scality Aug 12, 2019
26fb0c8
salt/volume: rework volume Salt module
slaperche-scality Aug 13, 2019
6b4a17f
salt/volume: make the volume parameter optional
slaperche-scality Aug 13, 2019
7f12233
salt/volume: add support for rawBlockDevice
slaperche-scality Aug 13, 2019
65fa3e7
salt/volume: rename prepare to prepared
Ebaneck Aug 13, 2019
c543539
salt/volume: Add a minion startup state
Ebaneck Aug 13, 2019
6e8e15f
salt/volume: don't overload __getitem__
slaperche-scality Aug 13, 2019
67f1de0
salt/volume: remove useless losetup options
slaperche-scality Aug 13, 2019
6e606f0
salt/volume: add a safety check before formatting
slaperche-scality Aug 13, 2019
2ce0b77
salt/volume: improve `mkfs` handling
slaperche-scality Aug 13, 2019
d078691
salt/volume: fix loop device setup
slaperche-scality Aug 13, 2019
3a1f1e1
salt/volume: don't rely on `disk.fstype`
slaperche-scality Aug 13, 2019
b727a96
salt/volume: use `name` instead of `volume`
slaperche-scality Aug 14, 2019
68e97e5
salt/volume: use UUID for `is_formatted`
slaperche-scality Aug 15, 2019
5ff4ea9
salt/volume: use libblkid directly
slaperche-scality Aug 15, 2019
f704feb
storage-operator/salt: fix PrepareVolume
slaperche-scality Aug 12, 2019
1c5593a
storage-operator/salt: compute saltenv
slaperche-scality Aug 14, 2019
9fe733a
storage-operator/salt: fix job polling
slaperche-scality Aug 14, 2019
56eda6d
storage-operator/salt: fix operator permissions
slaperche-scality Aug 13, 2019
3855fe1
salt/volume: use dedicated state for startup
slaperche-scality Aug 19, 2019
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
8 changes: 8 additions & 0 deletions buildchain/buildchain/salt_tree.py
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,11 @@ def _get_parts(self) -> Iterator[str]:
Path('salt/metalk8s/salt/minion/local.sls'),
Path('salt/metalk8s/salt/minion/running.sls'),

Path('salt/metalk8s/volumes/init.sls'),
Path('salt/metalk8s/volumes/prepared/init.sls'),
Path('salt/metalk8s/volumes/prepared/installed.sls'),
Path('salt/metalk8s/volumes/provisioned/init.sls'),

Path('salt/_auth/kubernetes_rbac.py'),

Path('salt/_modules/containerd.py'),
Expand All @@ -441,6 +446,7 @@ def _get_parts(self) -> Iterator[str]:
Path('salt/_modules/metalk8s_kubernetes_utils.py'),
Path('salt/_modules/metalk8s.py'),
Path('salt/_modules/metalk8s_package_manager.py'),
Path('salt/_modules/metalk8s_volumes.py'),


Path('salt/_pillar/metalk8s.py'),
Expand All @@ -462,8 +468,10 @@ def _get_parts(self) -> Iterator[str]:
Path('salt/_states/metalk8s_etcd.py'),
Path('salt/_states/metalk8s_kubernetes.py'),
Path('salt/_states/metalk8s_package_manager.py'),
Path('salt/_states/metalk8s_volumes.py'),

Path('salt/_utils/pillar_utils.py'),
Path('salt/_utils/volume_utils.py'),

# This image is defined here and not in the `image` module since it is
# saved into the `salt/` tree.
Expand Down
10 changes: 10 additions & 0 deletions buildchain/buildchain/versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,11 @@ def _version_prefix(version: str, prefix: str = 'v') -> str:
version='4.8',
release='9.el7',
),
Package(
name='e2fsprogs',
version='1.42.9',
release='13.el7',
),
Package(
name='genisoimage',
version='1.1.11',
Expand Down Expand Up @@ -332,6 +337,11 @@ def _version_prefix(version: str, prefix: str = 'v') -> str:
version='2.23.2',
release='59.el7_6.1',
),
Package(
name='xfsprogs',
version='4.5.0',
release='18.el7',
),
Package(
name='yum-plugin-versionlock',
version='1.1.31',
Expand Down
Loading