Cleanup + fixes + add support for daemon sets

README.md

@@ -32,6 +32,7 @@ $ composer require maclof/kubernetes-client
 * Cron Jobs
 
 ### extensions/v1beta1
+* Daemon Sets
 * Deployments
 * Ingresses
 

src/Client.php

@@ -28,7 +28,7 @@ class Client
 	 *
 	 * @var string
 	 */
-	protected $groupVersion = 'v1';
+	protected $apiVersion = 'v1';
 
 	/**
 	 * The address of the master server.
@@ -118,6 +118,7 @@ class Client
 		'cronJobs'               => 'Repositories\CronJobRepository',
 
 		// extensions/v1beta1
+		'daemonSets'             => 'Repositories\DaemonSetRepository',
 		'deployments'            => 'Repositories\DeploymentRepository',
 		'ingresses'              => 'Repositories\IngressRepository',
 	];
@@ -253,12 +254,12 @@ public function getGuzzleClient()
 	 * @param  array   $query
 	 * @param  mixed   $body
 	 * @param  boolean $namespace
-	 * @param  string  $groupVersion
+	 * @param  string  $apiVersion
 	 * @return array
 	 */
-	public function sendRequest($method, $uri, $query = [], $body = [], $namespace = true, $groupVersion = null)
+	public function sendRequest($method, $uri, $query = [], $body = [], $namespace = true, $apiVersion = null)
 	{
-		$baseUri = $groupVersion ? '/apis/' . $groupVersion : '/api/' . $this->groupVersion;
+		$baseUri = $apiVersion ? '/apis/' . $apiVersion : '/api/' . $this->apiVersion;
 		if ($namespace) {
 			$baseUri .= '/namespaces/' . $this->namespace;
 		}

src/Collections/DaemonSetCollection.php

@@ -0,0 +1,31 @@
+<?php namespace Maclof\Kubernetes\Collections;
+
+use Maclof\Kubernetes\Models\DaemonSet;
+
+class DaemonSetCollection extends Collection
+{
+	/**
+	 * The constructor.
+	 *
+	 * @param array $data
+	 */
+	public function __construct(array $data)
+	{
+		parent::__construct($this->getDaemonSets(isset($data['items']) ? $data['items'] : []));
+	}
+
+	/**
+	 * Get an array of daemon sets.
+	 *
+	 * @param  array  $items
+	 * @return array
+	 */
+	protected function getDaemonSets(array $items)
+	{
+		foreach ($items as &$item) {
+			$item = new DaemonSet($item);
+		}
+
+		return $items;
+	}
+}

src/Models/DaemonSet.php

@@ -0,0 +1,11 @@
+<?php namespace Maclof\Kubernetes\Models;
+
+class DaemonSet extends Model
+{
+	/**
+	 * The api version.
+	 *
+	 * @var string
+	 */
+	protected $apiVersion = 'extensions/v1beta1';
+}

src/Models/Model.php

@@ -18,7 +18,7 @@ abstract class Model
 
 	/**
 	 * Whether or not the kind is plural.
-	 * 
+	 *
 	 * @var boolean
 	 */
 	protected $pluralKind = false;
@@ -80,6 +80,16 @@ public function getSchema()
 		return json_encode($schema, JSON_PRETTY_PRINT);
 	}
 
+	/**
+	 * Get the api version.
+	 *
+	 * @return string
+	 */
+	public function getApiVersion()
+	{
+		return $this->apiVersion;
+	}
+
 	/**
 	 * Get the model as a string.
 	 *

src/Repositories/CronJobRepository.php

@@ -6,8 +6,6 @@ class CronJobRepository extends Repository
 {
 	protected $uri = 'cronjobs';
 
-	protected $groupVersion = 'batch/v2alpha1';
-
 	protected function createCollection($response)
 	{
 		return new CronJobCollection($response);

src/Repositories/DaemonSetRepository.php

@@ -0,0 +1,13 @@
+<?php namespace Maclof\Kubernetes\Repositories;
+
+use Maclof\Kubernetes\Collections\DaemonSetCollection;
+
+class DaemonSetRepository extends Repository
+{
+	protected $uri = 'daemonsets';
+
+	protected function createCollection($response)
+	{
+		return new DaemonSetCollection($response);
+	}
+}

src/Repositories/DeploymentRepository.php

@@ -5,8 +5,6 @@
 class DeploymentRepository extends Repository
 {
 	protected $uri = 'deployments';
-
-	protected $groupVersion = 'extensions/v1beta1';
 
 	protected function createCollection($response)
 	{

src/Repositories/IngressRepository.php

@@ -5,8 +5,6 @@
 class IngressRepository extends Repository
 {
 	protected $uri = 'ingresses';
-
-	protected $groupVersion = 'extensions/v1beta1';
 
 	protected function createCollection($response)
 	{

src/Repositories/JobRepository.php

@@ -5,8 +5,6 @@
 class JobRepository extends Repository
 {
 	protected $uri = 'jobs';
-
-	protected $groupVersion = 'batch/v1';
 
 	protected function createCollection($response)
 	{

src/Repositories/ReplicaSetRepository.php

@@ -6,8 +6,6 @@ class ReplicaSetRepository extends Repository
 {
 	protected $uri = 'replicasets';
 
-	protected $groupVersion = 'extensions/v1beta1';
-
 	protected function createCollection($response)
 	{
 		return new ReplicaSetCollection($response);

src/Repositories/Repository.php

@@ -1,7 +1,7 @@
 <?php namespace Maclof\Kubernetes\Repositories;
 
-use Maclof\Kubernetes\Models\DeleteOptions;
 use Maclof\Kubernetes\Models\Model;
+use Maclof\Kubernetes\Models\DeleteOptions;
 
 abstract class Repository
 {
@@ -20,11 +20,11 @@ abstract class Repository
 	protected $namespace = true;
 
 	/**
-	 * The group version to use for requests.
+	 * The api version to use for requests.
 	 *
 	 * @var null
 	 */
-	protected $groupVersion = false;
+	protected $apiVersion;
 
 	/**
 	 * The label selector.
@@ -60,9 +60,37 @@ public function __construct($client)
 	 * @param  boolean $namespace
 	 * @return array
 	 */
-	public function sendRequest($method, $uri, $query = [], $body = [], $namespace = true)
+	protected function sendRequest($method, $uri, $query = [], $body = [], $namespace = true)
 	{
-		return $this->client->sendRequest($method, $uri, $query, $body, $namespace, $this->groupVersion);
+		$apiVersion = $this->getApiVersion();
+		if ($apiVersion == 'v1') {
+			$apiVersion = null;
+		}
+
+		return $this->client->sendRequest($method, $uri, $query, $body, $namespace, $apiVersion);
+	}
+
+	/**
+	 * Get the api version from the model.
+	 *
+	 * @return string
+	 */
+	protected function getApiVersion()
+	{
+		if ($this->apiVersion) {
+			return $this->apiVersion;
+		}
+
+		$className = str_replace('Repository', '', class_basename($this));
+		$classPath = 'Maclof\Kubernetes\Models\\' . $className;
+
+		if (!class_exists($classPath)) {
+			return;
+		}
+
+		$this->apiVersion = (new $classPath)->getApiVersion();
+
+		return $this->apiVersion;
 	}
 
 	/**

tests/fixtures/cron-jobs/empty.json

@@ -0,0 +1,4 @@
+{
+    "kind": "CronJob",
+    "apiVersion": "batch\/v2alpha1"
+}

tests/fixtures/jobs/empty.json

@@ -1,4 +1,4 @@
 {
     "kind": "Job",
-    "apiVersion": "extensions\/v1beta1"
+    "apiVersion": "batch\/v1"
 }

tests/models/CronJobTest.php

@@ -0,0 +1,29 @@
+<?php
+
+use Maclof\Kubernetes\Models\CronJob;
+
+class CronJobTest extends TestCase
+{
+	public function test_get_schema()
+	{
+		$job = new CronJob;
+
+		$schema = $job->getSchema();
+		$fixture = $this->getFixture('cron-jobs/empty.json');
+
+		$this->assertEquals($schema, $fixture);
+	}
+
+	public function test_get_metadata()
+	{
+		$job = new CronJob([
+			'metadata' => [
+				'name' => 'test',
+			],
+		]);
+
+		$metadata = $job->getMetadata('name');
+
+		$this->assertEquals($metadata, 'test');
+	}
+}