Merge branch 'main' into ajw-it

ibm-mas · Dec 15, 2024 · 7eeb0ea · 7eeb0ea
2 parents 94856f0 + 4a449ed
commit 7eeb0ea
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@ root-applications/test/templates/130-configs-app.yaml
 __pycache__/main.cpython-39.pyc
 site
 .venv
+.DS_Store
diff --git a/docs/drawio/appstructure.drawio b/docs/drawio/appstructure.drawio
@@ -1,6 +1,6 @@
-<mxfile host="Electron" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.7.17 Chrome/128.0.6613.36 Electron/32.0.1 Safari/537.36" version="24.7.17">
+<mxfile host="Electron" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/23.0.2 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" modified="2024-12-13T10:23:30.337Z" version="23.0.2" etag="ISNFpPIq0Vl3dzGhZENZ" type="device">
   <diagram id="ml8bYYsEtUAZJTW_Lftc" name="Page-1">
-    <mxGraphModel dx="1891" dy="1114" grid="1" gridSize="10" guides="0" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" background="#ffffff" math="0" shadow="0">
+    <mxGraphModel dx="2021" dy="1005" grid="1" gridSize="10" guides="0" tooltips="1" connect="1" arrows="1" fold="1" page="0" pageScale="1" pageWidth="827" pageHeight="1169" background="#ffffff" math="0" shadow="0">
       <root>
         <mxCell id="0" />
         <mxCell id="1" parent="0" />
@@ -28,29 +28,29 @@
         <mxCell id="134" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="5" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
-              <mxPoint x="1503" y="610" />
+              <mxPoint x="1565" y="610" />
               <mxPoint x="779" y="610" />
             </Array>
             <mxPoint x="779.0666666666666" y="660" as="targetPoint" />
           </mxGeometry>
         </mxCell>
         <mxCell id="5" value="Instance Root Appset" style="shape=parallelogram;perimeter=parallelogramPerimeter;whiteSpace=wrap;html=1;fixedSize=1;fillColor=#008a00;fontColor=#ffffff;strokeColor=#000000;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="1398" y="500" width="190" height="60" as="geometry" />
+          <mxGeometry x="1470" y="500" width="190" height="60" as="geometry" />
         </mxCell>
         <mxCell id="11" value="Operator Catalog" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="145" y="500" width="140" height="60" as="geometry" />
+          <mxGeometry x="20" y="500" width="140" height="60" as="geometry" />
         </mxCell>
         <mxCell id="13" value="Cert Manager" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="315" y="500" width="140" height="60" as="geometry" />
+          <mxGeometry x="180" y="500" width="140" height="60" as="geometry" />
         </mxCell>
         <mxCell id="14" value="DRO" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="485" y="500" width="140" height="60" as="geometry" />
+          <mxGeometry x="340" y="500" width="140" height="60" as="geometry" />
         </mxCell>
         <mxCell id="15" value="CIS Compliance" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="655" y="500" width="140" height="60" as="geometry" />
+          <mxGeometry x="500" y="500" width="140" height="60" as="geometry" />
         </mxCell>
         <mxCell id="16" value="NFD" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="825" y="500" width="140" height="60" as="geometry" />
+          <mxGeometry x="660" y="500" width="140" height="60" as="geometry" />
         </mxCell>
         <mxCell id="17" value="DB2U" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
           <mxGeometry x="1530" y="850" width="140" height="60" as="geometry" />
@@ -68,23 +68,23 @@
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="726" y="440" />
-              <mxPoint x="215" y="440" />
+              <mxPoint x="90" y="440" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="119" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="107" target="13" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="726" y="440" />
-              <mxPoint x="385" y="440" />
+              <mxPoint x="250" y="440" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="120" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="107" target="14" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="726" y="440" />
-              <mxPoint x="555" y="440" />
+              <mxPoint x="410" y="440" />
             </Array>
           </mxGeometry>
         </mxCell>
@@ -95,21 +95,21 @@
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="726" y="440" />
-              <mxPoint x="895" y="440" />
+              <mxPoint x="730" y="440" />
             </Array>
           </mxGeometry>
         </mxCell>
         <mxCell id="124" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" target="5" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="704" y="440" />
-              <mxPoint x="1498" y="440" />
+              <mxPoint x="1565" y="440" />
             </Array>
             <mxPoint x="704" y="379" as="sourcePoint" />
           </mxGeometry>
         </mxCell>
-        <mxCell id="107" value="&lt;span style=&quot;color: rgb(255, 255, 255); font-family: Helvetica; font-size: 20px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; letter-spacing: normal; orphans: 2; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline !important;&quot;&gt;Cluster Roots&lt;/span&gt;" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=10;outlineConnect=0;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;fontStyle=1;fontSize=20;strokeWidth=2;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="632.004248046875" y="299" width="190" height="80" as="geometry" />
+        <mxCell id="107" value="&lt;span style=&quot;color: rgb(255, 255, 255); font-family: Helvetica; font-size: 20px; font-style: normal; font-variant-ligatures: normal; font-variant-caps: normal; letter-spacing: normal; orphans: 2; text-indent: 0px; text-transform: none; widows: 2; word-spacing: 0px; -webkit-text-stroke-width: 0px; text-decoration-thickness: initial; text-decoration-style: initial; text-decoration-color: initial; float: none; display: inline !important;&quot;&gt;Cluster Roots&lt;/span&gt;" style="verticalLabelPosition=middle;verticalAlign=middle;html=1;shape=mxgraph.basic.layered_rect;dx=15.94;outlineConnect=0;fillColor=#0050ef;fontColor=#ffffff;strokeColor=#000000;labelPosition=center;align=center;labelBackgroundColor=none;whiteSpace=wrap;horizontal=1;fontStyle=1;fontSize=20;strokeWidth=2;spacing=0;" parent="1" vertex="1">
+          <mxGeometry x="632" y="299" width="190" height="81" as="geometry" />
         </mxCell>
         <mxCell id="136" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" parent="1" source="125" target="34" edge="1">
           <mxGeometry relative="1" as="geometry">
@@ -330,13 +330,13 @@
           </mxGeometry>
         </mxCell>
         <mxCell id="WCPXIc9LmJP7Mr7B8AD5-181" value="NVIDIA GPU" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
-          <mxGeometry x="990" y="500" width="140" height="60" as="geometry" />
+          <mxGeometry x="820" y="500" width="140" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="WCPXIc9LmJP7Mr7B8AD5-182" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" target="WCPXIc9LmJP7Mr7B8AD5-181" edge="1" source="107">
+        <mxCell id="WCPXIc9LmJP7Mr7B8AD5-182" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="107" target="WCPXIc9LmJP7Mr7B8AD5-181" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="730" y="440" />
-              <mxPoint x="1060" y="440" />
+              <mxPoint x="890" y="440" />
             </Array>
             <mxPoint x="780" y="389" as="sourcePoint" />
             <mxPoint x="905" y="510" as="targetPoint" />
@@ -348,21 +348,48 @@
         <mxCell id="WCPXIc9LmJP7Mr7B8AD5-184" value="CP4D CS Control" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
           <mxGeometry y="1010" width="140" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="2ge-qGCwmwGJbEV4CsZ1-181" value="&lt;font style=&quot;font-size: 17px;&quot;&gt;Custom Service Accounts&lt;/font&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" vertex="1" parent="1">
-          <mxGeometry x="1154" y="501" width="140" height="60" as="geometry" />
+        <mxCell id="2ge-qGCwmwGJbEV4CsZ1-181" value="&lt;font style=&quot;font-size: 17px;&quot;&gt;Custom Service Accounts&lt;/font&gt;" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" parent="1" vertex="1">
+          <mxGeometry x="1140" y="500" width="140" height="60" as="geometry" />
         </mxCell>
-        <mxCell id="2ge-qGCwmwGJbEV4CsZ1-182" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;exitX=0.493;exitY=1.048;exitDx=0;exitDy=0;exitPerimeter=0;" edge="1" parent="1" target="2ge-qGCwmwGJbEV4CsZ1-181" source="107">
+        <mxCell id="2ge-qGCwmwGJbEV4CsZ1-182" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;exitX=0.493;exitY=1.048;exitDx=0;exitDy=0;exitPerimeter=0;" parent="1" source="107" target="2ge-qGCwmwGJbEV4CsZ1-181" edge="1">
           <mxGeometry relative="1" as="geometry">
             <Array as="points">
               <mxPoint x="726" y="390" />
               <mxPoint x="730" y="390" />
               <mxPoint x="730" y="441" />
-              <mxPoint x="1230" y="441" />
+              <mxPoint x="1210" y="441" />
             </Array>
             <mxPoint x="906" y="390" as="sourcePoint" />
             <mxPoint x="1075" y="511" as="targetPoint" />
           </mxGeometry>
         </mxCell>
+        <mxCell id="Oq5OPkyUyvFc9IJOZWid-187" value="Group Sync" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" vertex="1" parent="1">
+          <mxGeometry x="980" y="500" width="140" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="Oq5OPkyUyvFc9IJOZWid-188" value="IBM RBAC" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d80073;strokeColor=#000000;fontColor=#ffffff;fontStyle=1;fontSize=20;strokeWidth=2;align=center;spacing=0;" vertex="1" parent="1">
+          <mxGeometry x="1300" y="500" width="140" height="60" as="geometry" />
+        </mxCell>
+        <mxCell id="Oq5OPkyUyvFc9IJOZWid-195" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" edge="1" parent="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="730" y="440" />
+              <mxPoint x="1050" y="440" />
+            </Array>
+            <mxPoint x="730" y="380" as="sourcePoint" />
+            <mxPoint x="1050" y="500" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
+        <mxCell id="Oq5OPkyUyvFc9IJOZWid-196" style="edgeStyle=orthogonalEdgeStyle;html=1;strokeWidth=3;orthogonal=1;strokeColor=#000000;" edge="1" parent="1">
+          <mxGeometry relative="1" as="geometry">
+            <Array as="points">
+              <mxPoint x="730" y="380" />
+              <mxPoint x="730" y="440" />
+              <mxPoint x="1370" y="440" />
+            </Array>
+            <mxPoint x="730" y="380" as="sourcePoint" />
+            <mxPoint x="1370" y="500" as="targetPoint" />
+          </mxGeometry>
+        </mxCell>
       </root>
     </mxGraphModel>
   </diagram>
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ root-applications/test/templates/130-configs-app.yaml @@
     __pycache__/main.cpython-39.pyc
     site
     .venv
+    .DS_Store