feat!: migration to cmak-docker for cmak image

.dockerignore

@@ -1,9 +1,11 @@
 venv
+.venv
 *.json
 *.yaml
 .github
 .git
-*.adoc
+*.md
 .editorconfig
 .gitignore
 .helmignore
+justfile

.editorconfig

@@ -14,8 +14,3 @@ indent_size = 4
 [*.md]
 max_line_length = 120
 
-[Makefile]
-indent_style = tab
-indent_size = 4
-
-

.github/workflows/ci.yaml → .github/workflows/build.yaml

@@ -1,4 +1,4 @@
-name: Continous integration
+name: Build
 on:
   pull_request:
     branches:
@@ -23,7 +23,7 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
       - uses: volesen/setup-skaffold@v1.1
         with:
-          version: 'v1.35.0'
+          version: v1.38.0
       - uses: extractions/setup-just@v1
       - run: |
           just test
@@ -32,7 +32,6 @@ jobs:
           skipClusterCreation: true
       - run: |
           just k3d
-          just up
       - run: |
           just test-e2e
 

.github/workflows/release.yaml

@@ -1,8 +1,8 @@
-name: Release
+name: Publish release
 on:
   workflow_dispatch
 jobs:
-  build_docker_job:
+  rel_job:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
@@ -13,13 +13,13 @@ jobs:
         with:
           ref: gh-pages
           path: gh-pages
+      - uses: volesen/setup-skaffold@v1.1
+        with:
+          version: v1.38.0
       - uses: docker/login-action@v1
         with:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      - uses: volesen/setup-skaffold@v1.1
-        with:
-          version: 'v1.35.0'
       - run: |
           npm ci
           npx semantic-release

.gitignore

@@ -5,3 +5,5 @@ node_modules
 .idea
 values-dev.yaml
 __pycache__
+.venv
+

.helmignore

@@ -23,13 +23,13 @@
 .vscode/
 
 venv
+.venv
 *.tgz
 .github
 *.py
-*.adoc
 *.txt
 .release-it.json
-*.adoc
+*.md
 skaffold.yaml
 values-lint.yaml
 node_modules

.releaserc.yaml

@@ -1,12 +1,14 @@
 branches:
   - master
+
 tagFormat: "${version}"
+
+preset: "conventionalcommits"
+
 plugins:
-  - '@semantic-release/commit-analyzer'
-  - 'semantic-release-commitlint'
-  -
-    - "@semantic-release/release-notes-generator"
-    - preset: "conventionalcommits"
+  - "@semantic-release/commit-analyzer"
+  - "semantic-release-commitlint"
+  - "@semantic-release/release-notes-generator"
   -
     - "@semantic-release/git"
     - assets: []

Chart.yaml

@@ -4,13 +4,13 @@ description: Manage and vizualize Kafka clusters with CMAK (prev. Kafka Manager)
 icon: https://www.vectorlogo.zone/logos/kubernetes/kubernetes-icon.svg
 type: application
 version: 0.0.0 # actual chart version is managed by git tags
-appVersion: 3.0.0.5-7e7a22e
+appVersion: 0.1.1
 
 home: https://github.com/eshepelyuk/cmak-operator
 
 sources:
   - https://github.com/yahoo/CMAK
-  - https://github.com/hleb-albau/kafka-manager-docker
+  - https://github.com/eshepelyuk/cmak-docker
 
 maintainers:
   - name: Ievgenii Shepeliuk

README.md

@@ -17,16 +17,14 @@ that allows to install and configure CMAK in K8s cluster.
 CMAK operator comprises following components:
 
 * [CMAK](https://github.com/yahoo/CMAK/),
-  powered by [Docker image](https://hub.docker.com/r/hlebalbau/kafka-manager/)
-  from [@hleb-albau](https://github.com/hleb-albau/kafka-manager-docker).
+  powered by [CMAK docker](https://github.com/eshepelyuk/cmak-docker).
 * [Apache ZooKeeper](https://zookeeper.apache.org/),
   powered by [official Docker image](https://hub.docker.com/_/zookeeper/).
 * Custom [cmak2zk tool](https://hub.docker.com/repository/docker/eshepelyuk/cmak2zk),
   used to configure Kafka clusters in CMAK from YAML files.
 
 ## Installation
 
-
 It's recommended to install CMAK operator into a dedicated namespace.
 
 1. Add Helm repository

cmak2zk/examples/docker-compose-cmak2zk.yaml

@@ -7,7 +7,7 @@ services:
       ZOO_SERVERS: server.1=0.0.0.0:2888:3888;2181
 
   cmak:
-    image: hlebalbau/kafka-manager:stable
+    image: ghcr.io/eshepelyuk/cmak-3.0.0.5:latest
     restart: always
     ports:
       - "9000:9000"

justfile

@@ -1,31 +1,57 @@
-@test: test-lint test-unit
+export E2E_TEST := "default"
 
-@test-e2e:
-  helm test cmak-operator --logs
+default:
+    @just --list
 
-@test-lint:
+test-lint:
 	./test/linter/test.sh
 	echo
 	echo =======================
 	echo = LINTER TESTS PASSED =
 	echo =======================
 
-@test-unit:
+test-unit:
 	helm plugin ls | grep unittest || helm plugin install https://github.com/quintush/helm-unittest
 	helm unittest -f 'test/unit/*.yaml' -3 .
 	echo
 	echo =====================
 	echo = UNIT TESTS PASSED =
 	echo =====================
 
-@_skaffold-ctx:
-    skaffold config set default-repo localhost:5000
+test: test-lint test-unit
+
+_skaffold-ctx:
+  skaffold config set default-repo localhost:5000
 
 # (re) create local k8s cluster using k3d
-@k3d: && _skaffold-ctx
-    k3d cluster create --config ./test/e2e/k3d.yaml
-    kubectl apply -f test/e2e/kafka.yaml
+k3d: && _skaffold-ctx
+  k3d cluster rm cmak-operator || true
+  k3d cluster create --config ./test/e2e/k3d.yaml
+  sleep 15
+
+# install into local k8s
+up: _skaffold-ctx down
+  skaffold run
+
+# remove from local k8s
+down:
+  skaffold delete || true
+
+_chk-py:
+  #!/usr/bin/env bash
+  set -euxo pipefail
+  if [ ! -d .venv ]; then
+    python3 -mvenv .venv
+    pip3 install -r test/e2e/requirements.txt
+  fi
+
+# run only e2e test script
+test-e2e-sh: _chk-py
+  #!/usr/bin/env bash
+  set -euxo pipefail
+  source .venv/bin/activate
+  pytest --capture=tee-sys test/e2e/{{E2E_TEST}}/test.py
+
+# run single e2e test
+test-e2e: up test-e2e-sh
 
-# deploy chart to local k8s
-@up: _skaffold-ctx
-    skaffold run