Merge branch 'main' into rholling-SCS-docs

Author: maxwolfs

community/central-services/plusserver-gx-scs.md

@@ -0,0 +1,68 @@
+# Central services
+
+This document gives an overview of what SCS central services are deployed and who is responsible for them in plusserver gx-scs infrastructure.
+
+## Project p500924-harbor
+
+### K8s clusters
+
+#### Harbor
+
+Responsibility: [@SovereignCloudStack/vp06c](https://github.com/orgs/SovereignCloudStack/teams/vp06c)
+
+Services:
+
+- SCS Registry <https://registry.scs.community/>
+  - [k8s-harbor](https://github.com/SovereignCloudStack/k8s-harbor/tree/main/envs/public)
+
+Utilization:
+
+- Instances: 7
+- VCPUs: 32
+- RAM: 64GB
+
+Spec:
+
+- version: v6.0.0 - R5
+- management cluster:
+  - 1 instance: SCS-2V:4:20
+  - image: Ubuntu 22.04 (20230416)
+  - k8s: v1.25.3 - KinD
+- workload cluster:
+  - 6 instances:
+    - 3 control-planes: SCS-2V:4:20
+    - 3 workers: SCS-8V:16:100
+  - image: ubuntu-capi-image-v1.27.5
+  - k8s: v1.27.5
+
+## Project p500924-sig-monitoring1
+
+### K8s clusters
+
+#### Monitoring
+
+Responsibility: [@SovereignCloudStack/vp06c](https://github.com/orgs/SovereignCloudStack/teams/vp06c)
+
+Services:
+
+- [k8s-observability](https://github.com/SovereignCloudStack/k8s-observability)
+
+Utilization:
+
+- Instances: 7
+- VCPUs: 32
+- RAM: 64GB
+
+Spec:
+
+- version: v6.0.0 - R5
+- management cluster:
+  - 1 instance: SCS-2V:4:20
+  - image: Ubuntu 22.04 (20231211)
+  - k8s: v1.27.3 - KinD
+- workload cluster:
+  - 6 instances:
+    - 3 control-planes: SCS-2V:4:20
+    - 3 workers: SCS-8V:16:100
+  - image: ubuntu-capi-image-v1.27.5
+  - k8s: v1.27.5

community/cloud-resources/cloud-resources.md

@@ -55,7 +55,7 @@ Service users will have their default_project_id set to a specific project and w
 | b97d38bf128b4479981c4dbe2ef70cd5 | p500924-SIG-IAM             | fkr               | SIG IAM and VP08                      | ∞            |
 | 9de7d8dc2d674e52be44904d6b338b0b | p500924-cloudmon            | costelter         | CloudMon Test Project                 | 31.12.2023   |
 | 2c9e0e4ef8d44c36807df50b06b3c81d | p500924-cloudmon-target     | costelter         | Target project for CloudMon tests     | 31.12.2023   |
-| 3501db829014406884990a1016f3e25d | p500924-sig-monitoring1     | fkr               | SIG Monitoring - cloudmon target      | 31.12.2023   |
+| 3501db829014406884990a1016f3e25d | p500924-sig-monitoring1     | fkr               | SIG Monitoring - cloudmon target      | ∞            |
 | 602778bad3d3470cbe58c4f7611e8eb7 | p500924-dnation             | chess-knight      | dNation dev for VP06c                 | ∞            |
 | 91091d4039a6457db27d48d58bb1b4e4 | p500924-jschoone            | jschoone          | KaaS dev and evaluation               | ∞            |
 | 93956190702b4a7d8a8886806d57713f | p500924-metering            | cah-link          | Dev Environment for VP13              | 31.12.2023   |
@@ -67,6 +67,8 @@ Service users will have their default_project_id set to a specific project and w
 | b682eb90fb834278afb1182018dd2133 | p500924-scoopex             | scoopex           | Marc's gx-scs project                 | ∞            |
 | 021af0688c594bf88ed675b942d3bea8 | p500924-gx-cred-generator   | anjastrunk        | SCS Gaia-X Self-Description Generator | ∞            |
 | a07c811315ad40f585945b2939ef12dd | p500924-scs-zuul            | o-otte            | SCS Zuul                              | 30.11.2024   |
+| 1846709967a744b69f9eb48cac89bb04 | p500924-scs-k8s-e2e         | chess-knight      | E2E-Test for KaaS                     | ∞            |
+| 6ee4b373cb6d42a5bb59d5080987b70d | p500924-bitkeks             | bitkeks           | Cluster Stacks and Sec                | ∞            |
 |                                  |                             |                   |                                       |              |
 
 ## Wavecon

package-lock.json

@@ -34,10 +34,14 @@ filenames.forEach((filename) => {
         id: filename.substring(0, filename.length - 3),
         adrId: components[1],
         version: components[2],
+        state: {},
     }
-    obj.isStable = obj.stabilized_at !== undefined && obj.stabilized_at <= today
-    obj.isObsolete = obj.obsoleted_at !== undefined && obj.obsoleted_at <= today
-    obj.isEffective = obj.isStable && !obj.isObsolete
+    // now calculate the properties for the columns (plus stable0 as a helper)
+    obj.state.draft = obj.stabilized_at === undefined
+    obj.state.stable0 = !obj.state.draft && obj.stabilized_at <= today
+    obj.state.deprecated = obj.obsoleted_at !== undefined && obj.obsoleted_at < today
+    obj.state.stable = !obj.state.draft && !obj.state.stable0 && !obj.state.deprecated
+    obj.state.effective = obj.state.stable0 && !obj.state.deprecated
     var track = obj.track
     if (track === undefined) return
     if (tracks[track] === undefined) tracks[track] = {}
@@ -100,12 +104,8 @@ ${headerLegend}
     tlines.push('| --------- | ------------ | ----- | ------- | --------- | ----------- |')
     Object.entries(trackEntry[1]).forEach((standardEntry) => {
         var versions = standardEntry[1].versions
-        // unfortunately, some standards are obsolete without being stable
-        var draftVersions = versions.filter((v) => v.stabilized_at === undefined && v.obsoleted_at === undefined)
-        var stableVersions = versions.filter((v) => v.stabilized_at !== undefined && !v.isEffective)
-        var effectiveVersions = versions.filter((v) => v.isEffective)
-        var deprecatedVersions = versions.filter((v) => v.isObsolete)
         var ref = versions[versions.length - 1]
+        var effectiveVersions = versions.filter((v) => v.state.effective)
         if (effectiveVersions.length) {
             ref = effectiveVersions[effectiveVersions.length - 1]
         }
@@ -130,7 +130,9 @@ ${headerLegend}
         slines.push('| Version  | Type  | State   | stabilized | obsoleted |')
         slines.push('| -------- | ----- | ------- | ---------- | --------- |')
         var link = `[scs-${adrId}](/standards/${track.toLowerCase()}/scs-${adrId})`
-        var versionList = `${mkLinkList(draftVersions) || '-'} | ${mkLinkList(stableVersions) || '-'} | ${mkLinkList(effectiveVersions) || '-'} | ${mkLinkList(deprecatedVersions) || '-'}`
+        var versionList = ['draft', 'stable', 'effective', 'deprecated'].map(
+            (column) => mkLinkList(versions.filter((v) => v.state[column])) || '-'
+        ).join(' | ')
         lines.push(`| ${link}  | ${track}  | ${ref.title}  | ${versionList}  |`)
         tlines.push(`| ${link}  | ${ref.title}  | ${versionList}  |`)
         standardEntry[1].versions.forEach((obj) => {
@@ -140,7 +142,7 @@ ${headerLegend}
                 id: obj.id,
             }
             standardItem.items.push(versionItem)
-            slines.push(`| [scs-${adrId}-${obj.version}](/standards/${obj.id})  | ${obj.type}  | ${obj.status || obj.state}  | ${obj.stabilized_at || '-'}  | ${obj.obsoleted_at || '-'}  |`)
+            slines.push(`| [scs-${adrId}-${obj.version}](/standards/${obj.id})  | ${obj.type}  | ${obj.status}  | ${obj.stabilized_at || '-'}  | ${obj.obsoleted_at || '-'}  |`)
         })
         slines.push('')  // file should end with a single newline character
         fs.writeFileSync(`${trackPath}/scs-${adrId}.md`, slines.join('\n'), 'utf8')