changes from upstream

.github/workflows/ci-release-kaap-chart.yaml

@@ -31,10 +31,11 @@ jobs:
           helm package "$chart" --destination .cr-release-packages
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.5.0
+        uses: helm/chart-releaser-action@3e001cb8c68933439c7e721650f20a07a1a5c61e
         with:
           charts_dir: helm/kaap
           skip_packaging: true
+          skip_existing: true
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
@@ -49,6 +50,5 @@ jobs:
           mkdir -p kaap
           mv /tmp/README.md kaap/README.md 
           git add kaap/README.md
-          git commit -m "kaap/README.md"
-          git pull --rebase origin gh-pages
-          git push origin gh-pages
+          # Commit only if changes exist; push only if commit succeeds
+          git commit -m "kaap/README.md" && git pull --rebase origin gh-pages && git push origin gh-pages || echo "Nothing to push"

.github/workflows/ci-release-kaap-stack-chart.yaml

@@ -31,10 +31,11 @@ jobs:
           helm package "$chart" --destination .cr-release-packages
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.5.0
+        uses: helm/chart-releaser-action@3e001cb8c68933439c7e721650f20a07a1a5c61e
         with:
           charts_dir: helm/kaap-stack
           skip_packaging: true
+          skip_existing: true
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
@@ -51,4 +52,4 @@ jobs:
           git add kaap-stack/README.md
           git commit -m "kaap-stack/README.md"
           git pull --rebase origin gh-pages
-          git push origin gh-pages
+          git push origin gh-pages

.github/workflows/ci-release-operator.yaml

@@ -4,6 +4,12 @@ on:
   push:
     tags:
       - 'operator-*'
+  workflow_dispatch: # Manual Trigger
+    inputs:
+      docker_tag:
+        description: 'Docker tag to use'
+        required: true
+        default: 'dev'
 
 jobs:
   release-operator:
@@ -13,11 +19,11 @@ jobs:
       - name: Check out the repo
         uses: actions/checkout@v3
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -32,18 +38,37 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and push
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Get the tag & Build Operator
         run: |
-            mvn clean install -DskipTests -Pskip-crds
-            docker_tag=${GITHUB_REF/refs\/tags\/operator-/}
-
-            docker tag datastax/kaap:latest-dev datastax/kaap:$docker_tag
-            docker tag datastax/kaap:latest-dev datastax/kaap:latest
-            docker push datastax/kaap:$docker_tag
-            docker push datastax/kaap:latest
+          OP_TAG=${GITHUB_REF/refs\/tags\/operator-/}
+          MANUAL_WORKFLOW_TAG=${{ inputs.docker_tag }}
+          if [[ $MANUAL_WORKFLOW_TAG != "" ]]; then
+            TAGS="docker.io/datastax/kaap:$MANUAL_WORKFLOW_TAG"
+          else
+            TAGS="docker.io/datastax/kaap:$OP_TAG,docker.io/datastax/kaap:latest"
+          fi
+          echo "TAGS=${TAGS}" >> "$GITHUB_ENV"
+          echo "Using tags $TAGS"
+
+          mvn clean install -DskipTests -Pskip-crds -Pskip-docker
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          context: operator
+          tags: ${{ env.TAGS }}
 
       - uses: ncipollo/release-action@v1
+        if: ${{ inputs.docker_tag == '' }} # If not manual workflow
         with:
           artifacts: "migration-tool/target/kaap-migration-tool-*.jar,helm/kaap/crds/*.yml"
           token: ${{ secrets.GITHUB_TOKEN }}
-          generateReleaseNotes: true
+          generateReleaseNotes: true

.github/workflows/ci-sync-doc.yaml

@@ -7,7 +7,7 @@ on:
 jobs:
   sync-gh-pages-doc:
     name: Sync pages
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: checkout
         uses: actions/checkout@v3

.github/workflows/ci-test.yaml

@@ -7,17 +7,18 @@ on:
 jobs:
   build-and-unit-test:
     name: Build and test
-    runs-on: ubuntu-20.04
+    runs-on:
+      labels: kaap
     timeout-minutes: 60
     steps:
       - name: checkout
         uses: actions/checkout@v3
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Check license headers
         run: mvn license:check
@@ -42,7 +43,8 @@ jobs:
 
   integration-tests:
     name: Integration tests - ${{ matrix.name }}
-    runs-on: ubuntu-20.04
+    runs-on:
+      labels: kaap
     timeout-minutes: 60
     strategy:
       fail-fast: false
@@ -61,6 +63,10 @@ jobs:
             group: helm
             num_agents: 0
             setup_helm: "true"
+          - name: Helm (Cluster Scoped)
+            group: helm-cluster-scoped
+            num_agents: 0
+            setup_helm: "true"
           - name: Helm (TLS)
             group: helm-tls
             num_agents: 0
@@ -103,11 +109,11 @@ jobs:
           helm dependency build helm/kaap-stack
         if: ${{ matrix.setup_helm == 'true' }}
 
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
+      - name: Set up JDK
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
 
       - name: Setup ssh access to build runner VM
         if: ${{ github.event_name == 'pull_request' }}
@@ -127,7 +133,7 @@ jobs:
             -Dkaap.tests.env.existing.k3s.agents='${{ matrix.num_agents }}'
 
       - name: Upload Surefire reports
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         continue-on-error: true
         with:

README.md

@@ -40,7 +40,7 @@ Full documentation is available in the [DataStax Streaming Documentation](https:
 
 ## Install KAAP Operator
 
-This example installs only the KAAP operator.
+This example installs only the KAAP operator without a managed Pulsar cluster.
 See the KAAP Stack below to install KAAP with an operator, a Pulsar cluster, and the Prometheus monitoring stack.
 
 1. Install the DataStax KAAP Helm repository:
@@ -55,10 +55,11 @@ helm install kaap kaap/kaap
 Result:
 ```
 NAME: kaap
-LAST DEPLOYED: Wed Jun 28 11:37:45 2023
-NAMESPACE: pulsar-cluster
+LAST DEPLOYED: Wed Dec 17 12:11:51 2025
+NAMESPACE: default
 STATUS: deployed
 REVISION: 1
+DESCRIPTION: Install complete
 TEST SUITE: None
 ```
 3. Ensure the operator is up and running:
@@ -91,11 +92,16 @@ pulsarclusters.kaap.oss.datastax.com             2023-06-28T15:37:41Z
 zookeepers.kaap.oss.datastax.com                 2023-06-28T15:37:41Z
 ```
 
-For more, see the [DataStax Streaming Documentation](https://docs.datastax.com/en/streaming/kaap-operator/latest/index.html) or [this repo's GitHub Pages site](https://datastax.github.io/kaap/docs/).
+For more information, see the [DataStax Streaming Documentation](https://docs.datastax.com/en/streaming/kaap-operator/latest/index.html) or [this repo's GitHub Pages site](https://datastax.github.io/kaap/docs/).
+
+## Install KAAP Stack with a Pulsar cluster
+
+This example deploys a KAAP operator, and also deploys a minimally-sized Pulsar cluster for development testing.
 
-## Install KAAP Stack Operator with a Pulsar cluster
+> [!IMPORTANT]
+> If using a local Kubernetes environment like [kind](https://kind.sigs.k8s.io/) or [minikube](https://minikube.sigs.k8s.io/docs/) you will need to allocate at least 16 GB of memory to run the
+> example development cluster.
 
-This example deploys a KAAP stack operator, and also deploys a minimally-sized Pulsar cluster for development testing.
 
 1. Install the DataStax KAAP Helm repository:
 ```
@@ -104,15 +110,16 @@ helm repo update
 ```
 2. Install the KAAP Stack operator Helm chart with the custom `dev-cluster` values file:
 ```
-helm install pulsar kaap/kaap-stack --values helm/examples/dev-cluster/values.yaml
+helm install kaap-stack kaap/kaap-stack --values helm/examples/dev-cluster/values.yaml
 ```
 Result:
 ```
-NAME: pulsar
-LAST DEPLOYED: Thu Jun 29 14:30:20 2023
+NAME: kaap-stack
+LAST DEPLOYED: Wed Dec 17 12:25:16 2025
 NAMESPACE: default
 STATUS: deployed
 REVISION: 1
+DESCRIPTION: Install complete
 TEST SUITE: None
 ```
 3. Ensure the operator is up and running:
@@ -157,7 +164,7 @@ For more, see the [DataStax Streaming Documentation](https://docs.datastax.com/e
 
 To uninstall KAAP:
 ```
-helm delete kaap
+helm uninstall kaap
 ```
 Result:
 ```

RELEASE.md

@@ -5,8 +5,23 @@ The project contains 3 different and independents artifacts:
 2. KAAP Chart
 3. KAAP Stack Chart
 
-The releases process are independent.
+The releases process are independent. You can also do the release on a different branch and merge to main.
+(**PR based**).
+For reference, check [here.](https://github.com/datastax/kaap/pull/212)
 
+## Release Order Guidance
+This is not required to be followed if you are just releasing a new version for only one project.
+
+### operator -> kaap → kaap-stack
+To ensure `kaap-stack` is packaged with the latest `kaap` version and latest `operator` version.
+This applies **only when a new `kaap` or `operator` version is part of the release cycle**.
+
+This is also because `kaap-stack` uses a local dependency:
+```yaml
+repository: file://../kaap
+```
+
+A release is considered completed only when the PR is merged if we are doing a PR based approach.
 
 ## Operator image (datastax/kaap:latest)
 
@@ -25,18 +40,24 @@ This will create a new tag `operator-<version>`, bump the pom versions and push
 Run the following command:
 
 ```bash
-./release/release.sh kaap <version>
+./release/release.sh kaap-chart <version>
 ```
 
 This will create a new tag `kaap-<version>`, bump the chart version, creates a new Github release with the chart tarball and update the docs.
 
+**NOTE:** You have to **manually update the default operator version** in the values.yaml of KAAP if you need to change it.
+For reference, check [here.](https://github.com/datastax/kaap/pull/213/commits/ebc1bb38edeaf2164d6f2d7c1729ebfe8ed94db1)
 
 ## KAAP Stack Chart
 
 Run the following command:
 
 ```bash
-./release/release.sh kaap-stack <version>
+./release/release.sh kaap-stack-chart <version>
 ```
 
-This will create a new tag `kaap-stack-<version>`, bump the chart version, creates a new Github release with the chart tarball and update the docs.
+This will create a new tag `kaap-stack-<version>`, bump the chart version, creates a new Github release with the chart tarball and update the docs.
+
+**NOTE:** You have to **manually update the kaap version** if there is a major version change of KAAP in the KAAP-STACK 
+chart.yaml. Minor version changes get picked up because of the regex 0.4.x.
+For reference, check [here.](https://github.com/datastax/kaap/pull/213/commits/853d3135e5eb6bd25d373e5506e14640083b2c04)

dev/run-dev-mode.sh

@@ -15,5 +15,4 @@
 # limitations under the License.
 #
 
-kubectl apply -f helm/operator/crds --server-side
-mvn -pl operator quarkus:dev -Dquarkus.operator-sdk.crd.generate=false  -Dquarkus.operator-sdk.crd.apply=false
+mvn -pl operator quarkus:dev -Dquarkus.operator-sdk.crd.generate=false  -Dquarkus.operator-sdk.crd.apply=true