Merge pull request #146 from renoki-co/fix/resource-version

[3.x] Fixed bug with metadata.resourceVersion was not updated

Author: rennokki

.github/workflows/ci.yml

@@ -80,6 +80,10 @@ jobs:
         echo "some-namespace" | sudo tee /var/run/secrets/kubernetes.io/serviceaccount/namespace
         sudo chmod -R 777 /var/run/secrets/kubernetes.io/serviceaccount/
 
+    - name: Setting CRDs for testing
+      run: |
+        kubectl apply -f https://raw.githubusercontent.com/bitnami-labs/sealed-secrets/main/helm/sealed-secrets/crds/sealedsecret-crd.yaml
+
     - name: Run tests
       run: |
         vendor/bin/phpunit --coverage-text --coverage-clover=coverage.xml

src/Traits/RunsClusterOperations.php

@@ -95,6 +95,21 @@ public function refreshOriginal(array $query = ['pretty' => 1])
         return $this->syncOriginalWith($this->get($query)->toArray());
     }
 
+    /**
+     * Make sure to sync the resource version with the original.
+     *
+     * @return $this
+     */
+    public function refreshResourceVersion()
+    {
+        $this->setAttribute(
+            'metadata.resourceVersion',
+            $this->original['metadata']['resourceVersion']
+        );
+
+        return $this;
+    }
+
     /**
      * Create or update the resource, wether the resource exists
      * or not within the cluster.
@@ -219,6 +234,7 @@ public function create(array $query = ['pretty' => 1])
     public function update(array $query = ['pretty' => 1]): bool
     {
         $this->refreshOriginal();
+        $this->refreshResourceVersion();
 
         // If it didn't change, no way to trigger the change.
         if (! $this->hasChanged()) {

tests/Kinds/SealedSecret.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace RenokiCo\PhpK8s\Test\Kinds;
+
+use RenokiCo\PhpK8s\Contracts\InteractsWithK8sCluster;
+use RenokiCo\PhpK8s\Kinds\K8sResource;
+use RenokiCo\PhpK8s\Traits\Resource\HasSelector;
+use RenokiCo\PhpK8s\Traits\Resource\HasSpec;
+use RenokiCo\PhpK8s\Traits\Resource\HasStatus;
+use RenokiCo\PhpK8s\Traits\Resource\HasStatusConditions;
+use RenokiCo\PhpK8s\Traits\Resource\HasTemplate;
+
+class SealedSecret extends K8sResource implements InteractsWithK8sCluster
+{
+    use HasSelector;
+    use HasSpec;
+    use HasStatus;
+    use HasStatusConditions;
+    use HasTemplate;
+
+    /**
+     * The resource Kind parameter.
+     *
+     * @var string|null
+     */
+    protected static $kind = 'SealedSecret';
+
+    /**
+     * The default version for the resource.
+     *
+     * @var string
+     */
+    protected static $defaultVersion = 'bitnami.com/v1alpha1';
+
+    /**
+     * Wether the resource has a namespace.
+     *
+     * @var bool
+     */
+    protected static $namespaceable = true;
+}

tests/YamlTest.php

@@ -4,6 +4,7 @@
 
 use RenokiCo\PhpK8s\Test\Kinds\IstioGateway;
 use RenokiCo\PhpK8s\Test\Kinds\IstioGatewayNoNamespacedVersion;
+use RenokiCo\PhpK8s\Test\Kinds\SealedSecret;
 
 class YamlTest extends TestCase
 {
@@ -119,4 +120,20 @@ public function test_yaml_import_for_crds_without_namespace()
 
         $this->assertInstanceOf(IstioGatewayNoNamespacedVersion::class, $gateway);
     }
+
+    public function test_creation_and_update_from_yaml_file()
+    {
+        SealedSecret::register('sealedSecret');
+
+        $ss = $this->cluster->fromYamlFile(__DIR__.'/yaml/sealedsecret.yaml');
+        $ss->createOrUpdate();
+
+        $ss = $this->cluster->fromYamlFile(__DIR__.'/yaml/sealedsecret.yaml');
+        $ss->createOrUpdate();
+
+        $this->assertInstanceOf(SealedSecret::class, $ss);
+        $this->assertTrue($ss->exists());
+
+        $ss->delete();
+    }
 }

tests/yaml/sealedsecret.yaml

@@ -0,0 +1,7 @@
+apiVersion: bitnami.com/v1alpha1
+kind: SealedSecret
+metadata:
+  name: mysecret
+spec:
+  encryptedData:
+    foo: AgBy3i4OJSWK+PiTySYZZA9rO43cGDEq