Merge branch 'network-policy-autodevops' into 'master'

Add Kubernetes::NetworkPolicy#autodevops?

See merge request gitlab-org/gitlab!32715

lib/gitlab/kubernetes/network_policy.rb

@@ -3,9 +3,10 @@
 module Gitlab
   module Kubernetes
     class NetworkPolicy
-      def initialize(name:, namespace:, pod_selector:, ingress:, creation_timestamp: nil, policy_types: ["Ingress"], egress: nil)
+      def initialize(name:, namespace:, pod_selector:, ingress:, labels: nil, creation_timestamp: nil, policy_types: ["Ingress"], egress: nil)
         @name = name
         @namespace = namespace
+        @labels = labels
         @creation_timestamp = creation_timestamp
         @pod_selector = pod_selector
         @policy_types = policy_types
@@ -24,6 +25,7 @@ module Gitlab
         self.new(
           name: metadata[:name],
           namespace: metadata[:namespace],
+          labels: metadata[:labels],
           pod_selector: spec[:podSelector],
           policy_types: spec[:policyTypes],
           ingress: spec[:ingress],
@@ -42,6 +44,7 @@ module Gitlab
         self.new(
           name: metadata[:name],
           namespace: metadata[:namespace],
+          labels: metadata[:labels]&.to_h,
           creation_timestamp: metadata[:creationTimestamp],
           pod_selector: spec[:podSelector],
           policy_types: spec[:policyTypes],
@@ -62,16 +65,25 @@ module Gitlab
           name: name,
           namespace: namespace,
           creation_timestamp: creation_timestamp,
-          manifest: manifest
+          manifest: manifest,
+          is_autodevops: autodevops?
         }
       end
 
+      def autodevops?
+        return false unless labels
+
+        !labels[:chart].nil? && labels[:chart].start_with?('auto-deploy-app-')
+      end
+
       private
 
-      attr_reader :name, :namespace, :creation_timestamp, :pod_selector, :policy_types, :ingress, :egress
+      attr_reader :name, :namespace, :labels, :creation_timestamp, :pod_selector, :policy_types, :ingress, :egress
 
       def metadata
-        { name: name, namespace: namespace }
+        meta = { name: name, namespace: namespace }
+        meta[:labels] = labels if labels
+        meta
       end
 
       def spec

spec/lib/gitlab/kubernetes/network_policy_spec.rb

@@ -39,28 +39,30 @@ describe Gitlab::Kubernetes::NetworkPolicy do
 
   describe '.from_yaml' do
     let(:manifest) do
-      <<-POLICY
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: example-name
-  namespace: example-namespace
-spec:
-  podSelector:
-    matchLabels:
-      role: db
-  policyTypes:
-  - Ingress
-  ingress:
-  - from:
-    - namespaceSelector:
-        matchLabels:
-          project: myproject
+      <<~POLICY
+        apiVersion: networking.k8s.io/v1
+        kind: NetworkPolicy
+        metadata:
+          name: example-name
+          namespace: example-namespace
+          labels:
+            app: foo
+        spec:
+          podSelector:
+            matchLabels:
+              role: db
+          policyTypes:
+          - Ingress
+          ingress:
+          - from:
+            - namespaceSelector:
+                matchLabels:
+                  project: myproject
       POLICY
     end
     let(:resource) do
       ::Kubeclient::Resource.new(
-        metadata: { name: name, namespace: namespace },
+        metadata: { name: name, namespace: namespace, labels: { app: 'foo' } },
         spec: { podSelector: pod_selector, policyTypes: %w(Ingress), ingress: ingress, egress: nil }
       )
     end
@@ -83,20 +85,20 @@ spec:
 
     context 'with manifest without metadata' do
       let(:manifest) do
-        <<-POLICY
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-spec:
-  podSelector:
-    matchLabels:
-      role: db
-  policyTypes:
-  - Ingress
-  ingress:
-  - from:
-    - namespaceSelector:
-        matchLabels:
-          project: myproject
+        <<~POLICY
+        apiVersion: networking.k8s.io/v1
+        kind: NetworkPolicy
+        spec:
+          podSelector:
+            matchLabels:
+              role: db
+          policyTypes:
+          - Ingress
+          ingress:
+          - from:
+            - namespaceSelector:
+                matchLabels:
+                  project: myproject
         POLICY
       end
 
@@ -105,12 +107,12 @@ spec:
 
     context 'with manifest without spec' do
       let(:manifest) do
-        <<-POLICY
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: example-name
-  namespace: example-namespace
+        <<~POLICY
+        apiVersion: networking.k8s.io/v1
+        kind: NetworkPolicy
+        metadata:
+          name: example-name
+          namespace: example-namespace
         POLICY
       end
 
@@ -119,24 +121,24 @@ metadata:
 
     context 'with disallowed class' do
       let(:manifest) do
-        <<-POLICY
-apiVersion: networking.k8s.io/v1
-kind: NetworkPolicy
-metadata:
-  name: example-name
-  namespace: example-namespace
-  creationTimestamp: 2020-04-14T00:08:30Z
-spec:
-  podSelector:
-    matchLabels:
-      role: db
-  policyTypes:
-  - Ingress
-  ingress:
-  - from:
-    - namespaceSelector:
-        matchLabels:
-          project: myproject
+        <<~POLICY
+        apiVersion: networking.k8s.io/v1
+        kind: NetworkPolicy
+        metadata:
+          name: example-name
+          namespace: example-namespace
+          creationTimestamp: 2020-04-14T00:08:30Z
+        spec:
+          podSelector:
+            matchLabels:
+              role: db
+          policyTypes:
+          - Ingress
+          ingress:
+          - from:
+            - namespaceSelector:
+                matchLabels:
+                  project: myproject
         POLICY
       end
 
@@ -147,13 +149,16 @@ spec:
   describe '.from_resource' do
     let(:resource) do
       ::Kubeclient::Resource.new(
-        metadata: { name: name, namespace: namespace, creationTimestamp: '2020-04-14T00:08:30Z', resourceVersion: '4990' },
+        metadata: {
+          name: name, namespace: namespace, creationTimestamp: '2020-04-14T00:08:30Z',
+          labels: { app: 'foo' }, resourceVersion: '4990'
+        },
         spec: { podSelector: pod_selector, policyTypes: %w(Ingress), ingress: ingress, egress: nil }
       )
     end
     let(:generated_resource) do
       ::Kubeclient::Resource.new(
-        metadata: { name: name, namespace: namespace },
+        metadata: { name: name, namespace: namespace, labels: { app: 'foo' } },
         spec: { podSelector: pod_selector, policyTypes: %w(Ingress), ingress: ingress, egress: nil }
       )
     end
@@ -213,7 +218,8 @@ spec:
             metadata: { name: name, namespace: namespace },
             spec: { podSelector: pod_selector, policyTypes: %w(Ingress Egress), ingress: ingress, egress: egress }
           }.deep_stringify_keys
-        )
+        ),
+        is_autodevops: false
       }
     end
 
@@ -221,4 +227,33 @@ spec:
 
     it { is_expected.to eq(json_policy) }
   end
+
+  describe '#autodevops?' do
+    subject { policy.autodevops? }
+
+    let(:chart) { nil }
+    let(:policy) do
+      described_class.new(
+        name: name,
+        namespace: namespace,
+        labels: { chart: chart },
+        pod_selector: pod_selector,
+        ingress: ingress
+      )
+    end
+
+    it { is_expected.to be false }
+
+    context 'with non-autodevops chart' do
+      let(:chart) { 'foo' }
+
+      it { is_expected.to be false }
+    end
+
+    context 'with autodevops chart' do
+      let(:chart) { 'auto-deploy-app-0.6.0' }
+
+      it { is_expected.to be true }
+    end
+  end
 end