Some improvement with last version of Kubernetes API (#105)

* Set content type to "application/json" for post request
Allow illuminate/support 9+

* Remove beta in api
add role,rolebinding and service account

composer.json

@@ -13,7 +13,7 @@
 		"php"                   : "^7.4|^8.0",
 		"php-http/client-common": "^2.0",
 		"php-http/discovery"    : "^1.0",
-		"illuminate/support"    : "^5.0|^6.0|^7.0|^8.0",
+		"illuminate/support"    : "^5.0|^6.0|^7.0|^8.0|^9.0",
 		"ratchet/pawl"          : "^0.3",
 		"symfony/yaml"          : "^4.0|^5.0|^6.0",
 		"softcreatr/jsonpath"   : "^0.6"

src/Client.php

@@ -4,11 +4,13 @@
 use InvalidArgumentException;
 use BadMethodCallException;
 use Maclof\Kubernetes\Exceptions\ApiServerException;
+use Maclof\Kubernetes\Repositories\RoleBindingRepository;
+use Maclof\Kubernetes\Repositories\RoleRepository;
+use Maclof\Kubernetes\Repositories\ServiceAccountRepository;
 use Psr\Http\Client\ClientInterface;
 use Symfony\Component\Yaml\Yaml;
 use Symfony\Component\Yaml\Exception\ParseException as YamlParseException;
 
-use Http\Client\HttpClient;
 use Http\Client\Common\HttpMethodsClient;
 use Http\Client\Common\HttpMethodsClientInterface;
 use Http\Client\Exception\TransferException as HttpTransferException;
@@ -64,6 +66,9 @@
  * @method HorizontalPodAutoscalerRepository horizontalPodAutoscalers()
  * @method CertificateRepository certificates()
  * @method IssuersRepository issuers()
+ * @method ServiceAccountRepository serviceAccounts()
+ * @method RoleRepository roles()
+ * @method RoleBindingRepository roleBindings()
  */
 class Client
 {
@@ -381,6 +386,9 @@ public function sendRequest(string $method, string $uri, array $query = [], $bod
 
 		try {
 			$headers = $method === 'PATCH' ? $this->patchHeaders : [];
+			if ('POST' === $method) {
+				$headers['Content-Type'] = 'application/json';
+			}
 
 			if ($this->token) {
 				$token = $this->token;

src/Collections/RoleBindingCollection.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Maclof\Kubernetes\Collections;
+
+use Maclof\Kubernetes\Models\RoleBinding;
+
+/**
+ * @author      Richard Déloge <[email protected]>
+ */
+class RoleBindingCollection extends Collection
+{
+    /**
+     * @param array<int, array<mixed>|RoleBinding> $items
+     */
+    public function __construct(array $items)
+    {
+        parent::__construct($this->getServiceAccounts($items));
+    }
+
+    /**
+     * Get an array of serviceAccounts.
+     *
+     * @param  array<int, array<mixed>|RoleBinding> $items
+     * @return array<RoleBinding>
+     */
+    protected function getServiceAccounts(array $items)
+    {
+        $final = [];
+        foreach ($items as &$item) {
+            if (!$item instanceof RoleBinding) {
+                $final[] = new RoleBinding($item);
+            } else {
+                $final[] = $item;
+            }
+        }
+
+        return $final;
+    }
+}

src/Collections/RoleCollection.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Maclof\Kubernetes\Collections;
+
+use Maclof\Kubernetes\Models\Role;
+
+/**
+ * @author      Richard Déloge <[email protected]>
+ */
+class RoleCollection extends Collection
+{
+    /**
+     * @param array<int, array<mixed>|Role> $items
+     */
+    public function __construct(array $items)
+    {
+        parent::__construct($this->getServiceAccounts($items));
+    }
+
+    /**
+     * Get an array of serviceAccounts.
+     *
+     * @param  array<int, array<mixed>|Role> $items
+     * @return array<Role>
+     */
+    protected function getServiceAccounts(array $items)
+    {
+        $final = [];
+        foreach ($items as &$item) {
+            if (!$item instanceof Role) {
+                $final[] = new Role($item);
+            } else {
+                $final[] = $item;
+            }
+        }
+
+        return $final;
+    }
+}

src/Collections/ServiceAccountCollection.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Maclof\Kubernetes\Collections;
+
+use Maclof\Kubernetes\Models\ServiceAccount;
+
+/**
+ * @author      Richard Déloge <[email protected]>
+ */
+class ServiceAccountCollection extends Collection
+{
+    /**
+     * @param array<int, array<mixed>|ServiceAccount> $items
+     */
+    public function __construct(array $items)
+    {
+        parent::__construct($this->getServiceAccounts($items));
+    }
+
+    /**
+     * Get an array of serviceAccounts.
+     *
+     * @param  array<int, array<mixed>|ServiceAccount> $items
+     * @return array<ServiceAccount>
+     */
+    protected function getServiceAccounts(array $items)
+    {
+        $final = [];
+        foreach ($items as &$item) {
+            if (!$item instanceof ServiceAccount) {
+                $final[] = new ServiceAccount($item);
+            } else {
+                $final[] = $item;
+            }
+        }
+
+        return $final;
+    }
+}

src/Models/CronJob.php

@@ -5,5 +5,5 @@ class CronJob extends Model
 	/**
 	 * The api version.
 	 */
-	protected string $apiVersion = 'batch/v1beta1';
+	protected string $apiVersion = 'batch/v1';
 }

src/Models/DaemonSet.php

@@ -5,5 +5,5 @@ class DaemonSet extends Model
 	/**
 	 * The api version.
 	 */
-	protected string $apiVersion = 'extensions/v1beta1';
+	protected string $apiVersion = 'apps/v1';
 }

src/Models/HorizontalPodAutoscaler.php

@@ -5,5 +5,5 @@ class HorizontalPodAutoscaler extends \Maclof\Kubernetes\Models\Model
 	/**
 	 * The api version.
 	 */
-	protected string $apiVersion = 'autoscaling/v2beta1';
+	protected string $apiVersion = 'autoscaling/v2';
 }

src/Models/Ingress.php

@@ -5,5 +5,5 @@ class Ingress extends Model
 	/**
 	 * The api version.
 	 */
-	protected string $apiVersion = 'networking.k8s.io/v1beta1';
+	protected string $apiVersion = 'networking.k8s.io/v1';
 }

src/Models/ReplicaSet.php

@@ -5,5 +5,5 @@ class ReplicaSet extends Model
 	/**
 	 * The api version.
 	 */
-	protected string $apiVersion = 'extensions/v1beta1';
+	protected string $apiVersion = 'apps/v1';
 }

src/Models/Role.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Maclof\Kubernetes\Models;
+
+/**
+  * @author      Richard Déloge <[email protected]>
+ */
+class Role extends Model
+{
+    /**
+     * @var string
+     */
+    protected string $apiVersion = 'rbac.authorization.k8s.io/v1';
+}

src/Models/RoleBinding.php

@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Maclof\Kubernetes\Models;
+
+/**
+ * @author      Richard Déloge <[email protected]>
+ */
+class RoleBinding extends Model
+{
+    /**
+     * @var string
+     */
+    protected string $apiVersion = 'rbac.authorization.k8s.io/v1';
+}

src/Models/ServiceAccount.php

@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Maclof\Kubernetes\Models;
+
+/**
+ * @author      Richard Déloge <[email protected]>
+ */
+class ServiceAccount extends Model
+{
+}

src/Repositories/RoleBindingRepository.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Maclof\Kubernetes\Repositories;
+
+use Maclof\Kubernetes\Collections\RoleBindingCollection;
+use Maclof\Kubernetes\Models\RoleBinding;
+use Maclof\Kubernetes\Collections\Collection;
+
+/**
+ * @author      Richard Déloge <[email protected]>
+ */
+class RoleBindingRepository extends Repository
+{
+    protected string $uri = 'rolebindings';
+
+    /**
+     * @param array{items: array<int, array<mixed>|RoleBinding>} $response
+     */
+    protected function createCollection(array $response): Collection
+    {
+        return new RoleBindingCollection($response['items']);
+    }
+}

src/Repositories/RoleRepository.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Maclof\Kubernetes\Repositories;
+
+use Maclof\Kubernetes\Collections\RoleCollection;
+use Maclof\Kubernetes\Models\Role;
+use Maclof\Kubernetes\Collections\Collection;
+
+/**
+ * @author      Richard Déloge <[email protected]>
+ */
+class RoleRepository extends Repository
+{
+    protected string $uri = 'roles';
+
+    /**
+     * @param array{items: array<int, array<mixed>|Role>} $response
+     */
+    protected function createCollection(array $response): Collection
+    {
+        return new RoleCollection($response['items']);
+    }
+}

src/Repositories/ServiceAccountRepository.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Maclof\Kubernetes\Repositories;
+
+use Maclof\Kubernetes\Collections\ServiceAccountCollection;
+use Maclof\Kubernetes\Models\ServiceAccount;
+use Maclof\Kubernetes\Collections\Collection;
+
+/**
+ * @author      Richard Déloge <[email protected]>
+ */
+class ServiceAccountRepository extends Repository
+{
+    protected string $uri = 'serviceaccounts';
+
+    /**
+     * @param array{items: array<int, array<mixed>|ServiceAccount>} $response
+     */
+    protected function createCollection(array $response): Collection
+    {
+        return new ServiceAccountCollection($response['items']);
+    }
+}

src/RepositoryRegistry.php

@@ -20,30 +20,34 @@ class RepositoryRegistry implements \ArrayAccess, \Countable
         'persistentVolume'       => Repositories\PersistentVolumeRepository::class,
         'persistentVolumeClaims' => Repositories\PersistentVolumeClaimRepository::class,
         'namespaces'             => Repositories\NamespaceRepository::class,
+		'serviceAccounts'	     => Repositories\ServiceAccountRepository::class,
 
         // batch/v1
         'jobs'                   => Repositories\JobRepository::class,
 
-        // batch/v2alpha1
+        // batch/v2
         'cronJobs'               => Repositories\CronJobRepository::class,
 
         // apps/v1
         'deployments'            => Repositories\DeploymentRepository::class,
 
-        // extensions/v1beta1
+        // extensions/v1
         'daemonSets'             => Repositories\DaemonSetRepository::class,
         'ingresses'              => Repositories\IngressRepository::class,
 
-        // autoscaling/v2beta1
+        // autoscaling/v2
         'horizontalPodAutoscalers'  => Repositories\HorizontalPodAutoscalerRepository::class,
 
         // networking.k8s.io/v1
         'networkPolicies'        => Repositories\NetworkPolicyRepository::class,
 
-        // certmanager.k8s.io/v1alpha1
+        // certmanager.k8s.io/v1
         'certificates'           => Repositories\CertificateRepository::class,
         'issuers'                => Repositories\IssuerRepository::class,
 
+		//rbac.authorization.k8s.io/v1
+		'roles' 				 => Repositories\RoleRepository::class,
+		'roleBindings' 			 => Repositories\RoleBindingRepository::class,
     ];
 
     public function __construct()

tests/RepositoryRegistryTest.php

@@ -9,7 +9,7 @@ public function test_builtin_repositories(): void
     {
         $registry = new RepositoryRegistry();
 
-        $this->assertCount(22, $registry);
+        $this->assertCount(25, $registry);
     }
 
     public function test_add_repository(): void

tests/TestCase.php

@@ -30,6 +30,6 @@ protected function getFixture(string $path): ?string
 		// Fix for windows encoded fixtures.
 		$contents = str_replace("\r\n", "\n", $contents);
 
-		return $contents;
+		return trim($contents, ' ' . PHP_EOL);
 	}
 }