Fixed services_test.yaml and services.yaml

Author: sandesvitor

CHANGELOG.md

@@ -6,7 +6,7 @@
 * New feature: Add `extra_volumes` to all python-based st2 deployments. This can facilitate changing log levels by loading logging conf file(s) from a custom ConfigMap. (#276) (by @cognifloyd)
 * Initialize basic unittest infrastructure using `helm-unittest`. Added tests for labels, custom annotations, SecurityContext, pullSecrets, pullPolicy, Resources, nodeSelector, tolerations, affinity, dnsPolicy, dnsConfig, ServiceAccount attach, postStartScript, and both sensor-modes. (#284, #288)
 * Allow partitioning sensors using the hash_range strategy instead of one sensor per pod. (#218) (by @cognifloyd)
-* New feature to include possibility for external services in st2api, st2stream and st2auth, setting default value for this services as `ClusterIP` and `hostname: ""`. (by @sandesvitor)
+* New feature to include possibility for external services in st2api, st2stream and st2auth, setting default value for this services as `ClusterIP` and `hostname: ""`. Also, added new entry for custom_annotations_test.yaml and created new unit test services_test.yaml. (by @sandesvitor)
 
 ## v0.80.0
 * Switch st2 to `v3.6` as a new default stable version (#274)

templates/services.yaml

@@ -39,7 +39,7 @@ metadata:
   name: {{ .Release.Name }}-st2api
   annotations:
     description: StackStorm st2api - service hosts the REST API endpoints that serve requests from WebUI, CLI, ChatOps and other st2 services.
-    {{- if .Values.st2web.service.hostname }}
+    {{- if .Values.st2api.service.hostname }}
     external-dns.alpha.kubernetes.io/hostname: {{ .Values.st2api.service.hostname | quote }}
     {{- end }}
     {{- if .Values.st2api.service.annotations }}

tests/unit/services_test.yaml

@@ -1,20 +1,49 @@
 ---
-suite: Services hostname and type
+suite: Services
 templates:
   # primary template files
   - services.yaml
 
 tests:
-  - it: st2web, st2auth, st2api, st2stream should work without hostname 
+  - it: st2web, st2auth, st2api, st2stream should work without externalName
+    set:
+      st2chatops:
+        enabled: false 
+    asserts:
+      - hasDocuments:
+          count: 4
+      - isNull:
+          path: spec.externalName
+          value: some-host-name
+
+  
+  - it: st2web, st2auth, st2api, st2stream should work with externalName if type is ExternalName
     set:
       st2web:
         service:
           hostname: some-host-name
-          type: LoadBalancer
+          type: ExternalName
+      st2auth:
+        service:
+          hostname: some-host-name
+          type: ExternalName
+      st2api:
+        service:
+          hostname: some-host-name
+          type: ExternalName
+      st2stream:
+        service:
+          hostname: some-host-name
+          type: ExternalName
+      st2chatops:
+        enabled: false 
     asserts:
+      - hasDocuments:
+          count: 4
       - equal:
-        path: spec.type
-        value: LoadBalancer
+          path: spec.type
+          value: ExternalName
       - equal:
-        path: spec.externalName
-        value: some-host-name
+          path: spec.externalName
+          value: some-host-name
+