Merge pull request #65 from renoki-co/feature/fix-authentication

[fix] Fix authentication

Author: rennokki

README.md

@@ -57,7 +57,7 @@ Can be written like this:
 use RenokiCo\PhpK8s\KubernetesCluster;
 
 // Create a new instance of KubernetesCluster
-$cluster = new KubernetesCluster('http://127.0.0.1', 8080);
+$cluster = new KubernetesCluster('http://127.0.0.1:8080');
 
 // Create a new NGINX service.
 $svc = $cluster->service()

docs/Cluster.md

@@ -11,7 +11,7 @@ You can initialize a Kubernetes Cluster class by doing so:
 ```php
 use RenokiCo\PhpK8s\KubernetesCluster;
 
-$cluster = new KubernetesCluster('http://127.0.0.1', 8080);
+$cluster = new KubernetesCluster('http://127.0.0.1:8080');
 ```
 
 ### Attaching Bearer Token

src/KubernetesCluster.php

@@ -45,13 +45,11 @@ class KubernetesCluster
      * Create a new class instance.
      *
      * @param  string  $url
-     * @param  int  $port
      * @return void
      */
-    public function __construct(string $url, int $port = 8080)
+    public function __construct(string $url)
     {
         $this->url = $url;
-        $this->port = $port;
     }
 
     /**

src/Traits/Cluster/ChecksClusterVersion.php

@@ -27,9 +27,7 @@ protected function loadClusterVersion(): void
             return;
         }
 
-        $apiUrl = $this->getApiUrl();
-
-        $callableUrl = "{$apiUrl}/version";
+        $callableUrl = "{$this->url}/version";
 
         try {
             $response = $this->getClient()->request('GET', $callableUrl);

src/Traits/Cluster/LoadsFromKubeConfig.php

@@ -86,10 +86,7 @@ protected function loadKubeConfigFromArray(array $kubeconfig, string $context):
             throw new KubeConfigUserNotFound("The user {$user} does not exist in the provided Kube Config file.");
         }
 
-        $serverAndPort = explode(':', $clusterConfig['cluster']['server']);
-
-        $this->url = $serverAndPort[0];
-        $this->port = $serverAndPort[1] ?? 8080;
+        $this->url = $clusterConfig['cluster']['server'];
 
         if (isset($clusterConfig['cluster']['certificate-authority'])) {
             $this->withCaCertificate($clusterConfig['cluster']['certificate-authority']);

src/Traits/Cluster/RunsClusterOperations.php

@@ -28,16 +28,6 @@ trait RunsClusterOperations
         self::WATCH_LOGS_OP => 'GET',
     ];
 
-    /**
-     * Get the API Cluster URL as string.
-     *
-     * @return string
-     */
-    public function getApiUrl(): string
-    {
-        return "{$this->url}:{$this->port}";
-    }
-
     /**
      * Get the callable URL for a specific path.
      *
@@ -47,7 +37,7 @@ public function getApiUrl(): string
      */
     public function getCallableUrl(string $path, array $query = ['pretty' => 1])
     {
-        return $this->getApiUrl().$path.'?'.http_build_query($query);
+        return $this->url.$path.'?'.http_build_query($query);
     }
 
     /**

tests/TestCase.php

@@ -23,7 +23,7 @@ public function setUp(): void
     {
         parent::setUp();
 
-        $this->cluster = new KubernetesCluster('http://127.0.0.1');
+        $this->cluster = new KubernetesCluster('http://127.0.0.1:8080');
 
         $this->cluster->withoutSslChecks();
     }