Always update console user.

mnlipp · Nov 15, 2024 · dc7382d · dc7382d
1 parent e864f67
commit dc7382d
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/DisplaySecretMonitor.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/DisplaySecretMonitor.java
@@ -180,6 +180,17 @@ private void patchPod(K8sClient client, Response<V1Secret> change)
     @SuppressWarnings("PMD.StringInstantiation")
     public void onGetDisplaySecrets(GetDisplayPassword event, VmChannel channel)
             throws ApiException {
+        // Update console user in status
+        var vmStub = VmDefinitionStub.get(client(),
+            new GroupVersionKind(VM_OP_GROUP, "", VM_OP_KIND_VM),
+            event.vmDefinition().namespace(), event.vmDefinition().name());
+        vmStub.updateStatus(from -> {
+            JsonObject status = from.status();
+            status.addProperty("consoleUser", event.user());
+            return status;
+        });
+
+        // Look for secret
         ListOptions options = new ListOptions();
         options.setLabelSelector("app.kubernetes.io/name=" + APP_NAME + ","
             + "app.kubernetes.io/component=" + COMP_DISPLAY_SECRET + ","
@@ -188,27 +199,19 @@ public void onGetDisplaySecrets(GetDisplayPassword event, VmChannel channel)
         var stubs = K8sV1SecretStub.list(client(),
             event.vmDefinition().namespace(), options);
         if (stubs.isEmpty()) {
+            // No secret means no password for this VM wanted
             return;
         }
         var stub = stubs.iterator().next();
 
-        // Valid request, update console user in status
-        var vmStub = VmDefinitionStub.get(client(),
-            new GroupVersionKind(VM_OP_GROUP, "", VM_OP_KIND_VM),
-            event.vmDefinition().namespace(), event.vmDefinition().name());
-        vmStub.updateStatus(from -> {
-            JsonObject status = from.status();
-            status.addProperty("consoleUser", event.user());
-            return status;
-        });
-
         // Check validity
         var model = stub.model().get();
         @SuppressWarnings("PMD.StringInstantiation")
         var expiry = Optional.ofNullable(model.getData()
             .get(DATA_PASSWORD_EXPIRY)).map(b -> new String(b)).orElse(null);
         if (model.getData().get(DATA_DISPLAY_PASSWORD) != null
             && stillValid(expiry)) {
+            // Fixed secret, don't touch
             event.setResult(
                 new String(model.getData().get(DATA_DISPLAY_PASSWORD)));
             return;