diff --git a/docs/docs/resources/variables/variable_substitution.yaml b/docs/docs/resources/variables/variable_substitution.yaml index 8a4cf60ea..4bdf51685 100644 --- a/docs/docs/resources/variables/variable_substitution.yaml +++ b/docs/docs/resources/variables/variable_substitution.yaml @@ -4,6 +4,8 @@ app_type: "${component.type}" app_name: "${component.name}" app_schedule: "${component.app.schedule}" + helm_release_name: ${component.helm_release_name} + helm_name_override: ${component.helm_name_override} commandLine: FAKE_ARG: "fake-arg-value" schedule: "30 3/8 * * *" diff --git a/kpops/components/base_components/helm_app.py b/kpops/components/base_components/helm_app.py index 94fa3e8cd..39c96b79e 100644 --- a/kpops/components/base_components/helm_app.py +++ b/kpops/components/base_components/helm_app.py @@ -5,7 +5,7 @@ from typing import Annotated, Any import pydantic -from pydantic import Field, SerializationInfo, model_serializer +from pydantic import Field, SerializationInfo, computed_field, model_serializer from typing_extensions import override from kpops.component_handlers.helm_wrapper.dry_run_handler import DryRunHandler @@ -103,11 +103,13 @@ def dry_run_handler(self) -> DryRunHandler: helm_diff = HelmDiff(self.config.helm_diff_config) return DryRunHandler(self.helm, helm_diff, self.namespace) + @computed_field @property def helm_release_name(self) -> str: """The name for the Helm release.""" return create_helm_release_name(self.full_name) + @computed_field @property def helm_name_override(self) -> str: """Helm chart name override.""" diff --git a/tests/pipeline/resources/component-type-substitution/pipeline.yaml b/tests/pipeline/resources/component-type-substitution/pipeline.yaml index 8a4cf60ea..4bdf51685 100644 --- a/tests/pipeline/resources/component-type-substitution/pipeline.yaml +++ b/tests/pipeline/resources/component-type-substitution/pipeline.yaml @@ -4,6 +4,8 @@ app_type: "${component.type}" app_name: "${component.name}" app_schedule: "${component.app.schedule}" + helm_release_name: ${component.helm_release_name} + helm_name_override: ${component.helm_name_override} commandLine: FAKE_ARG: "fake-arg-value" schedule: "30 3/8 * * *" diff --git a/tests/pipeline/snapshots/test_example/test_generate/atm-fraud/pipeline.yaml b/tests/pipeline/snapshots/test_example/test_generate/atm-fraud/pipeline.yaml index 528da26bb..b37b2d3dc 100644 --- a/tests/pipeline/snapshots/test_example/test_generate/atm-fraud/pipeline.yaml +++ b/tests/pipeline/snapshots/test_example/test_generate/atm-fraud/pipeline.yaml @@ -16,6 +16,8 @@ schemaRegistryUrl: http://k8kafka-cp-schema-registry.kpops.svc.cluster.local:8081/ suspend: true debug: true + helm_name_override: atm-fraud-account-producer-clean + helm_release_name: atm-fraud-account-producer-clean name: account-producer namespace: ${NAMESPACE} prefix: atm-fraud- @@ -44,6 +46,8 @@ schemaRegistryUrl: http://k8kafka-cp-schema-registry.kpops.svc.cluster.local:8081/ suspend: true debug: true + helm_name_override: atm-fraud-account-producer + helm_release_name: atm-fraud-account-producer name: account-producer namespace: ${NAMESPACE} prefix: atm-fraud- @@ -81,6 +85,8 @@ schemaRegistryUrl: http://k8kafka-cp-schema-registry.kpops.svc.cluster.local:8081/ suspend: true debug: true + helm_name_override: atm-fraud-transaction-avro-producer-clean + helm_release_name: atm-fraud-transaction-avro-producer-clean name: transaction-avro-producer namespace: ${NAMESPACE} prefix: atm-fraud- @@ -112,6 +118,8 @@ schemaRegistryUrl: http://k8kafka-cp-schema-registry.kpops.svc.cluster.local:8081/ suspend: true debug: true + helm_name_override: atm-fraud-transaction-avro-producer + helm_release_name: atm-fraud-transaction-avro-producer name: transaction-avro-producer namespace: ${NAMESPACE} prefix: atm-fraud- @@ -154,6 +162,8 @@ outputTopic: atm-fraud-transaction-joiner-topic schemaRegistryUrl: http://k8kafka-cp-schema-registry.kpops.svc.cluster.local:8081/ debug: true + helm_name_override: atm-fraud-transaction-joiner-clean + helm_release_name: atm-fraud-transaction-joiner-clean name: transaction-joiner namespace: ${NAMESPACE} prefix: atm-fraud- @@ -190,6 +200,8 @@ outputTopic: atm-fraud-transaction-joiner-topic schemaRegistryUrl: http://k8kafka-cp-schema-registry.kpops.svc.cluster.local:8081/ debug: true + helm_name_override: atm-fraud-transaction-joiner + helm_release_name: atm-fraud-transaction-joiner name: transaction-joiner namespace: ${NAMESPACE} prefix: atm-fraud- @@ -236,6 +248,8 @@ outputTopic: atm-fraud-fraud-detector-topic schemaRegistryUrl: http://k8kafka-cp-schema-registry.kpops.svc.cluster.local:8081/ debug: true + helm_name_override: atm-fraud-fraud-detector-clean + helm_release_name: atm-fraud-fraud-detector-clean name: fraud-detector namespace: ${NAMESPACE} prefix: atm-fraud- @@ -272,6 +286,8 @@ outputTopic: atm-fraud-fraud-detector-topic schemaRegistryUrl: http://k8kafka-cp-schema-registry.kpops.svc.cluster.local:8081/ debug: true + helm_name_override: atm-fraud-fraud-detector + helm_release_name: atm-fraud-fraud-detector name: fraud-detector namespace: ${NAMESPACE} prefix: atm-fraud- @@ -321,6 +337,8 @@ outputTopic: atm-fraud-account-linker-topic schemaRegistryUrl: http://k8kafka-cp-schema-registry.kpops.svc.cluster.local:8081/ debug: true + helm_name_override: atm-fraud-account-linker-clean + helm_release_name: atm-fraud-account-linker-clean name: account-linker namespace: ${NAMESPACE} prefix: atm-fraud- @@ -367,6 +385,8 @@ fraud-detector: type: input topics: {} + helm_name_override: atm-fraud-account-linker + helm_release_name: atm-fraud-account-linker name: account-linker namespace: ${NAMESPACE} prefix: atm-fraud- @@ -393,6 +413,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 connector: atm-fraud-postgresql-connector connectorType: sink + helm_name_override: atm-fraud-postgresql-connector-clean + helm_release_name: atm-fraud-postgresql-connector-clean name: postgresql-connector namespace: ${NAMESPACE} prefix: atm-fraud- diff --git a/tests/pipeline/snapshots/test_example/test_generate/word-count/pipeline.yaml b/tests/pipeline/snapshots/test_example/test_generate/word-count/pipeline.yaml index 7e7d16fe8..f757ae815 100644 --- a/tests/pipeline/snapshots/test_example/test_generate/word-count/pipeline.yaml +++ b/tests/pipeline/snapshots/test_example/test_generate/word-count/pipeline.yaml @@ -14,6 +14,8 @@ outputTopic: word-count-data-producer-topic schemaRegistryUrl: http://k8kafka-cp-schema-registry.kpops.svc.cluster.local:8081/ debug: true + helm_name_override: word-count-data-producer-clean + helm_release_name: word-count-data-producer-clean name: data-producer namespace: ${NAMESPACE} prefix: word-count- @@ -40,6 +42,8 @@ outputTopic: word-count-data-producer-topic schemaRegistryUrl: http://k8kafka-cp-schema-registry.kpops.svc.cluster.local:8081/ debug: true + helm_name_override: word-count-data-producer + helm_release_name: word-count-data-producer name: data-producer namespace: ${NAMESPACE} prefix: word-count- @@ -80,6 +84,8 @@ outputTopic: word-count-word-counter-topic schemaRegistryUrl: http://k8kafka-cp-schema-registry.kpops.svc.cluster.local:8081/ debug: true + helm_name_override: word-count-word-counter-clean + helm_release_name: word-count-word-counter-clean name: word-counter namespace: ${NAMESPACE} prefix: word-count- @@ -114,6 +120,8 @@ outputTopic: word-count-word-counter-topic schemaRegistryUrl: http://k8kafka-cp-schema-registry.kpops.svc.cluster.local:8081/ debug: true + helm_name_override: word-count-word-counter + helm_release_name: word-count-word-counter name: word-counter namespace: ${NAMESPACE} prefix: word-count- @@ -142,6 +150,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 connector: word-count-redis-sink-connector connectorType: sink + helm_name_override: word-count-redis-sink-connector-clean + helm_release_name: word-count-redis-sink-connector-clean name: redis-sink-connector namespace: ${NAMESPACE} prefix: word-count- diff --git a/tests/pipeline/snapshots/test_generate/test_default_config/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_default_config/pipeline.yaml index cbd0e251e..c101b25b4 100644 --- a/tests/pipeline/snapshots/test_generate/test_default_config/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_default_config/pipeline.yaml @@ -9,6 +9,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-custom-config-app1 schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-custom-config-app1-clean + helm_release_name: resources-custom-config-app1-clean name: app1 namespace: development-namespace prefix: resources-custom-config- @@ -30,6 +32,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-custom-config-app1 schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-custom-config-app1 + helm_release_name: resources-custom-config-app1 name: app1 namespace: development-namespace prefix: resources-custom-config- @@ -64,6 +68,8 @@ - resources-custom-config-app1 outputTopic: resources-custom-config-app2 schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-custom-config-app2-clean + helm_release_name: resources-custom-config-app2-clean name: app2 namespace: development-namespace prefix: resources-custom-config- @@ -91,6 +97,8 @@ - resources-custom-config-app1 outputTopic: resources-custom-config-app2 schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-custom-config-app2 + helm_release_name: resources-custom-config-app2 name: app2 namespace: development-namespace prefix: resources-custom-config- diff --git a/tests/pipeline/snapshots/test_generate/test_inflate_pipeline/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_inflate_pipeline/pipeline.yaml index e5e003376..8b7b83d9b 100644 --- a/tests/pipeline/snapshots/test_generate/test_inflate_pipeline/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_inflate_pipeline/pipeline.yaml @@ -9,6 +9,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-pipeline-with-inflate-scheduled-producer schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-inflate-scheduled-producer-clean + helm_release_name: resources-pipeline-with-inflate-scheduled-18411-clean name: scheduled-producer namespace: example-namespace prefix: resources-pipeline-with-inflate- @@ -30,6 +32,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-pipeline-with-inflate-scheduled-producer schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-inflate-scheduled-producer + helm_release_name: resources-pipeline-with-inflate-scheduled-producer name: scheduled-producer namespace: example-namespace prefix: resources-pipeline-with-inflate- @@ -81,6 +85,8 @@ - resources-pipeline-with-inflate-scheduled-producer outputTopic: resources-pipeline-with-inflate-converter schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-inflate-converter-clean + helm_release_name: resources-pipeline-with-inflate-converter-clean name: converter namespace: example-namespace prefix: resources-pipeline-with-inflate- @@ -122,6 +128,8 @@ - resources-pipeline-with-inflate-scheduled-producer outputTopic: resources-pipeline-with-inflate-converter schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-inflate-converter + helm_release_name: resources-pipeline-with-inflate-converter name: converter namespace: example-namespace prefix: resources-pipeline-with-inflate- @@ -180,6 +188,8 @@ - resources-pipeline-with-inflate-converter outputTopic: resources-pipeline-with-inflate-should-inflate schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-inflate-should-inflate-clean + helm_release_name: resources-pipeline-with-inflate-should-inflate-clean name: should-inflate namespace: example-namespace prefix: resources-pipeline-with-inflate- @@ -223,6 +233,8 @@ - resources-pipeline-with-inflate-converter outputTopic: resources-pipeline-with-inflate-should-inflate schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-inflate-should-inflate + helm_release_name: resources-pipeline-with-inflate-should-inflate name: should-inflate namespace: example-namespace prefix: resources-pipeline-with-inflate- @@ -253,6 +265,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 connector: resources-pipeline-with-inflate-should-inflate-inflated-sink-connector connectorType: sink + helm_name_override: resources-pipeline-with-inflate-should-inflate-infl-cfdd0-clean + helm_release_name: resources-pipeline-with-inflate-should-in-cfdd0-clean name: should-inflate-inflated-sink-connector namespace: example-namespace prefix: resources-pipeline-with-inflate- @@ -305,6 +319,8 @@ - kafka-sink-connector outputTopic: resources-pipeline-with-inflate-should-inflate-should-inflate-inflated-streams-app schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-inflate-should-inflate-infl-c7b41-clean + helm_release_name: resources-pipeline-with-inflate-should-in-c7b41-clean name: should-inflate-inflated-streams-app namespace: example-namespace prefix: resources-pipeline-with-inflate- @@ -329,6 +345,8 @@ - kafka-sink-connector outputTopic: resources-pipeline-with-inflate-should-inflate-should-inflate-inflated-streams-app schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-inflate-should-inflate-inflated-s-2ea20 + helm_release_name: resources-pipeline-with-inflate-should-inflate--2ea20 name: should-inflate-inflated-streams-app namespace: example-namespace prefix: resources-pipeline-with-inflate- diff --git a/tests/pipeline/snapshots/test_generate/test_kafka_connect_sink_weave_from_topics/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_kafka_connect_sink_weave_from_topics/pipeline.yaml index bb569e772..b7928f4fd 100644 --- a/tests/pipeline/snapshots/test_generate/test_kafka_connect_sink_weave_from_topics/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_kafka_connect_sink_weave_from_topics/pipeline.yaml @@ -13,6 +13,8 @@ - example-topic outputTopic: example-output schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-kafka-connect-sink-streams-app-clean + helm_release_name: resources-kafka-connect-sink-streams-app-clean name: streams-app namespace: example-namespace prefix: resources-kafka-connect-sink- @@ -43,6 +45,8 @@ topics: example-topic: type: input + helm_name_override: resources-kafka-connect-sink-streams-app + helm_release_name: resources-kafka-connect-sink-streams-app name: streams-app namespace: example-namespace prefix: resources-kafka-connect-sink- @@ -71,6 +75,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 connector: resources-kafka-connect-sink-es-sink-connector connectorType: sink + helm_name_override: resources-kafka-connect-sink-es-sink-connector-clean + helm_release_name: resources-kafka-connect-sink-es-sink-connector-clean name: es-sink-connector namespace: example-namespace prefix: resources-kafka-connect-sink- diff --git a/tests/pipeline/snapshots/test_generate/test_load_pipeline/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_load_pipeline/pipeline.yaml index 87a88601c..fa1199b23 100644 --- a/tests/pipeline/snapshots/test_generate/test_load_pipeline/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_load_pipeline/pipeline.yaml @@ -9,6 +9,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-first-pipeline-scheduled-producer schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-first-pipeline-scheduled-producer-clean + helm_release_name: resources-first-pipeline-scheduled-producer-clean name: scheduled-producer namespace: example-namespace prefix: resources-first-pipeline- @@ -30,6 +32,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-first-pipeline-scheduled-producer schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-first-pipeline-scheduled-producer + helm_release_name: resources-first-pipeline-scheduled-producer name: scheduled-producer namespace: example-namespace prefix: resources-first-pipeline- @@ -81,6 +85,8 @@ - resources-first-pipeline-scheduled-producer outputTopic: resources-first-pipeline-converter schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-first-pipeline-converter-clean + helm_release_name: resources-first-pipeline-converter-clean name: converter namespace: example-namespace prefix: resources-first-pipeline- @@ -122,6 +128,8 @@ - resources-first-pipeline-scheduled-producer outputTopic: resources-first-pipeline-converter schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-first-pipeline-converter + helm_release_name: resources-first-pipeline-converter name: converter namespace: example-namespace prefix: resources-first-pipeline- @@ -180,6 +188,8 @@ - resources-first-pipeline-converter outputTopic: resources-first-pipeline-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-first-pipeline-a-long-name-a-long-name-a--48eb9-clean + helm_release_name: resources-first-pipeline-a-long-name-a-lo-48eb9-clean name: a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name namespace: example-namespace prefix: resources-first-pipeline- @@ -223,6 +233,8 @@ - resources-first-pipeline-converter outputTopic: resources-first-pipeline-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-first-pipeline-a-long-name-a-long-name-a-long-n-68327 + helm_release_name: resources-first-pipeline-a-long-name-a-long-nam-68327 name: a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name-a-long-name namespace: example-namespace prefix: resources-first-pipeline- diff --git a/tests/pipeline/snapshots/test_generate/test_model_serialization/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_model_serialization/pipeline.yaml index 02e06ff34..004d157b0 100644 --- a/tests/pipeline/snapshots/test_generate/test_model_serialization/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_model_serialization/pipeline.yaml @@ -4,6 +4,8 @@ brokers: test outputTopic: out schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-paths-account-producer-clean + helm_release_name: resources-pipeline-with-paths-account-producer-clean name: account-producer namespace: test prefix: resources-pipeline-with-paths- @@ -23,6 +25,8 @@ brokers: test outputTopic: out schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-paths-account-producer + helm_release_name: resources-pipeline-with-paths-account-producer name: account-producer namespace: test prefix: resources-pipeline-with-paths- diff --git a/tests/pipeline/snapshots/test_generate/test_no_input_topic/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_no_input_topic/pipeline.yaml index a77aea9be..ff490db8b 100644 --- a/tests/pipeline/snapshots/test_generate/test_no_input_topic/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_no_input_topic/pipeline.yaml @@ -18,6 +18,8 @@ inputPattern: .* outputTopic: example-output schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-no-input-topic-pipeline-app1-clean + helm_release_name: resources-no-input-topic-pipeline-app1-clean name: app1 namespace: example-namespace prefix: resources-no-input-topic-pipeline- @@ -53,6 +55,8 @@ topics: .*: type: pattern + helm_name_override: resources-no-input-topic-pipeline-app1 + helm_release_name: resources-no-input-topic-pipeline-app1 name: app1 namespace: example-namespace prefix: resources-no-input-topic-pipeline- @@ -91,6 +95,8 @@ inputTopics: - example-output schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-no-input-topic-pipeline-app2-clean + helm_release_name: resources-no-input-topic-pipeline-app2-clean name: app2 namespace: example-namespace prefix: resources-no-input-topic-pipeline- @@ -117,6 +123,8 @@ inputTopics: - example-output schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-no-input-topic-pipeline-app2 + helm_release_name: resources-no-input-topic-pipeline-app2 name: app2 namespace: example-namespace prefix: resources-no-input-topic-pipeline- diff --git a/tests/pipeline/snapshots/test_generate/test_no_user_defined_components/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_no_user_defined_components/pipeline.yaml index d8850383e..2d220a5f0 100644 --- a/tests/pipeline/snapshots/test_generate/test_no_user_defined_components/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_no_user_defined_components/pipeline.yaml @@ -13,6 +13,8 @@ - example-topic outputTopic: example-output schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-no-user-defined-components-streams-app-clean + helm_release_name: resources-no-user-defined-components-stre-2d151-clean name: streams-app namespace: example-namespace prefix: resources-no-user-defined-components- @@ -43,6 +45,8 @@ topics: example-topic: type: input + helm_name_override: resources-no-user-defined-components-streams-app + helm_release_name: resources-no-user-defined-components-streams-app name: streams-app namespace: example-namespace prefix: resources-no-user-defined-components- diff --git a/tests/pipeline/snapshots/test_generate/test_pipelines_with_envs/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_pipelines_with_envs/pipeline.yaml index 344e9c5b1..dec025bbf 100644 --- a/tests/pipeline/snapshots/test_generate/test_pipelines_with_envs/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_pipelines_with_envs/pipeline.yaml @@ -9,6 +9,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-pipeline-with-envs-input-producer schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-envs-input-producer-clean + helm_release_name: resources-pipeline-with-envs-input-producer-clean name: input-producer namespace: example-namespace prefix: resources-pipeline-with-envs- @@ -30,6 +32,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-pipeline-with-envs-input-producer schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-envs-input-producer + helm_release_name: resources-pipeline-with-envs-input-producer name: input-producer namespace: example-namespace prefix: resources-pipeline-with-envs- @@ -81,6 +85,8 @@ - resources-pipeline-with-envs-input-producer outputTopic: resources-pipeline-with-envs-converter schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-envs-converter-clean + helm_release_name: resources-pipeline-with-envs-converter-clean name: converter namespace: example-namespace prefix: resources-pipeline-with-envs- @@ -122,6 +128,8 @@ - resources-pipeline-with-envs-input-producer outputTopic: resources-pipeline-with-envs-converter schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-envs-converter + helm_release_name: resources-pipeline-with-envs-converter name: converter namespace: example-namespace prefix: resources-pipeline-with-envs- @@ -180,6 +188,8 @@ - resources-pipeline-with-envs-converter outputTopic: resources-pipeline-with-envs-filter schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-envs-filter-clean + helm_release_name: resources-pipeline-with-envs-filter-clean name: filter namespace: example-namespace prefix: resources-pipeline-with-envs- @@ -223,6 +233,8 @@ - resources-pipeline-with-envs-converter outputTopic: resources-pipeline-with-envs-filter schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-envs-filter + helm_release_name: resources-pipeline-with-envs-filter name: filter namespace: example-namespace prefix: resources-pipeline-with-envs- diff --git a/tests/pipeline/snapshots/test_generate/test_prefix_pipeline_component/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_prefix_pipeline_component/pipeline.yaml index 096b846d1..ca1709bcd 100644 --- a/tests/pipeline/snapshots/test_generate/test_prefix_pipeline_component/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_prefix_pipeline_component/pipeline.yaml @@ -12,6 +12,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 schemaRegistryUrl: http://localhost:8081/ suspend: true + helm_name_override: from-pipeline-component-account-producer-clean + helm_release_name: from-pipeline-component-account-producer-clean name: account-producer namespace: ${NAMESPACE} prefix: from-pipeline-component- @@ -36,6 +38,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 schemaRegistryUrl: http://localhost:8081/ suspend: true + helm_name_override: from-pipeline-component-account-producer + helm_release_name: from-pipeline-component-account-producer name: account-producer namespace: ${NAMESPACE} prefix: from-pipeline-component- diff --git a/tests/pipeline/snapshots/test_generate/test_read_from_component/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_read_from_component/pipeline.yaml index 761f21e63..319418e8b 100644 --- a/tests/pipeline/snapshots/test_generate/test_read_from_component/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_read_from_component/pipeline.yaml @@ -4,6 +4,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-read-from-component-producer1 schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-read-from-component-producer1-clean + helm_release_name: resources-read-from-component-producer1-clean name: producer1 namespace: example-namespace prefix: resources-read-from-component- @@ -20,6 +22,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-read-from-component-producer1 schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-read-from-component-producer1 + helm_release_name: resources-read-from-component-producer1 name: producer1 namespace: example-namespace prefix: resources-read-from-component- @@ -42,6 +46,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-read-from-component-producer2 schemaRegistryUrl: http://localhost:8081/ + helm_name_override: producer2-clean + helm_release_name: producer2-clean name: producer2 namespace: example-namespace prefix: '' @@ -58,6 +64,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-read-from-component-producer2 schemaRegistryUrl: http://localhost:8081/ + helm_name_override: producer2 + helm_release_name: producer2 name: producer2 namespace: example-namespace prefix: '' @@ -101,6 +109,8 @@ - resources-read-from-component-producer2 outputTopic: resources-read-from-component-inflate-step schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-read-from-component-inflate-step-clean + helm_release_name: resources-read-from-component-inflate-step-clean name: inflate-step namespace: example-namespace prefix: resources-read-from-component- @@ -138,6 +148,8 @@ - resources-read-from-component-producer2 outputTopic: resources-read-from-component-inflate-step schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-read-from-component-inflate-step + helm_release_name: resources-read-from-component-inflate-step name: inflate-step namespace: example-namespace prefix: resources-read-from-component- @@ -168,6 +180,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 connector: resources-read-from-component-inflate-step-inflated-sink-connector connectorType: sink + helm_name_override: resources-read-from-component-inflate-step-inflated-f12dd-clean + helm_release_name: resources-read-from-component-inflate-ste-f12dd-clean name: inflate-step-inflated-sink-connector namespace: example-namespace prefix: resources-read-from-component- @@ -220,6 +234,8 @@ - kafka-sink-connector outputTopic: resources-read-from-component-inflate-step-inflate-step-inflated-streams-app schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-read-from-component-inflate-step-inflated-51f5c-clean + helm_release_name: resources-read-from-component-inflate-ste-51f5c-clean name: inflate-step-inflated-streams-app namespace: example-namespace prefix: resources-read-from-component- @@ -244,6 +260,8 @@ - kafka-sink-connector outputTopic: resources-read-from-component-inflate-step-inflate-step-inflated-streams-app schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-read-from-component-inflate-step-inflated-streams-app + helm_release_name: resources-read-from-component-inflate-step-infl-5def2 name: inflate-step-inflated-streams-app namespace: example-namespace prefix: resources-read-from-component- @@ -293,6 +311,8 @@ - resources-read-from-component-inflate-step-inflate-step-inflated-streams-app outputTopic: resources-read-from-component-inflate-step-without-prefix schemaRegistryUrl: http://localhost:8081/ + helm_name_override: inflate-step-without-prefix-clean + helm_release_name: inflate-step-without-prefix-clean name: inflate-step-without-prefix namespace: example-namespace prefix: '' @@ -330,6 +350,8 @@ - resources-read-from-component-inflate-step-inflate-step-inflated-streams-app outputTopic: resources-read-from-component-inflate-step-without-prefix schemaRegistryUrl: http://localhost:8081/ + helm_name_override: inflate-step-without-prefix + helm_release_name: inflate-step-without-prefix name: inflate-step-without-prefix namespace: example-namespace prefix: '' @@ -360,6 +382,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 connector: resources-read-from-component-inflate-step-without-prefix-inflated-sink-connector connectorType: sink + helm_name_override: resources-read-from-component-inflate-step-without--08c44-clean + helm_release_name: resources-read-from-component-inflate-ste-08c44-clean name: inflate-step-without-prefix-inflated-sink-connector namespace: example-namespace prefix: resources-read-from-component- @@ -412,6 +436,8 @@ - kafka-sink-connector outputTopic: inflate-step-without-prefix-inflate-step-without-prefix-inflated-streams-app schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-read-from-component-inflate-step-without--53a68-clean + helm_release_name: resources-read-from-component-inflate-ste-53a68-clean name: inflate-step-without-prefix-inflated-streams-app namespace: example-namespace prefix: resources-read-from-component- @@ -436,6 +462,8 @@ - kafka-sink-connector outputTopic: inflate-step-without-prefix-inflate-step-without-prefix-inflated-streams-app schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-read-from-component-inflate-step-without-prefix-000dc + helm_release_name: resources-read-from-component-inflate-step-with-000dc name: inflate-step-without-prefix-inflated-streams-app namespace: example-namespace prefix: resources-read-from-component- @@ -472,6 +500,8 @@ - resources-read-from-component-producer1 outputTopic: resources-read-from-component-consumer1 schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-read-from-component-consumer1-clean + helm_release_name: resources-read-from-component-consumer1-clean name: consumer1 namespace: example-namespace prefix: resources-read-from-component- @@ -501,6 +531,8 @@ producer1: type: input topics: {} + helm_name_override: resources-read-from-component-consumer1 + helm_release_name: resources-read-from-component-consumer1 name: consumer1 namespace: example-namespace prefix: resources-read-from-component- @@ -537,6 +569,8 @@ - resources-read-from-component-producer1 - resources-read-from-component-consumer1 schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-read-from-component-consumer2-clean + helm_release_name: resources-read-from-component-consumer2-clean name: consumer2 namespace: example-namespace prefix: resources-read-from-component- @@ -568,6 +602,8 @@ producer1: type: input topics: {} + helm_name_override: resources-read-from-component-consumer2 + helm_release_name: resources-read-from-component-consumer2 name: consumer2 namespace: example-namespace prefix: resources-read-from-component- @@ -601,6 +637,8 @@ - resources-read-from-component-producer1 - resources-read-from-component-producer2 schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-read-from-component-consumer3-clean + helm_release_name: resources-read-from-component-consumer3-clean name: consumer3 namespace: example-namespace prefix: resources-read-from-component- @@ -632,6 +670,8 @@ topics: resources-read-from-component-producer1: type: input + helm_name_override: resources-read-from-component-consumer3 + helm_release_name: resources-read-from-component-consumer3 name: consumer3 namespace: example-namespace prefix: resources-read-from-component- @@ -664,6 +704,8 @@ inputTopics: - resources-read-from-component-inflate-step-inflate-step-inflated-streams-app schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-read-from-component-consumer4-clean + helm_release_name: resources-read-from-component-consumer4-clean name: consumer4 namespace: example-namespace prefix: resources-read-from-component- @@ -692,6 +734,8 @@ inflate-step: type: input topics: {} + helm_name_override: resources-read-from-component-consumer4 + helm_release_name: resources-read-from-component-consumer4 name: consumer4 namespace: example-namespace prefix: resources-read-from-component- @@ -724,6 +768,8 @@ inputTopics: - inflate-step-without-prefix-inflate-step-without-prefix-inflated-streams-app schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-read-from-component-consumer5-clean + helm_release_name: resources-read-from-component-consumer5-clean name: consumer5 namespace: example-namespace prefix: resources-read-from-component- @@ -752,6 +798,8 @@ inflate-step-without-prefix: type: input topics: {} + helm_name_override: resources-read-from-component-consumer5 + helm_release_name: resources-read-from-component-consumer5 name: consumer5 namespace: example-namespace prefix: resources-read-from-component- diff --git a/tests/pipeline/snapshots/test_generate/test_substitute_in_component/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_substitute_in_component/pipeline.yaml index 8ca686f30..aeee057b0 100644 --- a/tests/pipeline/snapshots/test_generate/test_substitute_in_component/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_substitute_in_component/pipeline.yaml @@ -8,11 +8,15 @@ app_name: scheduled-producer app_schedule: 30 3/8 * * * app_type: scheduled-producer + helm_name_override: resources-component-type-substitution-scheduled-producer + helm_release_name: resources-component-type-substitution-scheduled-producer schedule: 30 3/8 * * * streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-component-type-substitution-scheduled-producer schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-component-type-substitution-scheduled-producer-clean + helm_release_name: resources-component-type-substitution-sch-01b02-clean name: scheduled-producer namespace: example-namespace prefix: resources-component-type-substitution- @@ -33,11 +37,15 @@ app_name: scheduled-producer app_schedule: 30 3/8 * * * app_type: scheduled-producer + helm_name_override: resources-component-type-substitution-scheduled-producer + helm_release_name: resources-component-type-substitution-scheduled-producer schedule: 30 3/8 * * * streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-component-type-substitution-scheduled-producer schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-component-type-substitution-scheduled-producer + helm_release_name: resources-component-type-substitution-scheduled-b0010 name: scheduled-producer namespace: example-namespace prefix: resources-component-type-substitution- @@ -89,6 +97,8 @@ - resources-component-type-substitution-scheduled-producer outputTopic: resources-component-type-substitution-converter schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-component-type-substitution-converter-clean + helm_release_name: resources-component-type-substitution-converter-clean name: converter namespace: example-namespace prefix: resources-component-type-substitution- @@ -130,6 +140,8 @@ - resources-component-type-substitution-scheduled-producer outputTopic: resources-component-type-substitution-converter schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-component-type-substitution-converter + helm_release_name: resources-component-type-substitution-converter name: converter namespace: example-namespace prefix: resources-component-type-substitution- @@ -194,6 +206,8 @@ - resources-component-type-substitution-converter outputTopic: resources-component-type-substitution-filter-app schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-component-type-substitution-filter-app-clean + helm_release_name: resources-component-type-substitution-fil-d68ac-clean name: filter-app namespace: example-namespace prefix: resources-component-type-substitution- @@ -243,6 +257,8 @@ - resources-component-type-substitution-converter outputTopic: resources-component-type-substitution-filter-app schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-component-type-substitution-filter-app + helm_release_name: resources-component-type-substitution-filter-app name: filter-app namespace: example-namespace prefix: resources-component-type-substitution- diff --git a/tests/pipeline/snapshots/test_generate/test_with_custom_config_with_absolute_defaults_path/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_with_custom_config_with_absolute_defaults_path/pipeline.yaml index f78e8f0d1..bd29f273a 100644 --- a/tests/pipeline/snapshots/test_generate/test_with_custom_config_with_absolute_defaults_path/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_with_custom_config_with_absolute_defaults_path/pipeline.yaml @@ -9,6 +9,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: app1-test-topic schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-custom-config-app1-clean + helm_release_name: resources-custom-config-app1-clean name: app1 namespace: development-namespace prefix: resources-custom-config- @@ -30,6 +32,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: app1-test-topic schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-custom-config-app1 + helm_release_name: resources-custom-config-app1 name: app1 namespace: development-namespace prefix: resources-custom-config- @@ -64,6 +68,8 @@ - app1-test-topic outputTopic: app2-test-topic schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-custom-config-app2-clean + helm_release_name: resources-custom-config-app2-clean name: app2 namespace: development-namespace prefix: resources-custom-config- @@ -91,6 +97,8 @@ - app1-test-topic outputTopic: app2-test-topic schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-custom-config-app2 + helm_release_name: resources-custom-config-app2 name: app2 namespace: development-namespace prefix: resources-custom-config- diff --git a/tests/pipeline/snapshots/test_generate/test_with_custom_config_with_relative_defaults_path/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_with_custom_config_with_relative_defaults_path/pipeline.yaml index f78e8f0d1..bd29f273a 100644 --- a/tests/pipeline/snapshots/test_generate/test_with_custom_config_with_relative_defaults_path/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_with_custom_config_with_relative_defaults_path/pipeline.yaml @@ -9,6 +9,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: app1-test-topic schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-custom-config-app1-clean + helm_release_name: resources-custom-config-app1-clean name: app1 namespace: development-namespace prefix: resources-custom-config- @@ -30,6 +32,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: app1-test-topic schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-custom-config-app1 + helm_release_name: resources-custom-config-app1 name: app1 namespace: development-namespace prefix: resources-custom-config- @@ -64,6 +68,8 @@ - app1-test-topic outputTopic: app2-test-topic schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-custom-config-app2-clean + helm_release_name: resources-custom-config-app2-clean name: app2 namespace: development-namespace prefix: resources-custom-config- @@ -91,6 +97,8 @@ - app1-test-topic outputTopic: app2-test-topic schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-custom-config-app2 + helm_release_name: resources-custom-config-app2 name: app2 namespace: development-namespace prefix: resources-custom-config- diff --git a/tests/pipeline/snapshots/test_generate/test_with_env_defaults/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_with_env_defaults/pipeline.yaml index cea0b2660..59f556c41 100644 --- a/tests/pipeline/snapshots/test_generate/test_with_env_defaults/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_with_env_defaults/pipeline.yaml @@ -13,6 +13,8 @@ - example-topic outputTopic: example-output schemaRegistryUrl: http://localhost:8081/ + helm_name_override: resources-pipeline-with-env-defaults-streams-app-de-5b336-clean + helm_release_name: resources-pipeline-with-env-defaults-stre-5b336-clean name: streams-app-development namespace: development-namespace prefix: resources-pipeline-with-env-defaults- @@ -43,6 +45,8 @@ topics: example-topic: type: input + helm_name_override: resources-pipeline-with-env-defaults-streams-app-development + helm_release_name: resources-pipeline-with-env-defaults-streams-ap-49439 name: streams-app-development namespace: development-namespace prefix: resources-pipeline-with-env-defaults- @@ -71,6 +75,8 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 connector: resources-pipeline-with-env-defaults-es-sink-connector connectorType: sink + helm_name_override: resources-pipeline-with-env-defaults-es-sink-connector-clean + helm_release_name: resources-pipeline-with-env-defaults-es-s-d5f87-clean name: es-sink-connector namespace: development-namespace prefix: resources-pipeline-with-env-defaults-