From f6a5e8fe6513de9a3d8cda35735d9350a1478e3d Mon Sep 17 00:00:00 2001
From: Serhii Zhuravel <1804871+dxops@users.noreply.github.com>
Date: Fri, 19 Apr 2024 19:09:43 +0300
Subject: [PATCH] Update ChecksClusterVersion.php

---
 composer.json                               |  4 ++--
 src/Traits/Cluster/ChecksClusterVersion.php | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 5a531531..77b31f9d 100644
--- a/composer.json
+++ b/composer.json
@@ -24,12 +24,12 @@
         }
     ],
     "require": {
+        "composer/semver": "*",
         "guzzlehttp/guzzle": "^6.5|^7.0",
         "illuminate/macroable": "^9.35|^10.1|^11.0",
         "illuminate/support": "^9.35|^10.1|^11.0",
         "ratchet/pawl": "^0.4.1",
-        "symfony/process": "^5.4|^6.0|^7.0",
-        "vierbergenlars/php-semver": "^2.1|^3.0"
+        "symfony/process": "^5.4|^6.0|^7.0"
     },
     "suggest": {
         "ext-yaml": "YAML extension is used to read or generate YAML from PHP K8s internal classes."
diff --git a/src/Traits/Cluster/ChecksClusterVersion.php b/src/Traits/Cluster/ChecksClusterVersion.php
index eedea5f2..71b3dead 100644
--- a/src/Traits/Cluster/ChecksClusterVersion.php
+++ b/src/Traits/Cluster/ChecksClusterVersion.php
@@ -2,16 +2,17 @@
 
 namespace RenokiCo\PhpK8s\Traits\Cluster;
 
+use Composer\Semver\Comparator;
+use Composer\Semver\VersionParser;
 use GuzzleHttp\Exception\ClientException;
 use RenokiCo\PhpK8s\Exceptions\KubernetesAPIException;
-use vierbergenlars\SemVer\version as Semver;
 
 trait ChecksClusterVersion
 {
     /**
      * The Kubernetes cluster version.
      *
-     * @var \vierbergenlars\SemVer\version|null
+     * @var string|null
      */
     protected $kubernetesVersion;
 
@@ -44,7 +45,7 @@ protected function loadClusterVersion(): void
 
         $json = @json_decode($response->getBody(), true);
 
-        $this->kubernetesVersion = new Semver($json['gitVersion']);
+        $this->kubernetesVersion = (new VersionParser)->normalize($json['gitVersion']);
     }
 
     /**
@@ -58,7 +59,7 @@ public function newerThan(string $kubernetesVersion): bool
     {
         $this->loadClusterVersion();
 
-        return Semver::gte(
+        return Comparator::greaterThanOrEqualTo(
             $this->kubernetesVersion, $kubernetesVersion
         );
     }
@@ -74,7 +75,7 @@ public function olderThan(string $kubernetesVersion): bool
     {
         $this->loadClusterVersion();
 
-        return Semver::lt(
+        return Comparator::lessThan(
             $this->kubernetesVersion, $kubernetesVersion
         );
     }