chronosphereio · patrick-stephens · Dec 14, 2023 · Dec 14, 2023
diff --git a/charts/core-crd/Chart.yaml b/charts/core-crd/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: core-crd
 description: A Helm chart for Kubernetes
 type: application
-version: 2.1.2
-appVersion: "v2.1.1"
+version: 2.2.0
+appVersion: "v2.2.0"
 maintainers:
   - name: Calyptia
     email: [email protected]

diff --git a/charts/core-crd/templates/_helpers.tpl b/charts/core-crd/templates/_helpers.tpl
@@ -8,4 +8,14 @@
 
 {{- define "ingestCheck.image" -}}
 {{ include "common.images.image" (dict "imageRoot" .Values.images.ingestCheck "global" .Values.global) }}
+{{- end -}}
+
+{{- define "validateServiceType" -}}
+{{- $validTypes := list "NodePort" "LoadBalancer" "ClusterIP" -}}
+{{- $type := .Values.pipelineServiceType | default "LoadBalancer" -}}
+{{- if has $type $validTypes -}}
+{{- $type  -}}
+{{- else -}}
+LoadBalancer
+{{- end -}}
 {{- end -}}
diff --git a/charts/core-crd/templates/pipelines.yaml b/charts/core-crd/templates/pipelines.yaml
@@ -175,7 +175,7 @@ spec:
                       protocol:
                         type: string
                       serviceType:
-                        default: LoadBalancer
+                        default: {{ include "validateServiceType" . }}
                         description: Service Type string describes ingress methods for a service
                         type: string
                     type: object

diff --git a/charts/core-crd/tests/core-crd_test.yaml b/charts/core-crd/tests/core-crd_test.yaml
@@ -0,0 +1,17 @@
+suite: Test core crd
+release:
+  namespace: test
+templates:
+  - pipelines.yaml
+
+tests:
+  - it: checks kind
+    set:
+      pipelineServiceType: ClusterIP      
+    asserts:
+      - isKind:
+          of: CustomResourceDefinition
+      - equal: 
+          path: spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.ports.items.properties.serviceType.default
+          value: ClusterIP
+
diff --git a/charts/core-crd/values.yaml b/charts/core-crd/values.yaml
@@ -15,3 +15,4 @@ images:
     tag: 0.0.7
     pullSecrets: []
 cloudUrl: https://cloud-api.calyptia.com
+pipelineServiceType: LoadBalancer
diff --git a/charts/core-instance/Chart.yaml b/charts/core-instance/Chart.yaml
@@ -4,8 +4,8 @@ description: Calyptia Core Instance chart
 home: https://calyptia.com/products/core/
 icon: https://storage.googleapis.com/calyptia_public_resources_bucket/logo-darkmode.svg
 type: application
-version: 2.1.2
-appVersion: "v2.1.1"
+version: 2.2.0
+appVersion: "v2.2.0"
 maintainers:
   - name: Calyptia
     email: [email protected]

diff --git a/charts/core-instance/templates/deployment.yaml b/charts/core-instance/templates/deployment.yaml
@@ -50,6 +50,8 @@ spec:
           value: {{ .Values.healthCheckPipelineServiceType | quote }}
         - name: INGEST_CHECK_IMAGE
           value: {{ template "ingestCheck.image" . }}
+        - name: ANNOTATIONS
+          value: {{ .Values.calyptiaAnnotations }}
         image: {{ template "fromCloud.image" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | quote }}
         name: from-cloud

diff --git a/charts/core-instance/tests/core-instance_test.yaml b/charts/core-instance/tests/core-instance_test.yaml
@@ -18,6 +18,7 @@ tests:
       cloudUrl: test_url
       coreInstance: ci-1234
       cloudToken: xxx
+      calyptiaAnnotations: "test=1234,nope=4321"
       images:
         fromCloud:
           registry: custom.io
@@ -107,6 +108,11 @@ tests:
           value:
             value: custom.io/test/ingestcheck:1.2.3
             name: INGEST_CHECK_IMAGE
+      - equal:
+          path: spec.template.spec.containers[0].env[12]
+          value:
+            value: test=1234,nope=4321
+            name: ANNOTATIONS
 
       # To Cloud
       - equal:
@@ -139,3 +145,49 @@ tests:
           value:
             value: "true"
             name: NO_TLS_VERIFY
+  - it: checks annotations 
+    set:
+      coreInstance: ci-1234
+      cloudToken: xxx
+      calyptiaAnnotations: "test=1234,nope=test"
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[12]
+          value:
+            value: test=1234,nope=test
+            name: ANNOTATIONS
+  - it: checks annotations white space
+    set:
+      coreInstance: ci-1234
+      cloudToken: xxx
+      calyptiaAnnotations: "test=some three words,nope=two words"
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[12]
+          value:
+            value: test=some three words,nope=two words
+            name: ANNOTATIONS
+  - it: checks annotations special char
+    set:
+      coreInstance: ci-1234
+      cloudToken: xxx
+      calyptiaAnnotations: "[email protected],nope=two words"
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[12]
+          value:
+            value: [email protected],nope=two words
+            name: ANNOTATIONS
+  - it: checks annotations special char
+    set:
+      coreInstance: ci-1234
+      cloudToken: xxx
+      calyptiaAnnotations: "myspecial/annotation='this has spaces'"
+    asserts:
+      - equal:
+          path: spec.template.spec.containers[0].env[12]
+          value:
+            value: myspecial/annotation='this has spaces'
+            name: ANNOTATIONS
+
+
diff --git a/charts/core-instance/values.yaml b/charts/core-instance/values.yaml
@@ -8,16 +8,19 @@ cloudUrl: "https://cloud-api.calyptia.com"
 enableHealthCheckPipeline: false
 healthCheckPipelinePort: 2020
 healthCheckPipelineServiceType: LoadBalancer
+# calyptiaAnnotations is a core-instance specific parameter
+# NOT to be confused with standard annotations
+calyptiaAnnotations: ""
 images:
   fromCloud:
     registry: ghcr.io
     repository: calyptia/core-operator/sync-from-cloud
-    tag: 2.1.1
+    tag: 2.2.0
     pullSecrets: []
   toCloud:
     registry: ghcr.io
     repository: calyptia/core-operator/sync-to-cloud
-    tag: 2.1.1
+    tag: 2.2.0
     pullSecrets: []
   hotReload:
     registry: ghcr.io

diff --git a/charts/core-operator/Chart.yaml b/charts/core-operator/Chart.yaml
@@ -4,8 +4,8 @@ description: Calyptia Core Operator chart
 home: https://calyptia.com/products/core/
 icon: https://storage.googleapis.com/calyptia_public_resources_bucket/logo-darkmode.svg
 type: application
-version: 2.1.2
-appVersion: "v2.1.1"
+version: 2.2.0
+appVersion: "v2.2.0"
 maintainers:
   - name: Calyptia
     email: [email protected]

diff --git a/charts/core-operator/templates/role.yaml b/charts/core-operator/templates/role.yaml
@@ -19,6 +19,7 @@ rules:
       - rbac.authorization.k8s.io
       - security.openshift.io
     resources:
+      - events
       - namespaces
       - serviceaccounts
       - deployments

diff --git a/charts/core-operator/values.yaml b/charts/core-operator/values.yaml
@@ -4,7 +4,7 @@ images:
   operator:
     registry: ghcr.io
     repository: calyptia/core-operator
-    tag: 2.1.1
+    tag: 2.2.0
     pullSecrets: []
   hotReload:
     registry: ghcr.io