Skip to content

Commit 69b0f71

Browse files
garloffgarloff
committed
Merge branch 'feat/add-iaas-image-selection' into staging
Signed-off-by: Kurt Garloff <[email protected]>
2 parents 8d57a86 + b634819 commit 69b0f71

File tree

10 files changed

+388
-105
lines changed

10 files changed

+388
-105
lines changed

‎.markdownlint-cli2.jsonc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
{
4545
"name": "double-spaces",
4646
"message": "Avoid double spaces",
47-
"searchPattern": "/([^\\s>]) ([^\\s|])/g",
48-
"replace": "$1 $2",
47+
"searchPattern": "/^([^|].*)([^\\s>]) ([^\\s|])/g",
48+
"replace": "$1 $2 $3",
4949
"skipCode": true
5050
}
5151
]

‎community/cloud-resources/cloud-resources.md‎

Lines changed: 21 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ This document gives an overview of the test and development cloud resources curr
66

77
To request access to an existing project, please contact the responsible community member. To apply for a new project, please create a pull request against this document (leave `Unique Identifier` blank) and assign it to the particular CSP team (e.g. @SovereignCloudStack/plusserver, @SovereignCloudStack/wavecon, ...)
88

9-
## plusserver (SCS1 aka gx-scs)
9+
## plusserver (SCS2)
10+
11+
SCS2 is the successor to gx-scs (or SCS1), which no longer exists.
1012

11-
### SCS1 Usage
13+
### SCS2 Usage
1214

1315
A brief guide on how to use the resources provided by plusserver GmbH can be found [here](plusserver-gx-scs.md)
1416

15-
### SCS1 Users
17+
### SCS2 Users
1618

1719
As suggested in [#155](https://github.com/SovereignCloudStack/standards/issues/155) the username for non-"service users" will contain the users github handle and are prefixed with a plusserver default.
1820
`prefix-<$github handle>`
@@ -28,10 +30,7 @@ Example:
2830
| fkr | u500924-fkr |
2931
| | |
3032

31-
> **Note**
32-
> To easy collaboration & transparency within the SCS team all users will have their default_project_id set to `p500924-scs-community` by default and will have full access on all projects listed below.
33-
34-
### SCS1 Service Users
33+
### SCS2 Service Users
3534

3635
Service users will have their default_project_id set to a specific project and will NOT be granted full access to other projects by default.
3736

@@ -44,72 +43,23 @@ Service users will have their default_project_id set to a specific project and w
4443
| 1b6bb583fc5e40e49f2a7e9b4301de65 | u500924-svc-zuul | p500924-scs-zuul | o-otte | Service User - SCS Zuul | 30.11.2024 |
4544
| | | | | | |
4645

47-
### SCS1 Projects
48-
49-
| Unique Identifier | Project Name | Community Contact | Description | Needed until |
50-
| :------------------------------: | --------------------------- | ------------------------ | ------------------------------------- | :----------: |
51-
| 2237c767cf5f456da19359ed31c1c16b | p500924-scs-community | fkr | SCS Community Project | ∞ |
52-
| b43cfafbcf1f4eb08865b2886c29e09b | p500924-cluster-api-session | garloff | cluster-api hands on session | ∞ |
53-
| 9b7a73e516be4cd1acbd63d543985c52 | p500924-gonicus-dev | o-otte | GONICUS GmbH | ∞ |
54-
| 3829cc7c8f034fc985f5055a1df6f247 | p500924-scs-healthmonitor | garloff | SCS Health Monitor | ∞ |
55-
| b97d38bf128b4479981c4dbe2ef70cd5 | p500924-SIG-IAM | fkr | SIG IAM and VP08 | ∞ |
56-
| 9de7d8dc2d674e52be44904d6b338b0b | p500924-cloudmon | Erik-Kostelansky-dNation | VP12 Test Project | 31.12.2024 |
57-
| 2c9e0e4ef8d44c36807df50b06b3c81d | p500924-cloudmon-target | Erik-Kostelansky-dNation | Target project for VP12 tests | 31.12.2024 |
58-
| 3501db829014406884990a1016f3e25d | p500924-sig-monitoring1 | fkr | SIG Monitoring - cloudmon target | ∞ |
59-
| 602778bad3d3470cbe58c4f7611e8eb7 | p500924-dnation | chess-knight | dNation dev for VP06c | ∞ |
60-
| 91091d4039a6457db27d48d58bb1b4e4 | p500924-jschoone | jschoone | KaaS dev and evaluation | ∞ |
61-
| 93956190702b4a7d8a8886806d57713f | p500924-metering | cah-link | Dev Environment for VP13 | 31.12.2023 |
62-
| abbe6561cf6248b6af395334aa09af85 | p500924-harbor | chess-knight | SCS Harbor for VP06c | ∞ |
63-
| e7622c1048ac4520a2d050ae141e826b | p500924-tender-6a | mxmxchere | Dev Environment for VP06a | ∞ |
64-
| eeed7e0ad33f42f189fb4165116f5a1b | p500924-dnation-k8s | matofeder | dNation dev for VP06c | ∞ |
65-
| b342f37804f14459bdf703573169bf79 | p500924-minery | 90n20 | Testbed env for Pentesting | 30.11.2024 |
66-
| 0fa3c3559f0d4f39ba7aa70c7f7188ca | p500924-tender-10-3 | tonifinger | Dev Environment for VP10-3 | ∞ |
67-
| b682eb90fb834278afb1182018dd2133 | p500924-scoopex | scoopex | Marc's gx-scs project | ∞ |
68-
| 021af0688c594bf88ed675b942d3bea8 | p500924-gx-cred-generator | anjastrunk | SCS Gaia-X Self-Description Generator | ∞ |
69-
| a07c811315ad40f585945b2939ef12dd | p500924-scs-zuul | o-otte | SCS Zuul | 30.11.2024 |
70-
| 1846709967a744b69f9eb48cac89bb04 | p500924-scs-k8s-e2e | chess-knight | E2E-Test for KaaS | ∞ |
71-
| 6ee4b373cb6d42a5bb59d5080987b70d | p500924-bitkeks | bitkeks | Cluster Stacks and Sec | ∞ |
72-
| 4ea22ba875474d039cb57d20b7f710b5 | p500924-kaas-playground0 | jschoone | Playground0 for Hackathon | 30.09.2024 |
73-
| 476672f1023b4bac8837f95a76881757 | p500924-kaas-playground1 | jschoone | Playground1 for Hackathon | 30.09.2024 |
74-
| 04dac2927f744479a5d4c23dd0a3c378 | p500924-kaas-playground2 | jschoone | Playground2 for Hackathon | 30.09.2024 |
75-
| 75279777029847ab9b399390c0dd6042 | p500924-kaas-playground3 | jschoone | Playground3 for Hackathon | 30.09.2024 |
76-
| 0b3c75f80b6743778daccec0da423465 | p500924-kaas-playground4 | jschoone | Playground4 for Hackathon | 30.09.2024 |
77-
| 2340a73644ca47189329061e9c2a0bfe | p500924-kaas-playground5 | jschoone | Playground5 for Hackathon | 30.09.2024 |
78-
| 3c5bae4a233c4a9d8ae2e4b799d757c9 | p500924-kaas-playground6 | jschoone | Playground6 for Hackathon | 30.09.2024 |
79-
| 03783b4952344c849af37d26818d19f0 | p500924-kaas-playground7 | jschoone | Playground7 for Hackathon | 30.09.2024 |
80-
| 5c6d4d7183834eafbc20108ad647a9c0 | p500924-kaas-playground8 | jschoone | Playground8 for Hackathon | 30.09.2024 |
81-
| 7e18881932f749baa7d547ebd407b8d8 | p500924-kaas-playground9 | jschoone | Playground9 for Hackathon | 30.09.2024 |
82-
| d9dc2f33e76240219db484526e9f601d | p500924-akafazov | akafazov | akafazov Testbed | 30.04.2024 |
83-
| b07ad6a84982471b9a344ef9947f0e0f | p500924-gtema | gtema | Testbed for gtema | ∞ |
84-
| e89ac8c9f66f46b5a983b2a05d2a66ec | p500924-zuse-z3 | zuse-z3 | Josefine's gx-scs project | ∞ |
85-
| fc1f7a0e10a64d6083dcdbcb7ccf6ff4 | p500924-compliance-monitor | mbuechse | SCS Compliance Monitor Deployment | ∞ |
86-
| eba5414a4f8549b28a62af199d82dab5 | p500924-tsmado | tsmado | tsmado's gx-scs project | ∞ |
87-
88-
## plusserver (SCS2)
89-
90-
### SCS2 Usage
91-
92-
The [guide for SCS1](plusserver-gx-scs.md) applies also to SCS2.
93-
94-
### SCS2 Users
95-
96-
See [SCS1](#SCS1 Users).
97-
9846
### SCS2 Projects
9947

100-
| Unique Identifier | Project Name | Community Contact | Description | Needed until |
101-
| :------------------------------: | -------------------------- | ----------------- | --------------------------------- | :----------: |
102-
| 9c482c928d68470ea35a764e1ba9211a | p500924-compliance-monitor | mbuechse | SCS Compliance Monitor Deployment | ∞ |
103-
| fe66fd7655814078924155876562dd3d | p500924-scs-community | fkr | SCS Community Project | ∞ |
104-
| 4a8829a5ecad480d8dde1e46a9c5284b | p500924-health-monitor | garloff | SCS Health Monitor | ∞ |
105-
| 34d3d89fc74e4db5a6df1c9ebf2f3a2a | p500924-scs-zuul | garloff | SCS Zuul | ∞ |
106-
| 293b765e3492413ba8b0067b7edcb3a3 | p500924-monitoring | garloff | SCS Monitoring | ∞ |
107-
| f2eccb67b16f4430b6d5e70afb515f9d | p500924-harbor | chess-knight | SCS Registry (Harbor) | ∞ |
108-
| 45b5e27a5fe3431083e450cf2d13e71b | p500924-kaas-playground1 | jschoone | Playground1 for Hackathon | 30.09.2025 |
109-
| ef12fed77f114eb4a20068f0422a8109 | p500924-kaas-playground2 | jschoone | Playground2 for Hackathon | 30.09.2025 |
110-
| bf8d511728a44072b7c97b1fe00947b8 | p500924-kaas-playground3 | jschoone | Moin Cluster | ∞ |
111-
| 61b315797c75431787dc20a61cbaf052 | p500924-kaas-playground4 | jschoone | Playground4 for Hackathon | 30.09.2025 |
112-
| 94f7c7507be1484a9ce6aba20d19d1c6 | p500924-kaas-playground5 | jschoone | Playground5 for Hackathon | 30.09.2025 |
48+
| Unique Identifier | Project Name | Community Contact | Description | Needed until |
49+
| :------------------------------: | --------------------------- | ----------------- | --------------------------------- | :----------: |
50+
| 9c482c928d68470ea35a764e1ba9211a | p500924-compliance-monitor | mbuechse | SCS Compliance Monitor Deployment | ∞ |
51+
| fe66fd7655814078924155876562dd3d | p500924-scs-community | fkr | SCS Community Project | ∞ |
52+
| | p500924-compliance-monitor | depressiveRobot | SCS Compliance Monitor Deployment | ∞ |
53+
| 4a8829a5ecad480d8dde1e46a9c5284b | p500924-health-monitor | garloff | SCS Health Monitor | ∞ |
54+
| 34d3d89fc74e4db5a6df1c9ebf2f3a2a | p500924-scs-zuul | garloff | SCS Zuul | ∞ |
55+
| 293b765e3492413ba8b0067b7edcb3a3 | p500924-monitoring | garloff | SCS Monitoring | ∞ |
56+
| f2eccb67b16f4430b6d5e70afb515f9d | p500924-harbor | chess-knight | SCS Registry (Harbor) | ∞ |
57+
| 45b5e27a5fe3431083e450cf2d13e71b | p500924-kaas-playground1 | jschoone | Playground1 for Hackathon | 30.09.2025 |
58+
| ef12fed77f114eb4a20068f0422a8109 | p500924-kaas-playground2 | jschoone | Playground2 for Hackathon | 30.09.2025 |
59+
| bf8d511728a44072b7c97b1fe00947b8 | p500924-kaas-playground3 | jschoone | Moin Cluster | ∞ |
60+
| 61b315797c75431787dc20a61cbaf052 | p500924-kaas-playground4 | jschoone | Playground4 for Hackathon | 30.09.2025 |
61+
| 94f7c7507be1484a9ce6aba20d19d1c6 | p500924-kaas-playground5 | jschoone | Playground5 for Hackathon | 30.09.2025 |
62+
| | p500924-openDesk-playground | gerbsen | Playground for openDesk | 30.11.2025 |
11363

11464
## Wavecon
11565

‎community/cloud-resources/plusserver-gx-scs.md‎

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,18 @@ version: 2022-12-22
44
author: Ralf Heiringhoff, Mathias Fechner
55
---
66

7-
## Getting Started on SCS1 (the Gaia-X Demonstrator @ plusserver, aka. gx-scs)
7+
## Getting Started on SCS2
88

9-
### URLs for accessing SCS1
9+
The environment SCS2 is maintained by
10+
PlusServer as reference environment and PS has agreed to provide community
11+
resources on SCS2. All SCS community activities that continue to be needed
12+
should move to SCS2.
13+
14+
### URLs for accessing SCS2
1015

11-
- UI (Horizon): [https://ui.gx-scs.sovereignit.cloud/](https://ui.gx-scs.sovereignit.cloud/)
12-
- API auth url (Keystone): [https://api.gx-scs.sovereignit.cloud:5000](https://api.gx-scs.sovereignit.cloud:5000)
13-
- Object Storage endpoint (S3/SWIFT): [https://api.gx-scs.sovereignit.cloud:8080](https://api.gx-scs.sovereignit.cloud:8080)
16+
- UI (horizon): [https://scs2.api.pco.get-cloud.io/](https://scs2.api.pco.get-cloud.io/)
17+
- API auth URL: [https://scs2.api.pco.get-cloud.io:5000/](https://scs2.api.pco.get-cloud.io:5000/)
18+
- Object Storage EP: [https://scs2.api.pco.get-cloud.io:8080/](https://scs2.api.pco.get-cloud.io:8080/)
1419

1520
### Authentication (UI)
1621

@@ -23,23 +28,3 @@ For your login you will need:
2328
### Getting Started with OpenStack
2429

2530
See [Getting Started with OpenStack](./getting-started-openstack.md)
26-
27-
## Getting started on SCS2 (the successor to SCS1)
28-
29-
After having used the SCS1 environment for validation, testing,
30-
skill building and having provided generous access to the SCS community,
31-
it will no longer be taken care of well by PlusServer as of January 2025
32-
and can thus be expected to run out of capacity and fail in other ways.
33-
It will be switched off in February 2025.
34-
SCS1 is replaced by the newer SCS2 environment that is maintained by
35-
PlusServer as reference environment and PS has agreed to provide community
36-
resources on SCS2. All SCS community activities that continue to be needed
37-
should move to SCS2.
38-
39-
Access to SCS2 is handled in the same way as to SCS1.
40-
41-
### URLs for accessing SCS2
42-
43-
- UI (horizon): [https://scs2.api.pco.get-cloud.io/](https://scs2.api.pco.get-cloud.io/)
44-
- API auth URL: [https://scs2.api.pco.get-cloud.io:5000/](https://scs2.api.pco.get-cloud.io:5000/)
45-
- Object Storage EP: [https://scs2.api.pco.get-cloud.io:8080/](https://scs2.api.pco.get-cloud.io:8080/)

‎community/tools/jitsi.md‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ The server uses an automated deployment based on the
1111

1212
Configuration is such everyone who knows the room can connect, unless the moderator
1313
sets a password/PIN. Opening a new room requires authentication. (Contact
14-
[Kurt](https://scs.community/garloff) if you need a password.)
14+
[Kurt](https://github.com/garloff) if you need a password.)
1515

1616
Links to the meeting room (as well as dial-in information) are in the appointments
1717
in the public calendar.
1818

1919
## Usage
2020

21-
Connect with a desktop browser or (for mobile devices) the Jitsi Meet App.
21+
Connect with a desktop browser, the Jitsi [desktop app](https://github.com/jitsi/jitsi-meet-electron) or the Jitsi [mobile app](https://jitsi.org/downloads/).
2222

2323
Use the little arrows in the control bar at the bottom to select speaker, microphone
2424
and camera in case you lack audio/video.
@@ -78,7 +78,9 @@ to change room assignment or to resolve issues with dial-in.
7878
## Browser specific hints
7979

8080
Traditionally, the [blink](https://en.wikipedia.org/wiki/Blink_%28browser_engine%29)-based
81-
browsers (like Google Chrome, Chromium, Edge, ...) supported WebRTC best.
81+
browsers (like Google Chrome, Chromium, Edge, ...) support WebRTC best.
82+
A Jitsi [desktop app](https://github.com/jitsi/jitsi-meet-electron) and Jitsi [mobile app](https://jitsi.org/downloads/) is also available.
83+
8284
Safari and Firefox do work, but at the cost of inferior codecs or increased CPU or
8385
bandwidth requirements (e.g. due to missing [SimulCast](https://en.wikipedia.org/wiki/Simulcast)
8486
support or missing hardware acceleration).

‎package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎standards/certification/pipeline.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ including a cronjob.
184184
```shell
185185
virtualenv .venv
186186
. .venv/bin/activate
187-
pip install -r requirements.txt
187+
pip install -r requirements.txt -r iaas/requirements.txt
188188
pip install passlib argon2_cffi # these are only needed for Step 2
189189
```
190190

‎user-docs/usage-hints/find-image/.flake8‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
[flake8]
2+
ignore = E501

0 commit comments

Comments
 (0)