Merge pull request #275 from perfectsense/feature/make-taints-updatable

Make taints updatable
perfectsense · Oct 7, 2024 · c127c44 · c127c44
2 parents b677660 + 8ca79f7
commit c127c44
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/main/java/gyro/google/gke/GkeNodeConfig.java b/src/main/java/gyro/google/gke/GkeNodeConfig.java
@@ -244,6 +244,7 @@ public void setWorkloadMetadataConfig(GkeWorkloadMetadataConfig workloadMetadata
      *
      * @subresource gyro.google.gke.GkeNodeTaint
      */
+    @Updatable
     public Set<GkeNodeTaint> getTaint() {
         if (taint == null) {
             taint = new HashSet<>();

diff --git a/src/main/java/gyro/google/gke/GkeNodePool.java b/src/main/java/gyro/google/gke/GkeNodePool.java
@@ -29,6 +29,7 @@
 import com.google.container.v1beta1.GetNodePoolRequest;
 import com.google.container.v1beta1.NodeLabels;
 import com.google.container.v1beta1.NodePool;
+import com.google.container.v1beta1.NodeTaints;
 import com.google.container.v1beta1.SetNodePoolAutoscalingRequest;
 import com.google.container.v1beta1.SetNodePoolSizeRequest;
 import com.google.container.v1beta1.UpdateNodePoolRequest;
@@ -347,7 +348,7 @@ protected void doUpdate(GyroUI ui, State state, Resource current, Set<String> ch
                     });
             }
 
-            if (changedFieldNames.contains("config")) {
+            if (changedFieldNames.contains("config") && getConfig() != null) {
                 if (getConfig().getWorkloadMetadataConfig() != null) {
                     builder.setWorkloadMetadataConfig(getConfig().getWorkloadMetadataConfig()
                         .toWorkloadMetadataConfig());
@@ -359,7 +360,16 @@ protected void doUpdate(GyroUI ui, State state, Resource current, Set<String> ch
                     builder.setLabels(nlBuilder.build());
                 }
 
-                builder.setImageType(getConfig().getImageType());
+                if (getConfig().getTaint() != null) {
+                    NodeTaints.Builder ntBuilder = NodeTaints.newBuilder();
+                    getConfig().getTaint().stream().map(GkeNodeTaint::toNodeTaint).forEach(ntBuilder::addTaints);
+                    builder.setTaints(ntBuilder.build());
+                }
+
+                if (getConfig().getImageType() != null) {
+                    builder.setImageType(getConfig().getImageType());
+                }
+
                 updateCluster(client, builder);
                 builder.clear();
             }