Skip to content

Commit 10bed17

Browse files
masontikhonovmasontikhonov
committed
test: add new test for new envs
1 parent a55badc commit 10bed17

File tree

4 files changed

+111
-6
lines changed

4 files changed

+111
-6
lines changed

‎charts/cf-runtime/templates/runtime/runtime-env-spec-tmpl.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,13 +174,13 @@ dockerDaemonScheduler:
174174
{{- with $dindContext.userAccess }}
175175
userAccess: {{ . }}
176176
{{- end }}
177-
{{- with $dindContext.env }}
178177
envVars:
178+
{{- with $dindContext.env }}
179179
{{- range $key, $val := . }}
180180
{{ $key }}: {{ $val | squote }}
181181
{{- end }}
182-
OTEL_RESOURCE_ATTRIBUTES: {{ printf "service.name=classic-dind,service.version=%s,service.namespace=codefresh-classic-runtime,cf.classic.runtime.name=%s,cf.classic.runtime.version=%s" $dindVersion $runtimeName $runtimeVersion }}
183182
{{- end }}
183+
OTEL_RESOURCE_ATTRIBUTES: {{ printf "service.name=classic-dind,service.version=%s,service.namespace=codefresh-classic-runtime,cf.classic.runtime.name=%s,cf.classic.runtime.version=%s" $dindVersion $runtimeName $runtimeVersion }}
184184
cluster:
185185
namespace: {{ .Release.Namespace }}
186186
serviceAccount: {{ $dindContext.serviceAccount }}

‎charts/cf-runtime/tests/private-registry/private_registry_test.yaml

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,17 +31,40 @@ tests:
3131
- run
3232
- start
3333
envVars:
34+
CF_SERVICE_NAME: 'classic-engine'
35+
CF_TELEMETRY_LOGS_LEVEL: 'debug'
36+
CF_TELEMETRY_OTEL_ALLOW_HTTP_INSTRUMENTATION: 'false'
37+
CF_TELEMETRY_OTEL_ENABLE: 'true'
38+
CF_TELEMETRY_PROMETHEUS_ENABLE: 'true'
39+
CF_TELEMETRY_PROMETHEUS_ENABLE_PROCESS_METRICS: 'true'
40+
CF_TELEMETRY_PROMETHEUS_HOST: '0.0.0.0'
41+
CF_TELEMETRY_PROMETHEUS_PORT: '9100'
42+
CF_TELEMETRY_PYROSCOPE_ENABLE: 'false'
3443
CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: '1000'
3544
DOCKER_REQUEST_TIMEOUT_MS: '30000'
3645
FORCE_COMPOSE_SERIAL_PULL: 'false'
3746
LOGGER_LEVEL: 'debug'
3847
LOG_OUTGOING_HTTP_REQUESTS: 'false'
3948
METRICS_PROMETHEUS_COLLECT_PROCESS_METRICS: 'false'
40-
METRICS_PROMETHEUS_ENABLED: 'true'
49+
METRICS_PROMETHEUS_ENABLED: 'false'
4150
METRICS_PROMETHEUS_ENABLE_LEGACY_METRICS: 'false'
4251
METRICS_PROMETHEUS_HOST: '0.0.0.0'
4352
METRICS_PROMETHEUS_PORT: '9100'
4453
METRICS_PROMETHEUS_SCRAPE_TIMEOUT: '15000'
54+
METRICS_SCRAPE_TIMEOUT_MS: '0'
55+
OTEL_EXPORTER_OTLP_COMPRESSION: 'gzip'
56+
OTEL_EXPORTER_OTLP_ENDPOINT: 'http://localhost:4317'
57+
OTEL_EXPORTER_OTLP_PROTOCOL: 'grpc'
58+
OTEL_EXPORTER_PROMETHEUS_HOST: '0.0.0.0'
59+
OTEL_EXPORTER_PROMETHEUS_PORT: '9464'
60+
OTEL_LOGS_EXPORTER: 'none'
61+
OTEL_METRICS_EXPORTER: 'otlp'
62+
OTEL_METRIC_EXPORT_INTERVAL: '10000'
63+
OTEL_METRIC_EXPORT_TIMEOUT: '5000'
64+
OTEL_SEMCONV_STABILITY_OPT_IN: 'http'
65+
OTEL_TRACES_EXPORTER: 'none'
66+
OTEL_TRACES_SAMPLER: 'parentbased_always_on'
67+
PYROSCOPE_SERVER_ADDRESS: ''
4568
TRUSTED_QEMU_IMAGES: 'tonistiigi/binfmt'
4669
COMPOSE_IMAGE: 'somedomain.io/codefresh/compose:tagoverride'
4770
CONTAINER_LOGGER_IMAGE: 'somedomain.io/codefresh/cf-container-logger:tagoverride'
@@ -59,6 +82,8 @@ tests:
5982
GC_BUILDER_IMAGE: 'somedomain.io/codefresh/cf-gc-builder:tagoverride'
6083
COSIGN_IMAGE_SIGNER_IMAGE: 'somedomain.io/codefresh/cf-cosign-image-signer:tagoverride'
6184
RUNTIME_CHART_VERSION: 1.0.0
85+
CF_SERVICE_VERSION: tagoverride
86+
OTEL_RESOURCE_ATTRIBUTES: service.name=classic-engine,service.version=tagoverride,service.namespace=codefresh-classic-runtime,cf.classic.runtime.name=my-context/codefresh,cf.classic.runtime.version=1.0.0
6287
workflowLimits:
6388
MAXIMUM_ALLOWED_TIME_BEFORE_PRE_STEPS_SUCCESS: 600
6489
MAXIMUM_ALLOWED_WORKFLOW_AGE_BEFORE_TERMINATION: 86400
@@ -88,6 +113,8 @@ tests:
88113
dindImage: 'somedomain.io/codefresh/dind:tagoverride'
89114
imagePullPolicy: IfNotPresent
90115
userAccess: true
116+
envVars:
117+
OTEL_RESOURCE_ATTRIBUTES: service.name=classic-dind,service.version=tagoverride,service.namespace=codefresh-classic-runtime,cf.classic.runtime.name=my-context/codefresh,cf.classic.runtime.version=1.0.0
91118
cluster:
92119
namespace: codefresh
93120
serviceAccount: codefresh-engine

‎charts/cf-runtime/tests/runtime/runtime_onprem_test.yaml

Lines changed: 54 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,15 @@ tests:
4141
- two
4242
- three
4343
envVars:
44+
CF_SERVICE_NAME: 'classic-engine'
45+
CF_TELEMETRY_LOGS_LEVEL: 'debug'
46+
CF_TELEMETRY_OTEL_ALLOW_HTTP_INSTRUMENTATION: 'false'
47+
CF_TELEMETRY_OTEL_ENABLE: 'true'
48+
CF_TELEMETRY_PROMETHEUS_ENABLE: 'true'
49+
CF_TELEMETRY_PROMETHEUS_ENABLE_PROCESS_METRICS: 'true'
50+
CF_TELEMETRY_PROMETHEUS_HOST: '0.0.0.0'
51+
CF_TELEMETRY_PROMETHEUS_PORT: '9100'
52+
CF_TELEMETRY_PYROSCOPE_ENABLE: 'false'
4453
CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: '1000'
4554
DOCKER_REQUEST_TIMEOUT_MS: '30000'
4655
FLOAT_AS_STRING: '12.34'
@@ -50,11 +59,25 @@ tests:
5059
LOGGER_LEVEL: 'debug'
5160
LOG_OUTGOING_HTTP_REQUESTS: 'false'
5261
METRICS_PROMETHEUS_COLLECT_PROCESS_METRICS: 'false'
53-
METRICS_PROMETHEUS_ENABLED: 'true'
62+
METRICS_PROMETHEUS_ENABLED: 'false'
5463
METRICS_PROMETHEUS_ENABLE_LEGACY_METRICS: 'false'
5564
METRICS_PROMETHEUS_HOST: '0.0.0.0'
5665
METRICS_PROMETHEUS_PORT: '9100'
5766
METRICS_PROMETHEUS_SCRAPE_TIMEOUT: '15000'
67+
METRICS_SCRAPE_TIMEOUT_MS: '0'
68+
OTEL_EXPORTER_OTLP_COMPRESSION: 'gzip'
69+
OTEL_EXPORTER_OTLP_ENDPOINT: 'http://localhost:4317'
70+
OTEL_EXPORTER_OTLP_PROTOCOL: 'grpc'
71+
OTEL_EXPORTER_PROMETHEUS_HOST: '0.0.0.0'
72+
OTEL_EXPORTER_PROMETHEUS_PORT: '9464'
73+
OTEL_LOGS_EXPORTER: 'none'
74+
OTEL_METRICS_EXPORTER: 'otlp'
75+
OTEL_METRIC_EXPORT_INTERVAL: '10000'
76+
OTEL_METRIC_EXPORT_TIMEOUT: '5000'
77+
OTEL_SEMCONV_STABILITY_OPT_IN: 'http'
78+
OTEL_TRACES_EXPORTER: 'none'
79+
OTEL_TRACES_SAMPLER: 'parentbased_always_on'
80+
PYROSCOPE_SERVER_ADDRESS: ''
5881
TRUSTED_QEMU_IMAGES: 'tonistiigi/binfmt'
5982
COMPOSE_IMAGE: 'quay.io/codefresh/compose:tagoverride'
6083
CONTAINER_LOGGER_IMAGE: 'quay.io/codefresh/cf-container-logger:tagoverride'
@@ -72,6 +95,8 @@ tests:
7295
GC_BUILDER_IMAGE: 'quay.io/codefresh/cf-gc-builder:tagoverride'
7396
COSIGN_IMAGE_SIGNER_IMAGE: 'quay.io/codefresh/cf-cosign-image-signer:tagoverride'
7497
RUNTIME_CHART_VERSION: 1.0.0
98+
CF_SERVICE_VERSION: tagoverride
99+
OTEL_RESOURCE_ATTRIBUTES: service.name=classic-engine,service.version=tagoverride,service.namespace=codefresh-classic-runtime,cf.classic.runtime.name=system/my-runtime,cf.classic.runtime.version=1.0.0
75100
workflowLimits:
76101
MAXIMUM_ALLOWED_TIME_BEFORE_PRE_STEPS_SUCCESS: 600
77102
MAXIMUM_ALLOWED_WORKFLOW_AGE_BEFORE_TERMINATION: 86400
@@ -122,6 +147,7 @@ tests:
122147
ALICE: 'BOB'
123148
FLOAT_AS_STRING: '12.34'
124149
INT: '123'
150+
OTEL_RESOURCE_ATTRIBUTES: service.name=classic-dind,service.version=tagoverride,service.namespace=codefresh-classic-runtime,cf.classic.runtime.name=system/my-runtime,cf.classic.runtime.version=1.0.0
125151
cluster:
126152
namespace: codefresh
127153
serviceAccount: service-account-override
@@ -227,6 +253,15 @@ tests:
227253
- two
228254
- three
229255
envVars:
256+
CF_SERVICE_NAME: 'classic-engine'
257+
CF_TELEMETRY_LOGS_LEVEL: 'debug'
258+
CF_TELEMETRY_OTEL_ALLOW_HTTP_INSTRUMENTATION: 'false'
259+
CF_TELEMETRY_OTEL_ENABLE: 'true'
260+
CF_TELEMETRY_PROMETHEUS_ENABLE: 'true'
261+
CF_TELEMETRY_PROMETHEUS_ENABLE_PROCESS_METRICS: 'true'
262+
CF_TELEMETRY_PROMETHEUS_HOST: '0.0.0.0'
263+
CF_TELEMETRY_PROMETHEUS_PORT: '9100'
264+
CF_TELEMETRY_PYROSCOPE_ENABLE: 'false'
230265
CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: '1000'
231266
DOCKER_REQUEST_TIMEOUT_MS: '30000'
232267
FLOAT_AS_STRING: '12.34'
@@ -236,11 +271,25 @@ tests:
236271
LOGGER_LEVEL: 'debug'
237272
LOG_OUTGOING_HTTP_REQUESTS: 'false'
238273
METRICS_PROMETHEUS_COLLECT_PROCESS_METRICS: 'false'
239-
METRICS_PROMETHEUS_ENABLED: 'true'
274+
METRICS_PROMETHEUS_ENABLED: 'false'
240275
METRICS_PROMETHEUS_ENABLE_LEGACY_METRICS: 'false'
241276
METRICS_PROMETHEUS_HOST: '0.0.0.0'
242277
METRICS_PROMETHEUS_PORT: '9100'
243278
METRICS_PROMETHEUS_SCRAPE_TIMEOUT: '15000'
279+
METRICS_SCRAPE_TIMEOUT_MS: '0'
280+
OTEL_EXPORTER_OTLP_COMPRESSION: 'gzip'
281+
OTEL_EXPORTER_OTLP_ENDPOINT: 'http://localhost:4317'
282+
OTEL_EXPORTER_OTLP_PROTOCOL: 'grpc'
283+
OTEL_EXPORTER_PROMETHEUS_HOST: '0.0.0.0'
284+
OTEL_EXPORTER_PROMETHEUS_PORT: '9464'
285+
OTEL_LOGS_EXPORTER: 'none'
286+
OTEL_METRICS_EXPORTER: 'otlp'
287+
OTEL_METRIC_EXPORT_INTERVAL: '10000'
288+
OTEL_METRIC_EXPORT_TIMEOUT: '5000'
289+
OTEL_SEMCONV_STABILITY_OPT_IN: 'http'
290+
OTEL_TRACES_EXPORTER: 'none'
291+
OTEL_TRACES_SAMPLER: 'parentbased_always_on'
292+
PYROSCOPE_SERVER_ADDRESS: ''
244293
TRUSTED_QEMU_IMAGES: 'tonistiigi/binfmt'
245294
COMPOSE_IMAGE: 'quay.io/codefresh/compose:tagoverride'
246295
CONTAINER_LOGGER_IMAGE: 'quay.io/codefresh/cf-container-logger:tagoverride'
@@ -258,6 +307,8 @@ tests:
258307
GC_BUILDER_IMAGE: 'quay.io/codefresh/cf-gc-builder:tagoverride'
259308
COSIGN_IMAGE_SIGNER_IMAGE: 'quay.io/codefresh/cf-cosign-image-signer:tagoverride'
260309
RUNTIME_CHART_VERSION: 1.0.0
310+
CF_SERVICE_VERSION: tagoverride
311+
OTEL_RESOURCE_ATTRIBUTES: service.name=classic-engine,service.version=tagoverride,service.namespace=codefresh-classic-runtime,cf.classic.runtime.name=system/default-override,cf.classic.runtime.version=1.0.0
261312
workflowLimits:
262313
MAXIMUM_ALLOWED_TIME_BEFORE_PRE_STEPS_SUCCESS: 600
263314
MAXIMUM_ALLOWED_WORKFLOW_AGE_BEFORE_TERMINATION: 86400
@@ -308,6 +359,7 @@ tests:
308359
ALICE: 'BOB'
309360
FLOAT_AS_STRING: '12.34'
310361
INT: '123'
362+
OTEL_RESOURCE_ATTRIBUTES: service.name=classic-dind,service.version=tagoverride,service.namespace=codefresh-classic-runtime,cf.classic.runtime.name=system/default-override,cf.classic.runtime.version=1.0.0
311363
cluster:
312364
namespace: codefresh
313365
serviceAccount: service-account-override

‎charts/cf-runtime/tests/runtime/runtime_test.yaml

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,15 @@ tests:
4343
- two
4444
- three
4545
envVars:
46+
CF_SERVICE_NAME: 'classic-engine'
47+
CF_TELEMETRY_LOGS_LEVEL: 'debug'
48+
CF_TELEMETRY_OTEL_ALLOW_HTTP_INSTRUMENTATION: 'false'
49+
CF_TELEMETRY_OTEL_ENABLE: 'true'
50+
CF_TELEMETRY_PROMETHEUS_ENABLE: 'true'
51+
CF_TELEMETRY_PROMETHEUS_ENABLE_PROCESS_METRICS: 'true'
52+
CF_TELEMETRY_PROMETHEUS_HOST: '0.0.0.0'
53+
CF_TELEMETRY_PROMETHEUS_PORT: '9100'
54+
CF_TELEMETRY_PYROSCOPE_ENABLE: 'false'
4655
CONTAINER_LOGGER_EXEC_CHECK_INTERVAL_MS: '1000'
4756
DOCKER_REQUEST_TIMEOUT_MS: '30000'
4857
FLOAT: '12.34'
@@ -52,11 +61,25 @@ tests:
5261
LOGGER_LEVEL: 'debug'
5362
LOG_OUTGOING_HTTP_REQUESTS: 'false'
5463
METRICS_PROMETHEUS_COLLECT_PROCESS_METRICS: 'false'
55-
METRICS_PROMETHEUS_ENABLED: 'true'
64+
METRICS_PROMETHEUS_ENABLED: 'false'
5665
METRICS_PROMETHEUS_ENABLE_LEGACY_METRICS: 'false'
5766
METRICS_PROMETHEUS_HOST: '0.0.0.0'
5867
METRICS_PROMETHEUS_PORT: '9100'
5968
METRICS_PROMETHEUS_SCRAPE_TIMEOUT: '15000'
69+
METRICS_SCRAPE_TIMEOUT_MS: '0'
70+
OTEL_EXPORTER_OTLP_COMPRESSION: 'gzip'
71+
OTEL_EXPORTER_OTLP_ENDPOINT: 'http://localhost:4317'
72+
OTEL_EXPORTER_OTLP_PROTOCOL: 'grpc'
73+
OTEL_EXPORTER_PROMETHEUS_HOST: '0.0.0.0'
74+
OTEL_EXPORTER_PROMETHEUS_PORT: '9464'
75+
OTEL_LOGS_EXPORTER: 'none'
76+
OTEL_METRICS_EXPORTER: 'otlp'
77+
OTEL_METRIC_EXPORT_INTERVAL: '10000'
78+
OTEL_METRIC_EXPORT_TIMEOUT: '5000'
79+
OTEL_SEMCONV_STABILITY_OPT_IN: 'http'
80+
OTEL_TRACES_EXPORTER: 'none'
81+
OTEL_TRACES_SAMPLER: 'parentbased_always_on'
82+
PYROSCOPE_SERVER_ADDRESS: ''
6083
TRUSTED_QEMU_IMAGES: 'my-registry/tonistiigi/binfmt'
6184
COMPOSE_IMAGE: 'quay.io/codefresh/compose:tagoverrideold'
6285
CONTAINER_LOGGER_IMAGE: 'quay.io/codefresh/cf-container-logger:tagoverride'
@@ -74,6 +97,8 @@ tests:
7497
GC_BUILDER_IMAGE: 'quay.io/codefresh/cf-gc-builder:tagoverride'
7598
COSIGN_IMAGE_SIGNER_IMAGE: 'quay.io/codefresh/cf-cosign-image-signer:tagoverride'
7699
RUNTIME_CHART_VERSION: 1.0.0
100+
CF_SERVICE_VERSION: tagoverride
101+
OTEL_RESOURCE_ATTRIBUTES: service.name=classic-engine,service.version=tagoverride,service.namespace=codefresh-classic-runtime,cf.classic.runtime.name=my-context/codefresh,cf.classic.runtime.version=1.0.0
77102
userEnvVars:
78103
- name: ALICE
79104
valueFrom:
@@ -133,6 +158,7 @@ tests:
133158
ALICE: 'BOB'
134159
FLOAT: '12.34'
135160
INT_AS_STRING: '123'
161+
OTEL_RESOURCE_ATTRIBUTES: service.name=classic-dind,service.version=tagoverride,service.namespace=codefresh-classic-runtime,cf.classic.runtime.name=my-context/codefresh,cf.classic.runtime.version=1.0.0
136162
cluster:
137163
namespace: codefresh
138164
serviceAccount: service-account-override

0 commit comments

Comments
 (0)