Merge pull request #265 from chronosphereio/ci_update_core_operator_c…

…hart ci: update Core Operator chart
chronosphereio · Jun 24, 2024 · 7bb412e · 7bb412e
2 parents 8e64f12 + 70796cd
commit 7bb412e
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 10 deletions.
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.13.1
-appVersion: "v2.13.1"
+version: 2.13.2
+appVersion: "v2.14.0"
 maintainers:
   - name: Calyptia
     email: [email protected]

diff --git a/charts/core-crd/values.yaml b/charts/core-crd/values.yaml
@@ -7,7 +7,7 @@ images:
   fluentBit:
     registry: ghcr.io
     repository: calyptia/core/calyptia-fluent-bit
-    tag: 24.6.8
+    tag: 24.6.9
     pullSecrets: []
   ingestCheck:
     registry: ghcr.io

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.13.1
-appVersion: "v2.13.1"
+version: 2.13.2
+appVersion: "v2.14.0"
 maintainers:
   - name: Calyptia
     email: [email protected]

diff --git a/charts/core-instance/templates/deployment.yaml b/charts/core-instance/templates/deployment.yaml
@@ -71,6 +71,8 @@ spec:
           value: {{ .Values.no_proxy | quote }}     
         - name: CLOUD_PROXY
           value: {{ .Values.cloud_proxy | quote }} 
+        - name: METRICS
+          value: {{ default false .Values.metrics | quote }}
         image: {{ template "fromCloud.image" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | quote }}
         name: from-cloud
@@ -101,6 +103,8 @@ spec:
           value: {{ .Values.metricsPort | toYaml }}   
         - name: HTTP_PROXY
           value: {{ .Values.http_proxy | quote }}   
+        - name: METRICS
+          value: {{ default false .Values.metrics | quote }}
         image: {{ template "toCloud.image" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | quote }}
         name: to-cloud

diff --git a/charts/core-instance/tests/core-instance_test.yaml b/charts/core-instance/tests/core-instance_test.yaml
@@ -127,6 +127,11 @@ tests:
             value:
               value: cloud
               name: CLOUD_PROXY
+      - equal:
+          path: spec.template.spec.containers[0].env[19]
+          value:
+            value: "false"
+            name: METRICS
       # To Cloud
       - equal:
           path: spec.template.spec.containers[1].env[0]
@@ -166,6 +171,11 @@ tests:
           value:
             value: https
             name: HTTP_PROXY
+      - equal:
+          path: spec.template.spec.containers[1].env[8]
+          value:
+            value: "false"
+            name: METRICS
   - it: checks annotations
     set:
       coreInstance: ci-1234

diff --git a/charts/core-instance/values.yaml b/charts/core-instance/values.yaml
@@ -20,12 +20,12 @@ images:
   fromCloud:
     registry: ghcr.io
     repository: calyptia/core-operator/sync-from-cloud
-    tag: 2.13.1
+    tag: 2.14.0
     pullSecrets: []
   toCloud:
     registry: ghcr.io
     repository: calyptia/core-operator/sync-to-cloud
-    tag: 2.13.1
+    tag: 2.14.0
     pullSecrets: []
   hotReload:
     registry: ghcr.io
@@ -39,6 +39,8 @@ images:
     pullSecrets: []
 notls: "true"
 interval: "15s"
+# enables core instance metrics
+metrics: "false"
 metricsPort: "15334"
 commonAnnotations: {}
 commonLabels: {}

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.13.1
-appVersion: "v2.13.1"
+version: 2.13.2
+appVersion: "v2.14.0"
 maintainers:
   - name: Calyptia
     email: [email protected]

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.13.1
+    tag: 2.14.0
     pullSecrets: []
   hotReload:
     registry: ghcr.io