Add a test

Author: dturn

test/fixtures/crd/network_policy.yml

@@ -0,0 +1,13 @@
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: networkpolicies.stable.example.io
+  labels:
+    app: krane
+spec:
+  group: stable.example.io
+  version: v1
+  names:
+    kind: NetworkPolicy
+    plural: networkpolicies
+  scope: Namespaced

test/fixtures/crd/network_policy_cr.yml

@@ -0,0 +1,20 @@
+---
+apiVersion: "stable.example.io/v1"
+kind: NetworkPolicy
+metadata:
+  name: cr-np
+---
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: built-in-policy
+spec:
+  ingress:
+  - ports:
+    - port: 80
+      protocol: TCP
+  podSelector:
+    matchLabels:
+      app: nginx-ingress-controller
+  policyTypes:
+  - Ingress

test/integration-serial/serial_deploy_test.rb

@@ -236,6 +236,27 @@ def test_cr_merging
     assert_deploy_success(result)
   end
 
+  def test_custom_resources_predeployed_correctly_with_non_unique_kinds
+    results = deploy_global_fixtures("crd", subset: %w(network_policy.yml)) do |f|
+      # revert name muning since we're explicitly testing conflicting names
+      np = f["network_policy.yml"]["CustomResourceDefinition"].first
+      np["metadata"]["name"] = "networkpolicies.stable.example.io"
+      np["spec"]["names"] = { "kind" => "NetworkPolicy", "plural" => "networkpolicies" }
+    end
+    assert_deploy_success(results)
+    reset_logger
+
+    result = deploy_fixtures("crd", subset: %w(network_policy_cr.yml))
+    assert_deploy_success(result)
+    assert_logs_match_all([
+      /Phase 3: Predeploying priority resources/,
+      /Successfully deployed in \d.\ds: NetworkPolicy\/built-in-policy, NetworkPolicy\/cr-np/,
+      /Phase 4: Deploying all resources/,
+      /NetworkPolicy\/built-in-policy                     Created/,
+      /NetworkPolicy\/cr-np                               Exists/,
+    ], in_order: true)
+  end
+
   def test_custom_resources_predeployed
     assert_deploy_success(deploy_global_fixtures("crd", subset: %w(mail.yml things.yml widgets.yml)) do |f|
       mail = f.dig("mail.yml", "CustomResourceDefinition").first