Skip to content

Commit 0ac9b8e

Browse files
niedbalskiniedbalski
authored
Merge pull request #274 from chronosphereio/ci_update_core_operator_chart
ci: update Core Operator chart
2 parents 2f0f6d2 + 82fe452 commit 0ac9b8e

19 files changed

+218
-51
lines changed

‎charts/core-crd/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ apiVersion: v2
22
name: core-crd
33
description: A Helm chart for Kubernetes
44
type: application
5-
version: 3.1.0
6-
appVersion: "v3.1.0"
5+
version: 3.2.0
6+
appVersion: "v3.2.0"
77
maintainers:
88
- name: Calyptia
99
email: hello@calyptia.com

‎charts/core-crd/tests/core-crd_test.yaml

+2-3
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ templates:
77
tests:
88
- it: checks kind
99
set:
10-
pipelineServiceType: ClusterIP
10+
pipelineServiceType: ClusterIP
1111
asserts:
1212
- isKind:
1313
of: CustomResourceDefinition
14-
- equal:
14+
- equal:
1515
path: spec.versions[0].schema.openAPIV3Schema.properties.spec.properties.ports.items.properties.serviceType.default
1616
value: ClusterIP
17-

‎charts/core-crd/values.yaml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Turn this chart off/on
2+
enabled: true
3+
14
images:
25
hotReload:
36
registry: ghcr.io
@@ -7,7 +10,7 @@ images:
710
fluentBit:
811
registry: ghcr.io
912
repository: calyptia/core/calyptia-fluent-bit
10-
tag: 24.7.3
13+
tag: 24.7.4
1114
pullSecrets: []
1215
ingestCheck:
1316
registry: ghcr.io

‎charts/core-instance/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ description: Calyptia Core Instance chart
44
home: https://calyptia.com/products/core/
55
icon: https://storage.googleapis.com/calyptia_public_resources_bucket/logo-darkmode.svg
66
type: application
7-
version: 3.1.0
8-
appVersion: "v3.1.0"
7+
version: 3.2.0
8+
appVersion: "v3.2.0"
99
maintainers:
1010
- name: Calyptia
1111
email: hello@calyptia.com

‎charts/core-instance/templates/deployment.yaml

+16-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1+
{{- if .Values.enabled }}
12
apiVersion: apps/v1
23
kind: Deployment
34
metadata:
45
name: "{{- printf "calyptia-core-instance-%s" .Release.Name | trunc 63 | trimSuffix "-" -}}"
5-
namespace: {{ .Release.Namespace }}
6+
namespace: {{ include "common.names.namespace" . | quote }}
67
{{- if .Values.commonAnnotations }}
78
annotations: {{- include "common.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
89
{{- end }}
9-
labels:
10+
labels:
1011
app.kubernetes.io/instance: {{ .Values.coreInstance }}
1112
spec:
1213
replicas: {{ default 1 .Values.replicas }}
@@ -64,13 +65,13 @@ spec:
6465
- name: TOLERATIONS
6566
value: {{ .Values.calyptiaTolerations }}
6667
- name: HTTP_PROXY
67-
value: {{ .Values.http_proxy | quote }}
68+
value: {{ .Values.httpProxy | quote }}
6869
- name: HTTPS_PROXY
69-
value: {{ .Values.https_proxy | quote }}
70+
value: {{ .Values.httpsProxy | quote }}
7071
- name: NO_PROXY
71-
value: {{ .Values.no_proxy | quote }}
72+
value: {{ .Values.noProxy | quote }}
7273
- name: CLOUD_PROXY
73-
value: {{ .Values.cloud_proxy | quote }}
74+
value: {{ .Values.cloudProxy | quote }}
7475
- name: METRICS
7576
value: {{ default false .Values.metrics | quote }}
7677
image: {{ template "fromCloud.image" . }}
@@ -100,9 +101,15 @@ spec:
100101
- name: NO_TLS_VERIFY
101102
value: {{ default false .Values.notls | quote }}
102103
- name: METRICS_PORT
103-
value: {{ .Values.metricsPort | toYaml }}
104+
value: {{ .Values.metricsPort | toYaml }}
104105
- name: HTTP_PROXY
105-
value: {{ .Values.http_proxy | quote }}
106+
value: {{ .Values.httpProxy | quote }}
107+
- name: HTTPS_PROXY
108+
value: {{ .Values.httpsProxy | quote }}
109+
- name: NO_PROXY
110+
value: {{ .Values.noProxy | quote }}
111+
- name: CLOUD_PROXY
112+
value: {{ .Values.cloudProxy | quote }}
106113
- name: METRICS
107114
value: {{ default false .Values.metrics | quote }}
108115
image: {{ template "toCloud.image" . }}
@@ -129,3 +136,4 @@ spec:
129136
{{- end }}
130137
{{- end }}
131138
{{- end }}
139+
{{- end }}

‎charts/core-instance/templates/pull-secret.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.enabled }}
12
{{- if .Values.imageCredentials }}
23
apiVersion: v1
34
kind: Secret
@@ -7,8 +8,9 @@ metadata:
78
{{- end }}
89
labels: {{- include "common.labels.standard" . | nindent 4 }}
910
name: {{ default "regcreds" .Values.imageCredentials.secretName | trunc 63 | trimSuffix "-" }}
10-
namespace: {{ .Release.Namespace | quote }}
11+
namespace: {{ include "common.names.namespace" . | quote }}
1112
type: kubernetes.io/dockerconfigjson
1213
data:
1314
.dockerconfigjson: {{ template "createImagePullSecret" . }}
1415
{{- end }}
16+
{{- end }}

‎charts/core-instance/templates/rbac.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.enabled }}
12
{{- if .Values.rbac.create -}}
23
apiVersion: rbac.authorization.k8s.io/v1
34
kind: ClusterRole
@@ -61,5 +62,6 @@ roleRef:
6162
subjects:
6263
- kind: ServiceAccount
6364
name: {{ template "instance.serviceAccountName" . }}
64-
namespace: {{ .Release.Namespace }}
65-
{{- end }}
65+
namespace: {{ include "common.names.namespace" . | quote }}
66+
{{- end }}
67+
{{- end }}

‎charts/core-instance/templates/service-account.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.enabled }}
12
{{- if .Values.serviceAccount.create -}}
23
apiVersion: v1
34
kind: ServiceAccount
@@ -15,5 +16,6 @@ metadata:
1516
app.kubernetes.io/part-of: operator
1617
calyptia.core: core-operator
1718
name: {{ template "instance.serviceAccountName" . }}
18-
namespace: {{ .Release.Namespace | quote }}
19+
namespace: {{ include "common.names.namespace" . | quote }}
20+
{{- end }}
1921
{{- end }}

‎charts/core-instance/templates/service.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.enabled }}
12
apiVersion: v1
23
kind: Service
34
metadata:
@@ -10,14 +11,15 @@ metadata:
1011
{{- end }}
1112
labels: {{- include "common.labels.standard" . | nindent 4 }}
1213
name: "{{- printf "calyptia-core-instance-metrics-%s" .Release.Name | trunc 63 | trimSuffix "-" -}}"
13-
namespace: {{ .Release.Namespace | quote }}
14+
namespace: {{ include "common.names.namespace" . | quote }}
1415
spec:
1516
ports:
1617
- name: metrics
17-
port: {{ .Values.metricsPort | int }}
18+
port: {{ default 15334 .Values.metricsPort | int }}
1819
protocol: TCP
1920
targetPort: metrics
2021
selector:
2122
app.kubernetes.io/part-of: calyptia
2223
calyptia.core: core-instance
2324
instance: "{{- printf "calyptia-core-instance-%s" .Release.Name -}}"
25+
{{- end }}

‎charts/core-instance/tests/core-instance_test.yaml

+5-10
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ tests:
88
- it: checks kind
99
set:
1010
coreInstance: ci-1234
11-
cloudTokenSec:
11+
cloudTokenSec:
1212
name: xxx
1313
key: yyy
1414
asserts:
@@ -19,7 +19,7 @@ tests:
1919
name: test_core-instance
2020
cloudUrl: test_url
2121
coreInstance: ci-1234
22-
cloudTokenSec:
22+
cloudTokenSec:
2323
name: xxx
2424
key: yyy
2525
calyptiaAnnotations: "test=1234,nope=4321"
@@ -36,8 +36,8 @@ tests:
3636
registry: custom.io
3737
repository: test/ingestcheck
3838
tag: 1.2.3
39-
http_proxy: https
40-
cloud_proxy: cloud
39+
httpProxy: https
40+
cloudProxy: cloud
4141
asserts:
4242
# From Cloud
4343
- equal:
@@ -91,7 +91,7 @@ tests:
9191
name: HOTRELOAD_IMAGE
9292
- equal:
9393
path: spec.template.spec.containers[0].image
94-
value: custom.io/test/fromCloud:1.2.3
94+
value: custom.io/test/fromCloud:1.2.3
9595
- equal:
9696
path: spec.template.spec.containers[0].env[7]
9797
value:
@@ -171,11 +171,6 @@ tests:
171171
value:
172172
value: https
173173
name: HTTP_PROXY
174-
- equal:
175-
path: spec.template.spec.containers[1].env[8]
176-
value:
177-
value: "false"
178-
name: METRICS
179174
- it: checks annotations
180175
set:
181176
coreInstance: ci-1234

‎charts/core-instance/values.yaml

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# Turn this chart off/on
2+
enabled: true
13
name: "core-instance"
24
clusterLogging: false
35
# If not set then we use the release name
@@ -20,12 +22,12 @@ images:
2022
fromCloud:
2123
registry: ghcr.io
2224
repository: calyptia/core-operator/sync-from-cloud
23-
tag: 3.1.0
25+
tag: 3.2.0
2426
pullSecrets: []
2527
toCloud:
2628
registry: ghcr.io
2729
repository: calyptia/core-operator/sync-to-cloud
28-
tag: 3.1.0
30+
tag: 3.2.0
2931
pullSecrets: []
3032
hotReload:
3133
registry: ghcr.io
@@ -48,6 +50,7 @@ podAnnotations: {}
4850
podLabels: {}
4951
nameOverride: ""
5052
fullnameOverride: ""
53+
namespaceOverride: ""
5154
fromCloud:
5255
resources: {}
5356
toCloud:
@@ -56,10 +59,10 @@ serviceAccount:
5659
create: true
5760
name: ""
5861
annotations: {}
59-
http_proxy: ""
60-
https_proxy: ""
61-
no_proxy: ""
62-
cloud_proxy: ""
62+
httpProxy: ""
63+
httpsProxy: ""
64+
noProxy: ""
65+
cloudProxy: ""
6366
#
6467
## RBAC configuration
6568
## @param rbac.create Specifies whether RBAC resources should be created

‎charts/core-operator/Chart.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ description: Calyptia Core Operator chart
44
home: https://calyptia.com/products/core/
55
icon: https://storage.googleapis.com/calyptia_public_resources_bucket/logo-darkmode.svg
66
type: application
7-
version: 3.1.0
8-
appVersion: "v3.1.0"
7+
version: 3.2.0
8+
appVersion: "v3.2.0"
99
maintainers:
1010
- name: Calyptia
1111
email: hello@calyptia.com

‎charts/core-operator/templates/manager.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.enabled }}
12
apiVersion: apps/v1
23
kind: Deployment
34
metadata:
@@ -11,7 +12,7 @@ metadata:
1112
calyptia.core: core-operator
1213
control-plane: controller-manager
1314
name: calyptia-core-controller-manager
14-
namespace: {{ .Release.Namespace | quote }}
15+
namespace: {{ include "common.names.namespace" . | quote }}
1516
spec:
1617
replicas: {{ default 1 .Values.replicas }}
1718
selector:
@@ -70,4 +71,5 @@ spec:
7071
runAsNonRoot: true
7172
serviceAccount: {{ template "operator.serviceAccountName" . }}
7273
{{- include "operator.imagePullSecrets" . | nindent 6 }}
73-
terminationGracePeriodSeconds: 10
74+
terminationGracePeriodSeconds: 10
75+
{{- end }}

‎charts/core-operator/templates/pull-secret.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.enabled }}
12
{{- if .Values.imageCredentials }}
23
apiVersion: v1
34
kind: Secret
@@ -7,8 +8,9 @@ metadata:
78
{{- end }}
89
labels: {{- include "common.labels.standard" . | nindent 4 }}
910
name: {{ default "regcreds" .Values.imageCredentials.secretName | trunc 63 | trimSuffix "-" }}
10-
namespace: {{ .Release.Namespace | quote }}
11+
namespace: {{ include "common.names.namespace" . | quote }}
1112
type: kubernetes.io/dockerconfigjson
1213
data:
1314
.dockerconfigjson: {{ template "createImagePullSecret" . }}
1415
{{- end }}
16+
{{- end }}

‎charts/core-operator/templates/rolebinding.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.enabled }}
12
{{- if .Values.rbac.create -}}
23
apiVersion: rbac.authorization.k8s.io/v1
34
kind: ClusterRoleBinding
@@ -45,5 +46,6 @@ roleRef:
4546
subjects:
4647
- kind: ServiceAccount
4748
name: {{ template "operator.serviceAccountName" . }}
48-
namespace: {{ .Release.Namespace }}
49-
{{- end -}}
49+
namespace: {{ include "common.names.namespace" . | quote }}
50+
{{- end -}}
51+
{{- end }}

‎charts/core-operator/templates/service-account.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.enabled }}
12
{{- if .Values.serviceAccount.create -}}
23
apiVersion: v1
34
kind: ServiceAccount
@@ -15,5 +16,6 @@ metadata:
1516
app.kubernetes.io/part-of: operator
1617
calyptia.core: core-operator
1718
name: {{ template "operator.serviceAccountName" . }}
18-
namespace: {{ .Release.Namespace | quote }}
19+
namespace: {{ include "common.names.namespace" . | quote }}
20+
{{- end }}
1921
{{- end }}

‎charts/core-operator/templates/service.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
{{- if .Values.enabled }}
12
apiVersion: v1
23
kind: Service
34
metadata:
@@ -18,7 +19,7 @@ metadata:
1819
calyptia.core: core-operator
1920
control-plane: controller-manager
2021
name: calyptia-core-controller-manager-metrics-service
21-
namespace: {{ .Release.Namespace }}
22+
namespace: {{ include "common.names.namespace" . | quote }}
2223
spec:
2324
ports:
2425
- name: https
@@ -31,4 +32,5 @@ spec:
3132
targetPort: http
3233
selector:
3334
calyptia.core: core-operator
34-
control-plane: controller-manager
35+
control-plane: controller-manager
36+
{{- end }}

0 commit comments

Comments
 (0)