Merge pull request #274 from chronosphereio/ci_update_core_operator_c…

…hart ci: update Core Operator chart
chronosphereio · Jul 24, 2024 · 0ac9b8e · 0ac9b8e
2 parents 2f0f6d2 + 82fe452
commit 0ac9b8e
Show file tree

Hide file tree

Showing 19 changed files with 218 additions and 51 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: 3.1.0
-appVersion: "v3.1.0"
+version: 3.2.0
+appVersion: "v3.2.0"
 maintainers:
   - name: Calyptia
     email: [email protected]

diff --git a/charts/core-crd/tests/core-crd_test.yaml b/charts/core-crd/tests/core-crd_test.yaml
@@ -7,11 +7,10 @@ templates:
 tests:
   - it: checks kind
     set:
-      pipelineServiceType: ClusterIP      
+      pipelineServiceType: ClusterIP
     asserts:
       - isKind:
           of: CustomResourceDefinition
-      - equal: 
+      - 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
@@ -1,3 +1,6 @@
+# Turn this chart off/on
+enabled: true
+
 images:
   hotReload:
     registry: ghcr.io
@@ -7,7 +10,7 @@ images:
   fluentBit:
     registry: ghcr.io
     repository: calyptia/core/calyptia-fluent-bit
-    tag: 24.7.3
+    tag: 24.7.4
     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: 3.1.0
-appVersion: "v3.1.0"
+version: 3.2.0
+appVersion: "v3.2.0"
 maintainers:
   - name: Calyptia
     email: [email protected]

diff --git a/charts/core-instance/templates/deployment.yaml b/charts/core-instance/templates/deployment.yaml
@@ -1,12 +1,13 @@
+{{- if .Values.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: "{{- printf "calyptia-core-instance-%s" .Release.Name | trunc 63 | trimSuffix "-" -}}"
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
   {{- if .Values.commonAnnotations }}
   annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
   {{- end }}
-  labels: 
+  labels:
     app.kubernetes.io/instance: {{ .Values.coreInstance }}
 spec:
   replicas: {{ default 1 .Values.replicas }}
@@ -64,13 +65,13 @@ spec:
         - name: TOLERATIONS
           value: {{ .Values.calyptiaTolerations }}
         - name: HTTP_PROXY
-          value: {{ .Values.http_proxy | quote }}     
+          value: {{ .Values.httpProxy | quote }}
         - name: HTTPS_PROXY
-          value: {{ .Values.https_proxy | quote }}     
+          value: {{ .Values.httpsProxy | quote }}
         - name: NO_PROXY
-          value: {{ .Values.no_proxy | quote }}     
+          value: {{ .Values.noProxy | quote }}
         - name: CLOUD_PROXY
-          value: {{ .Values.cloud_proxy | quote }} 
+          value: {{ .Values.cloudProxy | quote }}
         - name: METRICS
           value: {{ default false .Values.metrics | quote }}
         image: {{ template "fromCloud.image" . }}
@@ -100,9 +101,15 @@ spec:
         - name: NO_TLS_VERIFY
           value: {{ default false .Values.notls | quote }}
         - name: METRICS_PORT
-          value: {{ .Values.metricsPort | toYaml }}   
+          value: {{ .Values.metricsPort | toYaml }}
         - name: HTTP_PROXY
-          value: {{ .Values.http_proxy | quote }}   
+          value: {{ .Values.httpProxy | quote }}
+        - name: HTTPS_PROXY
+          value: {{ .Values.httpsProxy | quote }}
+        - name: NO_PROXY
+          value: {{ .Values.noProxy | quote }}
+        - name: CLOUD_PROXY
+          value: {{ .Values.cloudProxy | quote }}
         - name: METRICS
           value: {{ default false .Values.metrics | quote }}
         image: {{ template "toCloud.image" . }}
@@ -129,3 +136,4 @@ spec:
           {{- end }}
       {{- end }}
     {{- end }}
+{{- end }}
diff --git a/charts/core-instance/templates/pull-secret.yaml b/charts/core-instance/templates/pull-secret.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.enabled }}
 {{- if .Values.imageCredentials }}
 apiVersion: v1
 kind: Secret
@@ -7,8 +8,9 @@ metadata:
   {{- end }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
   name: {{ default "regcreds" .Values.imageCredentials.secretName | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 type: kubernetes.io/dockerconfigjson
 data:
   .dockerconfigjson: {{ template "createImagePullSecret" . }}
 {{- end }}
+{{- end }}
diff --git a/charts/core-instance/templates/rbac.yaml b/charts/core-instance/templates/rbac.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.enabled }}
 {{- if .Values.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
@@ -61,5 +62,6 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ template "instance.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
-{{- end }}
+  namespace: {{ include "common.names.namespace" . | quote }}
+{{- end }}
+{{- end }}
diff --git a/charts/core-instance/templates/service-account.yaml b/charts/core-instance/templates/service-account.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.enabled }}
 {{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
@@ -15,5 +16,6 @@ metadata:
     app.kubernetes.io/part-of: operator
     calyptia.core: core-operator
   name: {{ template "instance.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "common.names.namespace" . | quote }}
+{{- end }}
 {{- end }}
diff --git a/charts/core-instance/templates/service.yaml b/charts/core-instance/templates/service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -10,14 +11,15 @@ metadata:
   {{- end }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
   name: "{{-  printf "calyptia-core-instance-metrics-%s" .Release.Name | trunc 63 | trimSuffix "-" -}}"
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 spec:
   ports:
   - name: metrics
-    port: {{ .Values.metricsPort | int }}
+    port: {{ default 15334 .Values.metricsPort | int }}
     protocol: TCP
     targetPort: metrics
   selector:
     app.kubernetes.io/part-of: calyptia
     calyptia.core: core-instance
     instance: "{{- printf "calyptia-core-instance-%s" .Release.Name -}}"
+{{- end }}
diff --git a/charts/core-instance/tests/core-instance_test.yaml b/charts/core-instance/tests/core-instance_test.yaml
@@ -8,7 +8,7 @@ tests:
   - it: checks kind
     set:
       coreInstance: ci-1234
-      cloudTokenSec: 
+      cloudTokenSec:
         name: xxx
         key: yyy
     asserts:
@@ -19,7 +19,7 @@ tests:
       name: test_core-instance
       cloudUrl: test_url
       coreInstance: ci-1234
-      cloudTokenSec: 
+      cloudTokenSec:
         name: xxx
         key: yyy
       calyptiaAnnotations: "test=1234,nope=4321"
@@ -36,8 +36,8 @@ tests:
           registry: custom.io
           repository: test/ingestcheck
           tag: 1.2.3
-      http_proxy: https
-      cloud_proxy: cloud
+      httpProxy: https
+      cloudProxy: cloud
     asserts:
       # From Cloud
       - equal:
@@ -91,7 +91,7 @@ tests:
             name: HOTRELOAD_IMAGE
       - equal:
           path: spec.template.spec.containers[0].image
-          value: custom.io/test/fromCloud:1.2.3     
+          value: custom.io/test/fromCloud:1.2.3
       - equal:
           path: spec.template.spec.containers[0].env[7]
           value:
@@ -171,11 +171,6 @@ 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
@@ -1,3 +1,5 @@
+# Turn this chart off/on
+enabled: true
 name: "core-instance"
 clusterLogging: false
 # If not set then we use the release name
@@ -20,12 +22,12 @@ images:
   fromCloud:
     registry: ghcr.io
     repository: calyptia/core-operator/sync-from-cloud
-    tag: 3.1.0
+    tag: 3.2.0
     pullSecrets: []
   toCloud:
     registry: ghcr.io
     repository: calyptia/core-operator/sync-to-cloud
-    tag: 3.1.0
+    tag: 3.2.0
     pullSecrets: []
   hotReload:
     registry: ghcr.io
@@ -48,6 +50,7 @@ podAnnotations: {}
 podLabels: {}
 nameOverride: ""
 fullnameOverride: ""
+namespaceOverride: ""
 fromCloud:
   resources: {}
 toCloud:
@@ -56,10 +59,10 @@ serviceAccount:
   create: true
   name: ""
   annotations: {}
-http_proxy: ""
-https_proxy: ""
-no_proxy: ""
-cloud_proxy: ""
+httpProxy: ""
+httpsProxy: ""
+noProxy: ""
+cloudProxy: ""
 #
 ## RBAC configuration
 ## @param rbac.create Specifies whether RBAC resources should be created

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: 3.1.0
-appVersion: "v3.1.0"
+version: 3.2.0
+appVersion: "v3.2.0"
 maintainers:
   - name: Calyptia
     email: [email protected]

diff --git a/charts/core-operator/templates/manager.yaml b/charts/core-operator/templates/manager.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.enabled }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -11,7 +12,7 @@ metadata:
     calyptia.core: core-operator
     control-plane: controller-manager
   name: calyptia-core-controller-manager
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 spec:
   replicas: {{ default 1 .Values.replicas }}
   selector:
@@ -70,4 +71,5 @@ spec:
         runAsNonRoot: true
       serviceAccount: {{ template "operator.serviceAccountName" . }}
       {{- include "operator.imagePullSecrets" . | nindent 6 }}
-      terminationGracePeriodSeconds: 10
+      terminationGracePeriodSeconds: 10
+{{- end }}
diff --git a/charts/core-operator/templates/pull-secret.yaml b/charts/core-operator/templates/pull-secret.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.enabled }}
 {{- if .Values.imageCredentials }}
 apiVersion: v1
 kind: Secret
@@ -7,8 +8,9 @@ metadata:
   {{- end }}
   labels: {{- include "common.labels.standard" . | nindent 4 }}
   name: {{ default "regcreds" .Values.imageCredentials.secretName | trunc 63 | trimSuffix "-" }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 type: kubernetes.io/dockerconfigjson
 data:
   .dockerconfigjson: {{ template "createImagePullSecret" . }}
 {{- end }}
+{{- end }}
diff --git a/charts/core-operator/templates/rolebinding.yaml b/charts/core-operator/templates/rolebinding.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.enabled }}
 {{- if .Values.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
@@ -45,5 +46,6 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ template "operator.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace }}
-{{- end -}}
+  namespace: {{ include "common.names.namespace" . | quote }}
+{{- end -}}
+{{- end }}
diff --git a/charts/core-operator/templates/service-account.yaml b/charts/core-operator/templates/service-account.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.enabled }}
 {{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
@@ -15,5 +16,6 @@ metadata:
     app.kubernetes.io/part-of: operator
     calyptia.core: core-operator
   name: {{ template "operator.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "common.names.namespace" . | quote }}
+{{- end }}
 {{- end }}
diff --git a/charts/core-operator/templates/service.yaml b/charts/core-operator/templates/service.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -18,7 +19,7 @@ metadata:
     calyptia.core: core-operator
     control-plane: controller-manager
   name: calyptia-core-controller-manager-metrics-service
-  namespace: {{ .Release.Namespace }}
+  namespace: {{ include "common.names.namespace" . | quote }}
 spec:
   ports:
   - name: https
@@ -31,4 +32,5 @@ spec:
     targetPort: http
   selector:
     calyptia.core: core-operator
-    control-plane: controller-manager
+    control-plane: controller-manager
+{{- end }}