percona
diff --git a/‎.github/workflows/psmdb-operator-crd-sync-check.yaml‎
Lines changed: 85 additions & 0 deletions b/‎.github/workflows/psmdb-operator-crd-sync-check.yaml‎
Lines changed: 85 additions & 0 deletions
diff --git a/‎.github/workflows/test.yaml‎
Lines changed: 15 additions & 1 deletion b/‎.github/workflows/test.yaml‎
Lines changed: 15 additions & 1 deletion
diff --git a/‎charts/psmdb-db/Chart.yaml‎
Lines changed: 4 additions & 2 deletions b/‎charts/psmdb-db/Chart.yaml‎
Lines changed: 4 additions & 2 deletions
@@ -0,0 +1,85 @@
+name: PSMDB Operator CRD Sync Check
+
+on:
+  pull_request:
+    paths:
+      - 'charts/psmdb-operator/**'
+      - 'charts/psmdb-operator-crds/**'
+
+jobs:
+  check-crd-sync:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check version sync
+        run: |
+          set -e
+          
+          echo "Checking if chart versions are in sync..."
+          echo ""
+          
+          # Extract versions - note: psmdb-operator-crds chart version should match operator appVersion, not chart version
+          # This rule applies ONLY to psmdb-operator-crds, not to other charts (e.g., psmdb-db can have independent version)
+          OPERATOR_APP_VERSION=$(grep '^appVersion:' charts/psmdb-operator/Chart.yaml | awk '{print $2}' | tr -d '"')
+          OPERATOR_CHART_VERSION=$(grep '^version:' charts/psmdb-operator/Chart.yaml | awk '{print $2}' | tr -d '"')
+          CRD_VERSION=$(grep '^version:' charts/psmdb-operator-crds/Chart.yaml | awk '{print $2}' | tr -d '"')
+          CRD_APP_VERSION=$(grep '^appVersion:' charts/psmdb-operator-crds/Chart.yaml | awk '{print $2}' | tr -d '"')
+         
+          echo "Operator chart:"
+          echo "  version: $OPERATOR_CHART_VERSION"
+          echo "  appVersion: $OPERATOR_APP_VERSION"
+          echo "psmdb-operator-crds chart:"
+          echo "  version: $CRD_VERSION"
+          echo "  appVersion: $CRD_APP_VERSION"
+          echo "Dependency version: $DEPENDENCY_VERSION"
+          echo ""
+          
+          VERSION_SYNC=true
+          
+          # psmdb-operator-crds chart version should match operator appVersion (CRDs are tied to operator version, not chart version)
+          # Note: This rule applies ONLY to psmdb-operator-crds, other charts can have independent versions
+          if [ "$CRD_VERSION" != "$OPERATOR_APP_VERSION" ]; then
+            echo "✗ psmdb-operator-crds chart version ($CRD_VERSION) does not match operator appVersion ($OPERATOR_APP_VERSION)"
+            echo "  Note: psmdb-operator-crds chart version must match operator appVersion, not operator chart version"
+            VERSION_SYNC=false
+          fi
+          
+          # psmdb-operator-crds appVersion should match operator appVersion
+          if [ "$CRD_APP_VERSION" != "$OPERATOR_APP_VERSION" ]; then
+            echo "✗ psmdb-operator-crds chart appVersion ($CRD_APP_VERSION) does not match operator appVersion ($OPERATOR_APP_VERSION)"
+            VERSION_SYNC=false
+          fi
+          
+          
+          if [ "$VERSION_SYNC" = false ]; then
+            echo ""
+            echo "Version sync requirements for psmdb-operator-crds (this rule applies ONLY to CRD chart):"
+            echo "  - psmdb-operator-crds chart version = operator appVersion"
+            echo "  - psmdb-operator-crds chart appVersion = operator appVersion"
+            echo "  - Dependency version = psmdb-operator-crds chart version"
+            echo ""
+            echo "Note: Other charts (e.g., psmdb-db) can have independent chart versions."
+            echo ""
+            echo "Example:"
+            echo "  operator: appVersion=1.30.0, version=1.30.2"
+            echo "  psmdb-operator-crds: appVersion=1.30.0, version=1.30.0"
+            echo "  dependency: version=1.30.0"
+            exit 1
+          fi
+          
+          echo "✓ Chart versions are in sync"
+          echo ""
+
+      - name: Check CRD content sync
+        run: |
+          set -e
+          diff -u \
+            --label "templates (psmdb-operator-crds)" \
+            --label "crd.yaml (psmdb-operator)" \
+            <(sed '/^---$/d' charts/psmdb-operator-crds/templates/*.yaml) \
+            <(sed '/^---$/d' charts/psmdb-operator/crds/crd.yaml)
+
+          echo "✓ CRDs are in sync"
+
@@ -46,11 +46,14 @@ jobs:
         # Only build a kind cluster if there are chart changes to test.
         if: steps.list-changed.outputs.changed == 'true'
 
-      - name: Run chart-testing (install)
+      - name: Run db-chart-testing (install)
         run: |
           echo "Base branch is $GITHUB_BASE_REF"
           excluded_charts=("everest")
+          # Exclude -operator-crds; they are installed in the next step with --take-ownership
+          while IFS= read -r crd; do [[ -n "$crd" ]] && excluded_charts+=("$crd"); done <<< "$(ct list-changed --config .github/ct.yaml | sed 's:^charts/::' | grep '\-operator-crds$' || true)"
           OPERATOR_INSTALL=$(ct list-changed --config .github/ct.yaml | sed -E 's:charts/::' | awk '/(-db|-operator)$/ { sub(/-db$/, "-operator"); print }' | sort -u)
+          echo "The charts to install: $OPERATOR_INSTALL"
 
           if [ -n "$OPERATOR_INSTALL" ]; then
             for operator in $OPERATOR_INSTALL; do
@@ -72,6 +75,7 @@ jobs:
                 fi
                 echo "${HELM_ARGS[@]}"
               fi
+              echo "Installing $operator with Helm args: ${HELM_ARGS[@]}"
               helm install --namespace default $operator charts/$operator/. --wait --debug "${HELM_ARGS[@]}"
               excluded_charts+=($operator)
             done
@@ -82,6 +86,16 @@ jobs:
           if [ -n "$OPERATOR_INSTALL" ]; then
             for operator in $OPERATOR_INSTALL; do helm uninstall --namespace default $operator; done
           fi
+      
+      - name: Run crd-chart-testing (install)
+        run: |
+          CRD_INSTALL=$(ct list-changed --config .github/ct.yaml | sed 's:^charts/::' | grep '\-operator-crds$')
+          if [ -n "$CRD_INSTALL" ]; then
+            for crd in $CRD_INSTALL; do 
+              helm install --namespace default $crd charts/$crd/. --take-ownership
+              helm uninstall --namespace default $crd
+            done
+          fi
 
       - name: Build chart package
         run: |
 
@@ -1,13 +1,15 @@
 apiVersion: v2
-appVersion: "1.21.2"
+appVersion: "1.22.0"
 description: A Helm chart for installing Percona Server MongoDB Cluster Databases using the PSMDB Operator.
 name: psmdb-db
 home: https://www.percona.com/doc/kubernetes-operator-for-psmongodb/index.html
-version: 1.21.2
+version: 1.22.0
 maintainers:
   - name: nmarukovich
     email: natalia.marukovich@percona.com
   - name: jvpasinatto
     email: julio.pasinatto@percona.com
   - name: eleo007
     email: eleonora.zinchenko@percona.com
+  - name: valmiranogueira
+    email: valmira.nogueira@percona.com