Skip to content

Commit 57fdecd

Browse files
committed
Merge commit '7b9cb0bdf0d55095064020c9fa27c4079aae762c'
2 parents 2c0d18f + 7b9cb0b commit 57fdecd

File tree

3 files changed

+41
-38
lines changed

3 files changed

+41
-38
lines changed

docs/scs-docs/Design-Docs/Release-Numbering-Scheme.md

+14-10
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ authors: Christian Berendt, Ralf Heiringhoff
55
state: Draft
66
---
77

8-
# Numbering scheme of the releases versions
8+
## Numbering scheme of the releases versions
99

10-
## Motivation & Goals
10+
### Motivation & Goals
1111

1212
In order to have a common understanding of how release versioning works,
1313
we wanted to create a support document to make it easier to use.
@@ -18,7 +18,7 @@ updates and different schedules per channel in mind.
1818
Regardless, we still require operators to read the release notes for
1919
certain features, bug fixes, and sometimes inevitable breaking changes.
2020

21-
## Release Tags vs Release Version
21+
### Release Tags vs Release Version
2222

2323
The release tags (R0, R1, ...) of the SCS point to their corresponding
2424
release version, which can change if, for example, a later hotfix
@@ -27,28 +27,32 @@ version is deemed necessary.
2727
Think of the "Release Tag" as the name and the "Release Version" as the
2828
point in time.
2929

30-
## Numbering Syntax
30+
### Numbering Syntax
3131

32+
```xml
3233
> v\<ongoing release version>.\<channel>.\<ongoing hotfix version>
34+
```
3335

34-
### Regex
36+
#### Regex
3537

38+
```regex
3639
> v\[0-9\]+.\[0-9\].\[0-9\]+
40+
```
3741

38-
### Channels
42+
#### Channels
3943

4044
future use is tbd = atm fixed value of 0
4145

42-
## Examples
46+
### Examples
4347

44-
<img src="Release-Numbering-Scheme.png" width="50%" alt="Release Versioning Example">
48+
![Release Versioning Example](Release-Numbering-Scheme.png)
4549

4650
| | **v42.0.0** | **v42.0.3** | ... | **v47.0.0** |
47-
|---------|-------------|-------------|-----|-------------|
51+
| ------- | ----------- | ----------- | --- | ----------- |
4852
| version | 42 | 42 | | 47 |
4953
| channel | 0 | 0 | | 0 |
5054
| hotfix | 0 | 3 | | 0 |
5155

52-
## Relationship between Release Versions and Subproject Versioning
56+
### Relationship between Release Versions and Subproject Versioning
5357

5458
tbd. see GH-28

docs/scs-docs/Design-Docs/nbde.md

+17-18
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,30 @@ against access data to data on storage media in case of lost or vendor lifecycle
1717
## Proposal
1818

1919
NBDE should be an optional security feature for the SouvereignCloudStack's infrastructure,
20-
to handle certification like C5
20+
to handle certification like C5
2121

2222
## Technical requirements and features
2323

2424
the involved components:
25-
26-
* clevis - is a JOSE'based pluggable framework which is handled automated luks encryption local
27-
inside the boot procedure an is able to handle network base encryption or combine it
28-
other methods.
2925

30-
https://github.com/latchset/clevis
31-
32-
* tang - is a small webserver with the Jose library, which is able response to clevis prepared
33-
encryption.chain and save it as a key answer it with a advertisement request, Tang
34-
relies on the JSON Object Signing and Encryption (JOSE) standards
35-
36-
https://github.com/latchset/tang
26+
- clevis - is a JOSE'based pluggable framework which is handled automated luks encryption local
27+
inside the boot procedure an is able to handle network base encryption or combine it
28+
other methods.
3729

38-
* Jose - is the Javascript Object Signing and Encryption Framework, in NBDE context it.
39-
use an rsa based. Encryption.
40-
https://jose.readthedocs.io/
30+
https://github.com/latchset/clevis
4131

42-
* LUKS - is Linux Unified Key Setup and in Version 2 the default Linux Disk Encryption
32+
- tang - is a small webserver with the Jose library, which is able response to clevis prepared
33+
encryption.chain and save it as a key answer it with a advertisement request, Tang
34+
relies on the JSON Object Signing and Encryption (JOSE) standards
4335

36+
https://github.com/latchset/tang
4437

45-
* NBDE - in detailed overview and boot procedure
38+
- Jose - is the Javascript Object Signing and Encryption Framework, in NBDE context it.
39+
use an rsa based. Encryption.
40+
<https://jose.readthedocs.io/>
4641

47-
<img src="nbde.png" width="50%" alt="Release Versioning Example">
42+
- LUKS - is Linux Unified Key Setup and in Version 2 the default Linux Disk Encryption
43+
44+
- NBDE - in detailed overview and boot procedure
45+
46+
![Release Versioning Example](nbde.png)

docs/scs-docs/Design-Docs/terms_and_roles_identity_and_access_management.md

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
The objective of this document is to define a basic set of roles and their identifiers / names in SCS. These roles can be used in the Identity and Access Management (IAM) of SCS itself and / or in services provided based on SCS. As Roles are often derived from Usecases which are derived from terms used in a project, the document starts with a definition of terms used in SCS and/or GAIA-X. These definitions should be moved into a separate document in the future.
44

5-
# Principles used to create this document
5+
## Principles used to create this document
66

77
Where possible the roles and names are derived from existing definitions or conventions used in the underlying software. As SCS is part of GAIA-X, the terms/definitions of GAIA-X are taken as a baseline and will be extended with additional roles needed in SCS. For reference, the current state of relevant GAIA-X definitions can be found at the end of this document.
88

9-
# SCS terms and their definition
9+
## SCS terms and their definition
1010

1111
These terms were defined taking into account the GAIA-X definitions to ensure that the same terms are shared.
1212

13-
term | definition
13+
term | definition
1414
-------------------|---------------
1515
Provider | Legal entity providing SCS to customers. The Provider is typically in control of physical infrastructure (Datacenter, Hosts, Storage, Network etc.) but also employs people who deploy and operate SCS.
1616
Consumer | Legal entity which can access and/or consume services hosted on SCS. Typically a Consumer is a customer of a Provider.
@@ -24,23 +24,25 @@ Host | A Host is a physical machine which is part of a Node. A Nod
2424
Node | A Node is a deployment of SCS which offers Services for Customers and/or Endusers. A Node typically is a group of physical Hosts.
2525
Operator | Person operating parts of SCS. Each Person is represented by an Identity. Access rights needed to operate are given by assigning an Identity to a Role.
2626

27-
# SCS modules / components
27+
## SCS modules / components
2828

2929
A module or component of SCS typically is a software stack deployed with a dedicated usecase. This list needs to be elaborated over time.
3030

3131
**this is a best guess example and needs review**
3232

3333
module | description
3434
-----------------------|--------------------------
35-
OpenStack_<submodule> | TBD
36-
Kubernetes_<submodule> | TBD
35+
OpenStack_```<submodule>``` | TBD
36+
Kubernetes_```<submodule>``` | TBD
3737
*to be continued* |
3838

39-
# SCS Roles
39+
## SCS Roles
4040

4141
Set of Roles which are initially part of SCS.
4242

43+
```xml
4344
A Role should be defined as "<Module>_<Usecase>", where "<Module>" is the main module this role applies to and "<Usecase>" a short term to give context which kind of rights / options are given to an identity as member of this role.
45+
```
4446

4547
**this is a best guess example and needs review**
4648

@@ -56,9 +58,7 @@ Kubernetes_Operator | TBD
5658
Kubernetes_Customer | TBD
5759
*to be continued* |
5860

59-
60-
61-
# Current definitions of GAIA-X
61+
## Current definitions of GAIA-X
6262

6363
This is an excerpt if terms defined in the GAIA-X project. The definitions are work in progress and might change, so this document might be outdated.
6464

0 commit comments

Comments
 (0)