Support krane annotations for predeployed

Shopify · Aug 28, 2019 · fb8ec30 · fb8ec30
1 parent e03a947
commit fb8ec30
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/lib/kubernetes-deploy/kubernetes_resource/custom_resource_definition.rb b/lib/kubernetes-deploy/kubernetes_resource/custom_resource_definition.rb
@@ -56,6 +56,11 @@ def prunable?
       prunable == "true"
     end
 
+    def predeployed?
+      predeployed = predeployed_annotation
+      predeployed.nil? || predeployed == "true"
+    end
+
     def prunable_annotation
       if @definition.dig("metadata", "annotations").key?("kubernetes-deploy.shopify.io/prunable")
         @definition.dig("metadata", "annotations", "kubernetes-deploy.shopify.io/prunable")
@@ -64,9 +69,12 @@ def prunable_annotation
       end
     end
 
-    def predeployed?
-      predeployed = @definition.dig("metadata", "annotations", "kubernetes-deploy.shopify.io/predeployed")
-      predeployed.nil? || predeployed == "true"
+    def predeployed_annotation
+      if @definition.dig("metadata", "annotations").key?("kubernetes-deploy.shopify.io/predeployed")
+        @definition.dig("metadata", "annotations", "kubernetes-deploy.shopify.io/predeployed")
+      elsif @definition.dig("metadata", "annotations").key?("krane.shopify.io/predeployed")
+        @definition.dig("metadata", "annotations", "krane.shopify.io/predeployed")
+      end
     end
 
     def rollout_conditions

diff --git a/test/integration-serial/serial_deploy_test.rb b/test/integration-serial/serial_deploy_test.rb
@@ -225,12 +225,12 @@ def test_custom_resources_predeployed
 
       things = f.dig("things.yml", "CustomResourceDefinition").first
       things["metadata"]["annotations"] = {
-        "kubernetes-deploy.shopify.io/predeployed" => "true",
+        "krane.shopify.io/predeployed" => "true",
       }
 
       widgets = f.dig("widgets.yml", "CustomResourceDefinition").first
       widgets["metadata"]["annotations"] = {
-        "kubernetes-deploy.shopify.io/predeployed" => "false",
+        "krane.shopify.io/predeployed" => "false",
       }
     end)
     reset_logger