From 30fd15668bc05d030420018bdcbf05e9dc2f2adc Mon Sep 17 00:00:00 2001 From: Ramin Gharib Date: Tue, 29 Oct 2024 12:47:30 +0100 Subject: [PATCH] Update files --- docs/docs/schema/defaults.json | 35 +------------------ docs/docs/schema/pipeline.json | 20 ----------- .../base_components/kubernetes_app.py | 3 -- .../test_generate/atm-fraud/pipeline.yaml | 14 +------- .../test_generate/word-count/pipeline.yaml | 8 +---- .../test_default_config/pipeline.yaml | 4 --- .../test_inflate_pipeline/pipeline.yaml | 12 +------ .../pipeline.yaml | 6 +--- .../test_load_pipeline/pipeline.yaml | 6 ---- .../pipeline.yaml | 6 ---- .../pipeline.yaml | 6 ---- .../test_model_serialization/pipeline.yaml | 2 -- .../test_no_input_topic/pipeline.yaml | 4 --- .../pipeline.yaml | 2 -- .../test_pipelines_with_envs/pipeline.yaml | 6 ---- .../pipeline.yaml | 2 -- .../test_read_from_component/pipeline.yaml | 30 ++-------------- .../test_streams_bootstrap/pipeline.yaml | 4 --- .../pipeline.yaml | 6 ---- .../pipeline.yaml | 4 --- .../pipeline.yaml | 4 --- .../test_with_env_defaults/pipeline.yaml | 6 +--- 22 files changed, 8 insertions(+), 182 deletions(-) diff --git a/docs/docs/schema/defaults.json b/docs/docs/schema/defaults.json index ff174ff38..33fb8e187 100644 --- a/docs/docs/schema/defaults.json +++ b/docs/docs/schema/defaults.json @@ -170,10 +170,6 @@ "additionalProperties": true, "description": "Helm app values.", "properties": { - "metadata": { - "title": "Metadata", - "type": "object" - }, "nameOverride": { "anyOf": [ { @@ -837,12 +833,7 @@ "KubernetesAppValues": { "additionalProperties": true, "description": "Settings specific to Kubernetes apps.", - "properties": { - "metadata": { - "title": "Metadata", - "type": "object" - } - }, + "properties": {}, "title": "KubernetesAppValues", "type": "object" }, @@ -1206,10 +1197,6 @@ "title": "Imagetag", "type": "string" }, - "metadata": { - "title": "Metadata", - "type": "object" - }, "nameOverride": { "anyOf": [ { @@ -1359,10 +1346,6 @@ "title": "Livenessprobe", "type": "object" }, - "metadata": { - "title": "Metadata", - "type": "object" - }, "nameOverride": { "anyOf": [ { @@ -2092,10 +2075,6 @@ "title": "Imagetag", "type": "string" }, - "metadata": { - "title": "Metadata", - "type": "object" - }, "nameOverride": { "anyOf": [ { @@ -2266,10 +2245,6 @@ "title": "Livenessprobe", "type": "object" }, - "metadata": { - "title": "Metadata", - "type": "object" - }, "nameOverride": { "anyOf": [ { @@ -2614,10 +2589,6 @@ "title": "Imagetag", "type": "string" }, - "metadata": { - "title": "Metadata", - "type": "object" - }, "nameOverride": { "anyOf": [ { @@ -2749,10 +2720,6 @@ "title": "Livenessprobe", "type": "object" }, - "metadata": { - "title": "Metadata", - "type": "object" - }, "nameOverride": { "anyOf": [ { diff --git a/docs/docs/schema/pipeline.json b/docs/docs/schema/pipeline.json index 50866c590..ec795608f 100644 --- a/docs/docs/schema/pipeline.json +++ b/docs/docs/schema/pipeline.json @@ -170,10 +170,6 @@ "additionalProperties": true, "description": "Helm app values.", "properties": { - "metadata": { - "title": "Metadata", - "type": "object" - }, "nameOverride": { "anyOf": [ { @@ -837,10 +833,6 @@ "title": "Imagetag", "type": "string" }, - "metadata": { - "title": "Metadata", - "type": "object" - }, "nameOverride": { "anyOf": [ { @@ -990,10 +982,6 @@ "title": "Livenessprobe", "type": "object" }, - "metadata": { - "title": "Metadata", - "type": "object" - }, "nameOverride": { "anyOf": [ { @@ -1723,10 +1711,6 @@ "title": "Imagetag", "type": "string" }, - "metadata": { - "title": "Metadata", - "type": "object" - }, "nameOverride": { "anyOf": [ { @@ -1897,10 +1881,6 @@ "title": "Livenessprobe", "type": "object" }, - "metadata": { - "title": "Metadata", - "type": "object" - }, "nameOverride": { "anyOf": [ { diff --git a/kpops/components/base_components/kubernetes_app.py b/kpops/components/base_components/kubernetes_app.py index 93be0b484..f3a8e646f 100644 --- a/kpops/components/base_components/kubernetes_app.py +++ b/kpops/components/base_components/kubernetes_app.py @@ -3,7 +3,6 @@ import logging import re from abc import ABC -from typing import Any from pydantic import ConfigDict, Field from typing_extensions import override @@ -22,8 +21,6 @@ class KubernetesAppValues(CamelCaseConfigModel, DescConfigModel): """Settings specific to Kubernetes apps.""" - metadata: dict[str, Any] = Field(default_factory=dict) - model_config = ConfigDict( extra="allow", ) 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 49b3d6e93..3e184da56 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,7 +16,6 @@ imageTag: 1.0.0 labels: pipeline: atm-fraud - metadata: {} prometheus: jmx: enabled: false @@ -52,7 +51,6 @@ imageTag: 1.0.0 labels: pipeline: atm-fraud - metadata: {} prometheus: jmx: enabled: false @@ -86,7 +84,6 @@ imageTag: 1.0.0 labels: pipeline: atm-fraud - metadata: {} prometheus: jmx: enabled: false @@ -125,7 +122,6 @@ imageTag: 1.0.0 labels: pipeline: atm-fraud - metadata: {} prometheus: jmx: enabled: false @@ -160,7 +156,6 @@ imageTag: 1.0.0 labels: pipeline: atm-fraud - metadata: {} persistence: enabled: false prometheus: @@ -208,7 +203,6 @@ imageTag: 1.0.0 labels: pipeline: atm-fraud - metadata: {} persistence: enabled: false prometheus: @@ -247,7 +241,6 @@ imageTag: 1.0.0 labels: pipeline: atm-fraud - metadata: {} persistence: enabled: false prometheus: @@ -295,7 +288,6 @@ imageTag: 1.0.0 labels: pipeline: atm-fraud - metadata: {} persistence: enabled: false prometheus: @@ -334,7 +326,6 @@ imageTag: 1.0.0 labels: pipeline: atm-fraud - metadata: {} persistence: enabled: false prometheus: @@ -392,7 +383,6 @@ imageTag: 1.0.0 labels: pipeline: atm-fraud - metadata: {} persistence: enabled: false prometheus: @@ -429,7 +419,6 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 connector: atm-fraud-postgresql-connector connectorType: sink - metadata: {} version: 1.0.4 config: auto.create: true @@ -456,7 +445,6 @@ value.converter.schema.registry.url: http://k8kafka-cp-schema-registry.${NAMESPACE}.svc.cluster.local:8081 name: postgresql-connector prefix: atm-fraud- - resetter_values: - metadata: {} + resetter_values: {} sync_wave: 9 type: kafka-sink-connector 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 c4a7d3436..de0c0d76f 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 @@ -16,7 +16,6 @@ imageTag: 1.0.0 labels: pipeline: word-count - metadata: {} prometheus: jmx: enabled: false @@ -50,7 +49,6 @@ imageTag: 1.0.0 labels: pipeline: word-count - metadata: {} prometheus: jmx: enabled: false @@ -81,7 +79,6 @@ imageTag: 1.0.0 labels: pipeline: word-count - metadata: {} persistence: enabled: false prometheus: @@ -129,7 +126,6 @@ imageTag: 1.0.0 labels: pipeline: word-count - metadata: {} persistence: enabled: false prometheus: @@ -163,7 +159,6 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 connector: word-count-redis-sink-connector connectorType: sink - metadata: {} version: 1.0.4 config: connector.class: com.github.jcustenborder.kafka.connect.redis.RedisSinkConnector @@ -176,7 +171,6 @@ value.converter: org.apache.kafka.connect.storage.StringConverter name: redis-sink-connector prefix: word-count- - resetter_values: - metadata: {} + resetter_values: {} sync_wave: 5 type: kafka-sink-connector 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 8e24ed239..60dabb00d 100644 --- a/tests/pipeline/snapshots/test_generate/test_default_config/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_default_config/pipeline.yaml @@ -12,7 +12,6 @@ type: producer-app-cleaner values: imageTag: latest - metadata: {} resources: limits: memory: 2G @@ -43,7 +42,6 @@ type: producer-app-v2 values: imageTag: latest - metadata: {} resources: limits: memory: 2G @@ -71,7 +69,6 @@ imageTag: latest labels: pipeline: resources-custom-config - metadata: {} persistence: enabled: false statefulSet: false @@ -114,7 +111,6 @@ imageTag: latest labels: pipeline: resources-custom-config - metadata: {} persistence: enabled: false statefulSet: false 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 69d58964f..bbc3e68db 100644 --- a/tests/pipeline/snapshots/test_generate/test_inflate_pipeline/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_inflate_pipeline/pipeline.yaml @@ -15,7 +15,6 @@ FAKE_ARG: fake-arg-value image: example-registry/fake-image imageTag: 0.0.1 - metadata: {} schedule: 30 3/8 * * * streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 @@ -48,7 +47,6 @@ FAKE_ARG: fake-arg-value image: example-registry/fake-image imageTag: 0.0.1 - metadata: {} schedule: 30 3/8 * * * streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 @@ -81,7 +79,6 @@ commandLine: CONVERT_XML: true imageTag: latest - metadata: {} persistence: enabled: false resources: @@ -140,7 +137,6 @@ commandLine: CONVERT_XML: true imageTag: latest - metadata: {} persistence: enabled: false resources: @@ -187,7 +183,6 @@ TYPE: nothing image: fake-registry/filter imageTag: 2.4.1 - metadata: {} persistence: enabled: false replicaCount: 4 @@ -246,7 +241,6 @@ TYPE: nothing image: fake-registry/filter imageTag: 2.4.1 - metadata: {} persistence: enabled: false replicaCount: 4 @@ -281,7 +275,6 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 connector: resources-pipeline-with-inflate-should-inflate-inflated-sink-connector connectorType: sink - metadata: {} version: 1.0.4 config: batch.size: '2000' @@ -299,8 +292,7 @@ transforms.changeTopic.replacement: resources-pipeline-with-inflate-should-inflate-index-v1 name: should-inflate-inflated-sink-connector prefix: resources-pipeline-with-inflate- - resetter_values: - metadata: {} + resetter_values: {} sync_wave: 7 to: models: {} @@ -327,7 +319,6 @@ type: streams-app-cleaner values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -366,7 +357,6 @@ type: streams-app-v2 values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false 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 9758096dc..400dfb174 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,7 +13,6 @@ values: image: fake-image imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -58,7 +57,6 @@ values: image: fake-image imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -89,7 +87,6 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 connector: resources-kafka-connect-sink-es-sink-connector connectorType: sink - metadata: {} version: 1.0.4 config: batch.size: '2000' @@ -106,8 +103,7 @@ topics: example-output name: es-sink-connector prefix: resources-kafka-connect-sink- - resetter_values: - metadata: {} + resetter_values: {} sync_wave: 4 type: kafka-sink-connector 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 251146279..ad251b8d2 100644 --- a/tests/pipeline/snapshots/test_generate/test_load_pipeline/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_load_pipeline/pipeline.yaml @@ -15,7 +15,6 @@ FAKE_ARG: fake-arg-value image: example-registry/fake-image imageTag: 0.0.1 - metadata: {} schedule: 30 3/8 * * * streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 @@ -48,7 +47,6 @@ FAKE_ARG: fake-arg-value image: example-registry/fake-image imageTag: 0.0.1 - metadata: {} schedule: 30 3/8 * * * streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 @@ -81,7 +79,6 @@ commandLine: CONVERT_XML: true imageTag: latest - metadata: {} persistence: enabled: false resources: @@ -140,7 +137,6 @@ commandLine: CONVERT_XML: true imageTag: latest - metadata: {} persistence: enabled: false resources: @@ -187,7 +183,6 @@ TYPE: nothing image: fake-registry/filter imageTag: 2.4.1 - metadata: {} persistence: enabled: false replicaCount: 4 @@ -246,7 +241,6 @@ TYPE: nothing image: fake-registry/filter imageTag: 2.4.1 - metadata: {} persistence: enabled: false replicaCount: 4 diff --git a/tests/pipeline/snapshots/test_generate/test_load_pipeline_with_folder_path/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_load_pipeline_with_folder_path/pipeline.yaml index 452d98c14..2a26ff1e4 100644 --- a/tests/pipeline/snapshots/test_generate/test_load_pipeline_with_folder_path/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_load_pipeline_with_folder_path/pipeline.yaml @@ -15,7 +15,6 @@ FAKE_ARG: fake-arg-value image: example-registry/fake-image imageTag: 0.0.1 - metadata: {} schedule: 30 3/8 * * * streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 @@ -48,7 +47,6 @@ FAKE_ARG: fake-arg-value image: example-registry/fake-image imageTag: 0.0.1 - metadata: {} schedule: 30 3/8 * * * streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 @@ -82,7 +80,6 @@ commandLine: CONVERT_XML: true imageTag: latest - metadata: {} persistence: enabled: false resources: @@ -139,7 +136,6 @@ commandLine: CONVERT_XML: true imageTag: latest - metadata: {} persistence: enabled: false resources: @@ -185,7 +181,6 @@ TYPE: nothing image: fake-registry/filter imageTag: 2.4.1 - metadata: {} persistence: enabled: false replicaCount: 4 @@ -242,7 +237,6 @@ TYPE: nothing image: fake-registry/filter imageTag: 2.4.1 - metadata: {} persistence: enabled: false replicaCount: 4 diff --git a/tests/pipeline/snapshots/test_generate/test_load_pipeline_with_multiple_pipeline_paths/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_load_pipeline_with_multiple_pipeline_paths/pipeline.yaml index 452d98c14..2a26ff1e4 100644 --- a/tests/pipeline/snapshots/test_generate/test_load_pipeline_with_multiple_pipeline_paths/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_load_pipeline_with_multiple_pipeline_paths/pipeline.yaml @@ -15,7 +15,6 @@ FAKE_ARG: fake-arg-value image: example-registry/fake-image imageTag: 0.0.1 - metadata: {} schedule: 30 3/8 * * * streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 @@ -48,7 +47,6 @@ FAKE_ARG: fake-arg-value image: example-registry/fake-image imageTag: 0.0.1 - metadata: {} schedule: 30 3/8 * * * streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 @@ -82,7 +80,6 @@ commandLine: CONVERT_XML: true imageTag: latest - metadata: {} persistence: enabled: false resources: @@ -139,7 +136,6 @@ commandLine: CONVERT_XML: true imageTag: latest - metadata: {} persistence: enabled: false resources: @@ -185,7 +181,6 @@ TYPE: nothing image: fake-registry/filter imageTag: 2.4.1 - metadata: {} persistence: enabled: false replicaCount: 4 @@ -242,7 +237,6 @@ TYPE: nothing image: fake-registry/filter imageTag: 2.4.1 - metadata: {} persistence: enabled: false replicaCount: 4 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 628b3a1a2..0d92cc36c 100644 --- a/tests/pipeline/snapshots/test_generate/test_model_serialization/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_model_serialization/pipeline.yaml @@ -15,7 +15,6 @@ type: producer-app-cleaner values: imageTag: latest - metadata: {} streams: brokers: test outputTopic: out @@ -36,7 +35,6 @@ type: producer-app-v2 values: imageTag: latest - metadata: {} streams: brokers: test outputTopic: out 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 49792f146..eb31e548e 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 @@ -14,7 +14,6 @@ commandLine: CONVERT_XML: true imageTag: latest - metadata: {} persistence: enabled: false resources: @@ -64,7 +63,6 @@ commandLine: CONVERT_XML: true imageTag: latest - metadata: {} persistence: enabled: false resources: @@ -96,7 +94,6 @@ type: streams-app-cleaner values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -140,7 +137,6 @@ type: streams-app-v2 values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false 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 b9d714f71..baa4c1f50 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,7 +13,6 @@ values: image: fake-image imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -58,7 +57,6 @@ values: image: fake-image imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false 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 0689353f9..0cdbaba2b 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 @@ -15,7 +15,6 @@ FAKE_ARG: override-arg image: example-registry/fake-image imageTag: 0.0.1 - metadata: {} schedule: 20 3/8 * * * streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 @@ -48,7 +47,6 @@ FAKE_ARG: override-arg image: example-registry/fake-image imageTag: 0.0.1 - metadata: {} schedule: 20 3/8 * * * streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 @@ -81,7 +79,6 @@ commandLine: CONVERT_XML: true imageTag: latest - metadata: {} persistence: enabled: false resources: @@ -140,7 +137,6 @@ commandLine: CONVERT_XML: true imageTag: latest - metadata: {} persistence: enabled: false resources: @@ -187,7 +183,6 @@ TYPE: nothing image: fake-registry/filter imageTag: 2.4.1 - metadata: {} persistence: enabled: false replicaCount: 4 @@ -246,7 +241,6 @@ TYPE: nothing image: fake-registry/filter imageTag: 2.4.1 - metadata: {} persistence: enabled: false replicaCount: 4 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 bdf98653c..85e575d10 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 @@ -14,7 +14,6 @@ debug: true image: ${DOCKER_REGISTRY}/atm-demo-accountproducer imageTag: 1.0.0 - metadata: {} prometheus: jmx: enabled: false @@ -39,7 +38,6 @@ debug: true image: ${DOCKER_REGISTRY}/atm-demo-accountproducer imageTag: 1.0.0 - metadata: {} prometheus: jmx: enabled: false 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 da2f6fbd3..e990c6dfc 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 @@ -12,7 +12,6 @@ type: producer-app-cleaner values: imageTag: latest - metadata: {} streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-read-from-component-producer1 @@ -37,7 +36,6 @@ type: producer-app-v2 values: imageTag: latest - metadata: {} streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-read-from-component-producer1 @@ -57,7 +55,6 @@ type: producer-app-cleaner values: imageTag: latest - metadata: {} streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-read-from-component-producer2 @@ -82,7 +79,6 @@ type: producer-app-v2 values: imageTag: latest - metadata: {} streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 outputTopic: resources-read-from-component-producer2 @@ -114,7 +110,6 @@ - resources-read-from-component-inflate-step image: fake-registry/filter imageTag: 2.4.1 - metadata: {} persistence: enabled: false statefulSet: false @@ -167,7 +162,6 @@ - resources-read-from-component-inflate-step image: fake-registry/filter imageTag: 2.4.1 - metadata: {} persistence: enabled: false statefulSet: false @@ -198,7 +192,6 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 connector: resources-read-from-component-inflate-step-inflated-sink-connector connectorType: sink - metadata: {} version: 1.0.4 config: batch.size: '2000' @@ -216,8 +209,7 @@ transforms.changeTopic.replacement: resources-read-from-component-inflate-step-index-v1 name: inflate-step-inflated-sink-connector prefix: resources-read-from-component- - resetter_values: - metadata: {} + resetter_values: {} sync_wave: 5 to: models: {} @@ -244,7 +236,6 @@ type: streams-app-cleaner values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -283,7 +274,6 @@ type: streams-app-v2 values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -323,7 +313,6 @@ - resources-read-from-component-inflate-step-without-prefix image: fake-registry/filter imageTag: 2.4.1 - metadata: {} persistence: enabled: false statefulSet: false @@ -376,7 +365,6 @@ - resources-read-from-component-inflate-step-without-prefix image: fake-registry/filter imageTag: 2.4.1 - metadata: {} persistence: enabled: false statefulSet: false @@ -407,7 +395,6 @@ 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 - metadata: {} version: 1.0.4 config: batch.size: '2000' @@ -425,8 +412,7 @@ transforms.changeTopic.replacement: resources-read-from-component-inflate-step-without-prefix-index-v1 name: inflate-step-without-prefix-inflated-sink-connector prefix: resources-read-from-component- - resetter_values: - metadata: {} + resetter_values: {} sync_wave: 6 to: models: {} @@ -453,7 +439,6 @@ type: streams-app-cleaner values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -492,7 +477,6 @@ type: streams-app-v2 values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -520,7 +504,6 @@ type: streams-app-cleaner values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -564,7 +547,6 @@ type: streams-app-v2 values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -592,7 +574,6 @@ type: streams-app-cleaner values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -635,7 +616,6 @@ type: streams-app-v2 values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -663,7 +643,6 @@ type: streams-app-cleaner values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -706,7 +685,6 @@ type: streams-app-v2 values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -734,7 +712,6 @@ type: streams-app-cleaner values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -774,7 +751,6 @@ type: streams-app-v2 values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -801,7 +777,6 @@ type: streams-app-cleaner values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -841,7 +816,6 @@ type: streams-app-v2 values: imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false diff --git a/tests/pipeline/snapshots/test_generate/test_streams_bootstrap/pipeline.yaml b/tests/pipeline/snapshots/test_generate/test_streams_bootstrap/pipeline.yaml index b93580da0..0c794eeef 100644 --- a/tests/pipeline/snapshots/test_generate/test_streams_bootstrap/pipeline.yaml +++ b/tests/pipeline/snapshots/test_generate/test_streams_bootstrap/pipeline.yaml @@ -34,7 +34,6 @@ outputTopic: my-producer-app-output-topic schemaRegistryUrl: http://localhost:8081/ livenessProbe: {} - metadata: {} podAnnotations: {} podLabels: {} ports: [] @@ -104,7 +103,6 @@ outputTopic: my-producer-app-output-topic schemaRegistryUrl: http://localhost:8081/ livenessProbe: {} - metadata: {} podAnnotations: {} podLabels: {} ports: [] @@ -179,7 +177,6 @@ outputTopic: my-output-topic schemaRegistryUrl: http://localhost:8081/ livenessProbe: {} - metadata: {} persistence: enabled: false podAnnotations: {} @@ -296,7 +293,6 @@ outputTopic: my-output-topic schemaRegistryUrl: http://localhost:8081/ livenessProbe: {} - metadata: {} persistence: enabled: false podAnnotations: {} 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 4cc05b38b..c1849b512 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 @@ -19,7 +19,6 @@ app_name: scheduled-producer app_schedule: 30 3/8 * * * app_type: scheduled-producer - metadata: {} schedule: 30 3/8 * * * streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 @@ -56,7 +55,6 @@ app_name: scheduled-producer app_schedule: 30 3/8 * * * app_type: scheduled-producer - metadata: {} schedule: 30 3/8 * * * streams: brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 @@ -89,7 +87,6 @@ commandLine: CONVERT_XML: true imageTag: latest - metadata: {} persistence: enabled: false resources: @@ -148,7 +145,6 @@ commandLine: CONVERT_XML: true imageTag: latest - metadata: {} persistence: enabled: false resources: @@ -201,7 +197,6 @@ app_type: filter filter: filter-app-filter test_placeholder_in_placeholder: filter-app-filter - metadata: {} persistence: enabled: false replicaCount: 4 @@ -266,7 +261,6 @@ app_type: filter filter: filter-app-filter test_placeholder_in_placeholder: filter-app-filter - metadata: {} persistence: enabled: false replicaCount: 4 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 7003f31cc..349530ea4 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 @@ -12,7 +12,6 @@ type: producer-app-cleaner values: imageTag: latest - metadata: {} resources: limits: memory: 2G @@ -43,7 +42,6 @@ type: producer-app-v2 values: imageTag: latest - metadata: {} resources: limits: memory: 2G @@ -71,7 +69,6 @@ imageTag: latest labels: pipeline: resources-custom-config - metadata: {} persistence: enabled: false statefulSet: false @@ -114,7 +111,6 @@ imageTag: latest labels: pipeline: resources-custom-config - metadata: {} persistence: enabled: false statefulSet: false 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 7003f31cc..349530ea4 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 @@ -12,7 +12,6 @@ type: producer-app-cleaner values: imageTag: latest - metadata: {} resources: limits: memory: 2G @@ -43,7 +42,6 @@ type: producer-app-v2 values: imageTag: latest - metadata: {} resources: limits: memory: 2G @@ -71,7 +69,6 @@ imageTag: latest labels: pipeline: resources-custom-config - metadata: {} persistence: enabled: false statefulSet: false @@ -114,7 +111,6 @@ imageTag: latest labels: pipeline: resources-custom-config - metadata: {} persistence: enabled: false statefulSet: false 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 706ae456f..4bdf99175 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,7 +13,6 @@ values: image: fake-image imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -58,7 +57,6 @@ values: image: fake-image imageTag: latest - metadata: {} persistence: enabled: false statefulSet: false @@ -89,7 +87,6 @@ brokers: http://k8kafka-cp-kafka-headless.kpops.svc.cluster.local:9092 connector: resources-pipeline-with-env-defaults-es-sink-connector connectorType: sink - metadata: {} version: 1.0.4 config: batch.size: '2000' @@ -106,8 +103,7 @@ topics: example-output name: es-sink-connector prefix: resources-pipeline-with-env-defaults- - resetter_values: - metadata: {} + resetter_values: {} sync_wave: 4 type: kafka-sink-connector