From f6a05f8de710ac79ea0f433d79e7be6afdaca490 Mon Sep 17 00:00:00 2001 From: mabulgu Date: Fri, 22 Mar 2024 02:40:50 +0300 Subject: [PATCH] bump version to strimzi 0.38 and a few improvements --- .github/workflows/deploy.yml | 4 ++-- .github/workflows/post-deploy.yml | 1 + Dockerfile | 2 +- kfk/config.py | 2 +- pyproject.toml | 2 +- tests/files/yaml/kafka-connect.yaml | 2 +- tests/files/yaml/kafka-connect_with_image.yaml | 2 +- tests/files/yaml/kafka-connect_with_three_replicas.yaml | 2 +- tests/files/yaml/kafka-connect_with_zip_jar_plugins.yaml | 2 +- tests/files/yaml/kafka-ephemeral.yaml | 2 +- tests/files/yaml/kafka-ephemeral_name_updated.yaml | 2 +- .../yaml/kafka-ephemeral_two_additional_configs_deleted.yaml | 2 +- .../yaml/kafka-ephemeral_with_one_additional_config.yaml | 2 +- tests/files/yaml/kafka-ephemeral_with_one_replica.yaml | 2 +- .../yaml/kafka-ephemeral_with_one_replica_one_zk_replica.yaml | 2 +- .../yaml/kafka-ephemeral_with_two_additional_configs.yaml | 2 +- tests/files/yaml/kafka-ephemeral_with_two_replicas.yaml | 2 +- 17 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 52f92be..d143837 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -70,9 +70,9 @@ jobs: - name: Write version run: | printf '{ - "version": ${{ needs.deploy.outputs.version }} + "version": "${{ needs.deploy.outputs.version }}" }' >> build_data.json - uses: actions/upload-artifact@v3 with: - name: build_data.json + name: build_data path: ./ diff --git a/.github/workflows/post-deploy.yml b/.github/workflows/post-deploy.yml index 9a10319..4b22d18 100644 --- a/.github/workflows/post-deploy.yml +++ b/.github/workflows/post-deploy.yml @@ -38,6 +38,7 @@ jobs: - name: Unzip artifact run: unzip build_data.zip + - name: Return Parsed JSON uses: actions/github-script@v6 id: return-parsed-json diff --git a/Dockerfile b/Dockerfile index c3f1289..010831c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ RUN apk add --update \ curl \ && rm -rf /var/cache/apk/* RUN adduser -D kfkuser -RUN pip install strimzi-kafka-cli==0.1.0a77 +RUN pip install strimzi-kafka-cli==0.1.0a78 USER kfkuser RUN mkdir /home/kfkuser/.kube RUN curl https://raw.githubusercontent.com/SystemCraftsman/strimzi-kafka-cli/main/tests/files/yaml/kubeconfig -o /home/kfkuser/.kube/config diff --git a/kfk/config.py b/kfk/config.py index 617a99b..d758feb 100644 --- a/kfk/config.py +++ b/kfk/config.py @@ -3,7 +3,7 @@ import sys from pathlib import Path -STRIMZI_VERSION = "0.38.0" +STRIMZI_VERSION = "0.39.0" KUBECTL_VERSION = "v1.28.3" diff --git a/pyproject.toml b/pyproject.toml index 13e78e9..c189afe 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "strimzi-kafka-cli" -version = "0.1.0-alpha77" +version = "0.1.0-alpha78" description = "Command Line Interface for Strimzi Kafka Operator" authors = [{ name = "Aykut Bulgu", email = "aykut@systemcraftsman.com" }] readme = "README.md" diff --git a/tests/files/yaml/kafka-connect.yaml b/tests/files/yaml/kafka-connect.yaml index eda7627..4a04876 100644 --- a/tests/files/yaml/kafka-connect.yaml +++ b/tests/files/yaml/kafka-connect.yaml @@ -32,4 +32,4 @@ spec: value.converter: org.apache.kafka.connect.json.JsonConverter value.converter.schemas.enable: true replicas: 1 - version: 3.6.0 + version: 3.6.1 diff --git a/tests/files/yaml/kafka-connect_with_image.yaml b/tests/files/yaml/kafka-connect_with_image.yaml index 83bb68b..f93ac94 100644 --- a/tests/files/yaml/kafka-connect_with_image.yaml +++ b/tests/files/yaml/kafka-connect_with_image.yaml @@ -19,4 +19,4 @@ spec: value.converter.schemas.enable: true image: quay.io/systemcraftsman/test-connect-cluster:latest replicas: 1 - version: 3.6.0 + version: 3.6.1 diff --git a/tests/files/yaml/kafka-connect_with_three_replicas.yaml b/tests/files/yaml/kafka-connect_with_three_replicas.yaml index 186f96b..eabfaf5 100644 --- a/tests/files/yaml/kafka-connect_with_three_replicas.yaml +++ b/tests/files/yaml/kafka-connect_with_three_replicas.yaml @@ -32,4 +32,4 @@ spec: value.converter: org.apache.kafka.connect.json.JsonConverter value.converter.schemas.enable: true replicas: 3 - version: 3.6.0 + version: 3.6.1 diff --git a/tests/files/yaml/kafka-connect_with_zip_jar_plugins.yaml b/tests/files/yaml/kafka-connect_with_zip_jar_plugins.yaml index 7d736f9..21d410d 100644 --- a/tests/files/yaml/kafka-connect_with_zip_jar_plugins.yaml +++ b/tests/files/yaml/kafka-connect_with_zip_jar_plugins.yaml @@ -32,4 +32,4 @@ spec: value.converter: org.apache.kafka.connect.json.JsonConverter value.converter.schemas.enable: true replicas: 1 - version: 3.6.0 + version: 3.6.1 diff --git a/tests/files/yaml/kafka-ephemeral.yaml b/tests/files/yaml/kafka-ephemeral.yaml index fe5b098..62e652f 100644 --- a/tests/files/yaml/kafka-ephemeral.yaml +++ b/tests/files/yaml/kafka-ephemeral.yaml @@ -4,7 +4,7 @@ metadata: name: my-cluster spec: kafka: - version: 3.6.0 + version: 3.6.1 replicas: 3 listeners: - name: plain diff --git a/tests/files/yaml/kafka-ephemeral_name_updated.yaml b/tests/files/yaml/kafka-ephemeral_name_updated.yaml index b84eaf6..c18664b 100644 --- a/tests/files/yaml/kafka-ephemeral_name_updated.yaml +++ b/tests/files/yaml/kafka-ephemeral_name_updated.yaml @@ -26,7 +26,7 @@ spec: replicas: 3 storage: type: ephemeral - version: 3.6.0 + version: 3.6.1 zookeeper: replicas: 3 storage: diff --git a/tests/files/yaml/kafka-ephemeral_two_additional_configs_deleted.yaml b/tests/files/yaml/kafka-ephemeral_two_additional_configs_deleted.yaml index 80a9b36..d568874 100644 --- a/tests/files/yaml/kafka-ephemeral_two_additional_configs_deleted.yaml +++ b/tests/files/yaml/kafka-ephemeral_two_additional_configs_deleted.yaml @@ -26,7 +26,7 @@ spec: replicas: 3 storage: type: ephemeral - version: 3.6.0 + version: 3.6.1 zookeeper: replicas: 3 storage: diff --git a/tests/files/yaml/kafka-ephemeral_with_one_additional_config.yaml b/tests/files/yaml/kafka-ephemeral_with_one_additional_config.yaml index 8fa32ce..e2e794e 100644 --- a/tests/files/yaml/kafka-ephemeral_with_one_additional_config.yaml +++ b/tests/files/yaml/kafka-ephemeral_with_one_additional_config.yaml @@ -27,7 +27,7 @@ spec: replicas: 3 storage: type: ephemeral - version: 3.6.0 + version: 3.6.1 zookeeper: replicas: 3 storage: diff --git a/tests/files/yaml/kafka-ephemeral_with_one_replica.yaml b/tests/files/yaml/kafka-ephemeral_with_one_replica.yaml index 8f31383..1cd552f 100644 --- a/tests/files/yaml/kafka-ephemeral_with_one_replica.yaml +++ b/tests/files/yaml/kafka-ephemeral_with_one_replica.yaml @@ -26,7 +26,7 @@ spec: replicas: 1 storage: type: ephemeral - version: 3.6.0 + version: 3.6.1 zookeeper: replicas: 3 storage: diff --git a/tests/files/yaml/kafka-ephemeral_with_one_replica_one_zk_replica.yaml b/tests/files/yaml/kafka-ephemeral_with_one_replica_one_zk_replica.yaml index 41fc357..c476495 100644 --- a/tests/files/yaml/kafka-ephemeral_with_one_replica_one_zk_replica.yaml +++ b/tests/files/yaml/kafka-ephemeral_with_one_replica_one_zk_replica.yaml @@ -26,7 +26,7 @@ spec: replicas: 1 storage: type: ephemeral - version: 3.6.0 + version: 3.6.1 zookeeper: replicas: 1 storage: diff --git a/tests/files/yaml/kafka-ephemeral_with_two_additional_configs.yaml b/tests/files/yaml/kafka-ephemeral_with_two_additional_configs.yaml index 08d93cb..44490e9 100644 --- a/tests/files/yaml/kafka-ephemeral_with_two_additional_configs.yaml +++ b/tests/files/yaml/kafka-ephemeral_with_two_additional_configs.yaml @@ -28,7 +28,7 @@ spec: replicas: 3 storage: type: ephemeral - version: 3.6.0 + version: 3.6.1 zookeeper: replicas: 3 storage: diff --git a/tests/files/yaml/kafka-ephemeral_with_two_replicas.yaml b/tests/files/yaml/kafka-ephemeral_with_two_replicas.yaml index 8244925..75faa27 100644 --- a/tests/files/yaml/kafka-ephemeral_with_two_replicas.yaml +++ b/tests/files/yaml/kafka-ephemeral_with_two_replicas.yaml @@ -26,7 +26,7 @@ spec: replicas: 2 storage: type: ephemeral - version: 3.6.0 + version: 3.6.1 zookeeper: replicas: 3 storage: