Merge pull request #12 from Icinga/add-labels

lippserd · web-flow · commit a35e0d0dfadf · 2023-08-03T14:10:15.000+02:00
Add labels to resources
diff --git a/library/Kubernetes/Model/DaemonSet.php b/library/Kubernetes/Model/DaemonSet.php
@@ -57,6 +57,10 @@ public function createRelations(Relations $relations)
             ->belongsToMany('pods', Pod::class)
             ->through('pod_owner');
 
+        $relations
+            ->belongsToMany('label', Label::class)
+            ->through('daemon_set_label');
+
         $relations->hasMany('condition', DaemonSetCondition::class);
     }
 }
diff --git a/library/Kubernetes/Model/Deployment.php b/library/Kubernetes/Model/Deployment.php
@@ -62,6 +62,10 @@ public function createRelations(Relations $relations)
             ->belongsToMany('replica_sets', ReplicaSet::class)
             ->through('replica_set_owner');
 
+        $relations
+            ->belongsToMany('label', Label::class)
+            ->through('deployment_label');
+
         $relations->hasMany('condition', DeploymentCondition::class);
     }
 }
diff --git a/library/Kubernetes/Model/Label.php b/library/Kubernetes/Model/Label.php
@@ -69,6 +69,30 @@ public function createRelations(Relations $relations)
         $relations
             ->belongsToMany('pvc', PersistentVolumeClaim::class)
             ->through('pvc_label');
+
+        $relations
+            ->belongsToMany('deployment', Deployment::class)
+            ->through('deployment_label');
+
+        $relations
+            ->belongsToMany('replica_set', ReplicaSet::class)
+            ->through('replica_set_label');
+
+        $relations
+            ->belongsToMany('daemon_set', DaemonSet::class)
+            ->through('daemon_set_label');
+
+        $relations
+            ->belongsToMany('stateful_set', StatefulSet::class)
+            ->through('stateful_set_label');
+
+        $relations
+            ->belongsToMany('namespace', NamespaceModel::class)
+            ->through('namespace_label');
+
+        $relations
+            ->belongsToMany('node', Node::class)
+            ->through('node_label');
 //
 //        $relations->belongsToMany('contact', Contact::class)
 //            ->through('incident_contact');
diff --git a/library/Kubernetes/Model/NamespaceModel.php b/library/Kubernetes/Model/NamespaceModel.php
@@ -67,5 +67,8 @@ public function createBehaviors(Behaviors $behaviors)
 
     public function createRelations(Relations $relations)
     {
+        $relations
+            ->belongsToMany('label', Label::class)
+            ->through('namespace_label');
     }
 }
diff --git a/library/Kubernetes/Model/Node.php b/library/Kubernetes/Model/Node.php
@@ -89,6 +89,11 @@ public function createRelations(Relations $relations)
             ->hasMany('pod', Pod::class)
             ->setCandidateKey('name')
             ->setForeignKey('node_name');
+
+        $relations
+            ->belongsToMany('label', Label::class)
+            ->through('node_label');
+
 //
 //        $relations->belongsToMany('contact', Contact::class)
 //            ->through('incident_contact');
diff --git a/library/Kubernetes/Model/ReplicaSet.php b/library/Kubernetes/Model/ReplicaSet.php
@@ -65,6 +65,10 @@ public function createRelations(Relations $relations)
             ->setCandidateKey('id')
             ->setForeignKey('replica_set_id');
 
+        $relations
+            ->belongsToMany('label', Label::class)
+            ->through('replica_set_label');
+
         $relations->hasMany('condition', ReplicaSetCondition::class);
     }
 }
diff --git a/library/Kubernetes/Model/StatefulSet.php b/library/Kubernetes/Model/StatefulSet.php
@@ -63,6 +63,10 @@ public function createRelations(Relations $relations)
             ->belongsToMany('pods', Pod::class)
             ->through('pod_owner');
 
+        $relations
+            ->belongsToMany('label', Label::class)
+            ->through('stateful_set_label');
+
         $relations->hasMany('condition', StatefulSetCondition::class);
     }
 }
diff --git a/library/Kubernetes/Web/DaemonSetDetail.php b/library/Kubernetes/Web/DaemonSetDetail.php
@@ -5,6 +5,7 @@
 use Icinga\Module\Kubernetes\Common\Database;
 use Icinga\Module\Kubernetes\Model\DaemonSet;
 use Icinga\Module\Kubernetes\Model\Event;
+use Icinga\Module\Kubernetes\Model\Label;
 use Icinga\Module\Kubernetes\Model\ReplicaSet;
 use Icinga\Module\Kubernetes\Model\ReplicaSetCondition;
 use ipl\Html\Attributes;
@@ -13,6 +14,7 @@
 use ipl\Html\Text;
 use ipl\Stdlib\Filter;
 use ipl\Stdlib\Str;
+use ipl\Web\Widget\HorizontalKeyValue;
 use ipl\Web\Widget\TimeAgo;
 
 class DaemonSetDetail extends BaseHtmlElement
@@ -49,7 +51,10 @@ protected function assemble()
             t('Created')                  => new TimeAgo($this->daemonSet->created->getTimestamp())
         ]));
 
-        $this->addHtml(new ConditionTable($this->daemonSet, (new ReplicaSetCondition())->getColumnDefinitions()));
+        $this->addHtml(
+            new Labels($this->daemonSet->label),
+            new ConditionTable($this->daemonSet, (new ReplicaSetCondition())->getColumnDefinitions())
+        );
 
         $this->addHtml(new HtmlElement(
             'section',
diff --git a/library/Kubernetes/Web/DeploymentDetail.php b/library/Kubernetes/Web/DeploymentDetail.php
@@ -6,11 +6,13 @@
 
 use Icinga\Module\Kubernetes\Model\Deployment;
 use Icinga\Module\Kubernetes\Model\DeploymentCondition;
+use Icinga\Module\Kubernetes\Model\Label;
 use ipl\Html\Attributes;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\HtmlElement;
 use ipl\Html\Text;
 use ipl\Stdlib\Str;
+use ipl\Web\Widget\HorizontalKeyValue;
 use ipl\Web\Widget\TimeAgo;
 
 class DeploymentDetail extends BaseHtmlElement
@@ -46,7 +48,10 @@ protected function assemble()
             t('Created')             => new TimeAgo($this->deployment->created->getTimestamp())
         ]));
 
-        $this->addHtml(new ConditionTable($this->deployment, (new DeploymentCondition())->getColumnDefinitions()));
+        $this->addHtml(
+            new Labels($this->deployment->label),
+            new ConditionTable($this->deployment, (new DeploymentCondition())->getColumnDefinitions())
+        );
 
         $this->addHtml(new HtmlElement(
             'section',
diff --git a/library/Kubernetes/Web/Labels.php b/library/Kubernetes/Web/Labels.php
@@ -0,0 +1,34 @@
+<?php
+
+/* Icinga Kubernetes Web | (c) 2023 Icinga GmbH | GPLv2 */
+
+namespace Icinga\Module\Kubernetes\Web;
+
+use ipl\Html\BaseHtmlElement;
+use ipl\Html\HtmlElement;
+use ipl\Html\Text;
+use ipl\Web\Widget\HorizontalKeyValue;
+
+class Labels extends BaseHtmlElement
+{
+    protected $tag = 'section';
+
+    protected $defaultAttributes = ['class' => 'labels'];
+
+    /** @var iterable<Labels> */
+    protected $labels;
+
+    public function __construct(iterable $labels)
+    {
+        $this->labels = $labels;
+    }
+
+    protected function assemble()
+    {
+        $this->addHtml(new HtmlElement('h2', null, new Text(t('Labels'))));
+
+        foreach ($this->labels as $label) {
+            $this->addHtml(new HorizontalKeyValue($label->name, $label->value));
+        }
+    }
+}
diff --git a/library/Kubernetes/Web/NamespaceDetail.php b/library/Kubernetes/Web/NamespaceDetail.php
@@ -26,12 +26,15 @@ public function __construct(NamespaceModel $namespace)
 
     protected function assemble()
     {
-        $this->addHtml(new Details([
-            t('Name')                 => $this->namespace->name,
-            t('UID')                  => $this->namespace->uid,
-            t('Resource Version')     => $this->namespace->resource_version,
-            t('Phase')                => $this->namespace->phase,
-            t('Created')              => $this->namespace->created->format('Y-m-d H:i:s')
-        ]));
+        $this->addHtml(
+            new Details([
+                t('Name')                 => $this->namespace->name,
+                t('UID')                  => $this->namespace->uid,
+                t('Resource Version')     => $this->namespace->resource_version,
+                t('Phase')                => $this->namespace->phase,
+                t('Created')              => $this->namespace->created->format('Y-m-d H:i:s')
+            ]),
+            new Labels($this->namespace->label)
+        );
     }
 }
diff --git a/library/Kubernetes/Web/NodeDetail.php b/library/Kubernetes/Web/NodeDetail.php
@@ -6,6 +6,7 @@
 
 use Icinga\Module\Kubernetes\Common\Database;
 use Icinga\Module\Kubernetes\Model\Event;
+use Icinga\Module\Kubernetes\Model\Label;
 use Icinga\Module\Kubernetes\Model\Node;
 use Icinga\Module\Kubernetes\Model\NodeCondition;
 use Icinga\Module\Kubernetes\Model\ReplicaSetCondition;
@@ -49,7 +50,10 @@ protected function assemble()
             t('Created')              => $this->node->created->format('Y-m-d H:i:s')
         ]));
 
-        $this->addHtml(new ConditionTable($this->node, (new NodeCondition())->getColumnDefinitions()));
+        $this->addHtml(
+            new Labels($this->node->label),
+            new ConditionTable($this->node, (new NodeCondition())->getColumnDefinitions())
+        );
 
         $this->addHtml(new HtmlElement(
             'section',
diff --git a/library/Kubernetes/Web/PersistentVolumeClaimDetail.php b/library/Kubernetes/Web/PersistentVolumeClaimDetail.php
@@ -44,18 +44,9 @@ protected function assemble()
             t('Storage Class') => ucfirst(Str::camel($this->pvc->storage_class)),
         ]));
 
-        $labels = new HtmlElement(
-            'section',
-            new Attributes(['class' => 'labels']),
-            new HtmlElement('h2', null, new Text(t('Labels')))
-        );
-        /** @var Label $label */
-        foreach ($this->pvc->label as $label) {
-            $labels->addHtml(new HorizontalKeyValue($label->name, $label->value));
-        }
         $this->addHtml(
+            new Labels($this->pvc->label),
             new ConditionTable($this->pvc, (new PersistentVolumeClaimCondition())->getColumnDefinitions()),
-            $labels,
         );
 
         $this->addHtml(new HtmlElement(
diff --git a/library/Kubernetes/Web/PodDetail.php b/library/Kubernetes/Web/PodDetail.php
@@ -44,19 +44,11 @@ protected function assemble()
         $details->addHtml(new HorizontalKeyValue(t('QoS Class'), ucfirst(Str::camel($this->pod->qos))));
         $details->addHtml(new HorizontalKeyValue(t('Restart Policy'), ucfirst(Str::camel($this->pod->restart_policy))));
         $details->addHtml(new HorizontalKeyValue(t('Created'), $this->pod->created->format('Y-m-d H:i:s')));
-        $labels = new HtmlElement(
-            'section',
-            new Attributes(['class' => 'labels']),
-            new HtmlElement('h2', null, new Text(t('Labels')))
-        );
-        /** @var Label $label */
-        foreach ($this->pod->label as $label) {
-            $labels->addHtml(new HorizontalKeyValue($label->name, $label->value));
-        }
+
         $this->addHtml(
             $details,
+            new Labels($this->pod->label),
             new ConditionTable($this->pod, (new PodCondition())->getColumnDefinitions()),
-            $labels,
             new HtmlElement('h2', null, new Text('Containers')),
             new ContainerList($this->pod->container),
             new HtmlElement('h2', null, new Text('Events')),
diff --git a/library/Kubernetes/Web/ReplicaSetDetail.php b/library/Kubernetes/Web/ReplicaSetDetail.php
@@ -6,13 +6,15 @@
 
 use Icinga\Module\Kubernetes\Common\Database;
 use Icinga\Module\Kubernetes\Model\Event;
+use Icinga\Module\Kubernetes\Model\Label;
 use Icinga\Module\Kubernetes\Model\ReplicaSet;
 use Icinga\Module\Kubernetes\Model\replicaSetCondition;
 use ipl\Html\Attributes;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\HtmlElement;
 use ipl\Html\Text;
 use ipl\Stdlib\Filter;
+use ipl\Web\Widget\HorizontalKeyValue;
 use ipl\Web\Widget\TimeAgo;
 
 class ReplicaSetDetail extends BaseHtmlElement
@@ -46,7 +48,10 @@ protected function assemble()
             t('Created')                => new TimeAgo($this->replicaSet->created->getTimestamp())
         ]));
 
-        $this->addHtml(new ConditionTable($this->replicaSet, (new ReplicaSetCondition())->getColumnDefinitions()));
+        $this->addHtml(
+            new Labels($this->replicaSet->label),
+            new ConditionTable($this->replicaSet, (new ReplicaSetCondition())->getColumnDefinitions())
+        );
 
         $this->addHtml(new HtmlElement(
             'section',
diff --git a/library/Kubernetes/Web/StatefulSetDetail.php b/library/Kubernetes/Web/StatefulSetDetail.php
@@ -2,13 +2,15 @@
 
 namespace Icinga\Module\Kubernetes\Web;
 
+use Icinga\Module\Kubernetes\Model\Label;
 use Icinga\Module\Kubernetes\Model\StatefulSet;
 use Icinga\Module\Kubernetes\Model\StatefulSetCondition;
 use ipl\Html\Attributes;
 use ipl\Html\BaseHtmlElement;
 use ipl\Html\HtmlElement;
 use ipl\Html\Text;
 use ipl\Stdlib\Str;
+use ipl\Web\Widget\HorizontalKeyValue;
 use ipl\Web\Widget\TimeAgo;
 
 class StatefulSetDetail extends BaseHtmlElement
@@ -42,7 +44,10 @@ protected function assemble()
             t('Created')               => new TimeAgo($this->statefulSet->created->getTimestamp())
         ]));
 
-        $this->addHtml(new ConditionTable($this->statefulSet, (new StatefulSetCondition())->getColumnDefinitions()));
+        $this->addHtml(
+            new Labels($this->statefulSet->label),
+            new ConditionTable($this->statefulSet, (new StatefulSetCondition())->getColumnDefinitions())
+        );
 
         $this->addHtml(new HtmlElement(
             'section',

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,10 @@ public function createRelations(Relations $relations)`
`57`	`57`	`->belongsToMany('pods', Pod::class)`
`58`	`58`	`->through('pod_owner');`
`59`	`59`
	`60`	`+ $relations`
	`61`	`+ ->belongsToMany('label', Label::class)`
	`62`	`+ ->through('daemon_set_label');`
	`63`	`+`
`60`	`64`	`$relations->hasMany('condition', DaemonSetCondition::class);`
`61`	`65`	`}`
`62`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,10 @@ public function createRelations(Relations $relations)`
`62`	`62`	`->belongsToMany('replica_sets', ReplicaSet::class)`
`63`	`63`	`->through('replica_set_owner');`
`64`	`64`
	`65`	`+ $relations`
	`66`	`+ ->belongsToMany('label', Label::class)`
	`67`	`+ ->through('deployment_label');`
	`68`	`+`
`65`	`69`	`$relations->hasMany('condition', DeploymentCondition::class);`
`66`	`70`	`}`
`67`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,5 +67,8 @@ public function createBehaviors(Behaviors $behaviors)`
`67`	`67`
`68`	`68`	`public function createRelations(Relations $relations)`
`69`	`69`	`{`
	`70`	`+ $relations`
	`71`	`+ ->belongsToMany('label', Label::class)`
	`72`	`+ ->through('namespace_label');`
`70`	`73`	`}`
`71`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,10 @@ public function createRelations(Relations $relations)`
`65`	`65`	`->setCandidateKey('id')`
`66`	`66`	`->setForeignKey('replica_set_id');`
`67`	`67`
	`68`	`+ $relations`
	`69`	`+ ->belongsToMany('label', Label::class)`
	`70`	`+ ->through('replica_set_label');`
	`71`	`+`
`68`	`72`	`$relations->hasMany('condition', ReplicaSetCondition::class);`
`69`	`73`	`}`
`70`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,10 @@ public function createRelations(Relations $relations)`
`63`	`63`	`->belongsToMany('pods', Pod::class)`
`64`	`64`	`->through('pod_owner');`
`65`	`65`
	`66`	`+ $relations`
	`67`	`+ ->belongsToMany('label', Label::class)`
	`68`	`+ ->through('stateful_set_label');`
	`69`	`+`
`66`	`70`	`$relations->hasMany('condition', StatefulSetCondition::class);`
`67`	`71`	`}`
`68`	`72`	`}`