Merge branch 'mariadb-operator:main' into main

Author: Funk66

.github/ISSUE_TEMPLATE/bug.md

@@ -3,7 +3,7 @@ name: Bug
 about: Create a bug report to help us improve
 title: "[Bug] "
 labels: bug
-assignees: 
+assignees: ''
 
 ---
 
@@ -47,10 +47,11 @@ kubectl get events --field-selector involvedObject.name=<restore-resource-name>
 
 **Environment details**:
 - Kubernetes version: [Version number]
-- Kubernetes distribution: [Vanilla, EKS, GKE, AKS, Rancher, OpenShift, k3s, KIND...]
-- mariadb-operator version: [Version number]
-- Galera data-plane version (init and agent): [Version number]
-- Install method: [helm, OLM, or static manifests]
+- Kubernetes distribution: [Vanilla Kubernetes, OpenShift, EKS, GKE, AKS, Rancher, k3s, KIND...]
+- MariaDB Operator version: [Version number]
+- MariaDB Server version: [Version number]
+- MaxScale version: [Version number]
+- Install method: [Helm, OLM]
 
 **Additional context**
 <!--Add any other context  here.-->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,7 +3,7 @@ name: Feature request
 about: Suggest an idea for this project
 title: "[Feature]"
 labels: feature
-assignees:
+assignees: ''
 
 ---
 
@@ -18,10 +18,11 @@ assignees:
 
 **Environment details**:
 - Kubernetes version: [Version number]
-- Kubernetes distribution: [Vanilla, EKS, GKE, AKS, Rancher, OpenShift, k3s, KIND...]
-- mariadb-operator version: [Version number]
-- Install method: [helm, OLM, or static manifests]
-- Install flavor: [minimal, recommended, or custom]
+- Kubernetes distribution: [Vanilla Kubernetes, OpenShift, EKS, GKE, AKS, Rancher, k3s, KIND...]
+- MariaDB Operator version: [Version number]
+- MariaDB Server version: [Version number]
+- MaxScale version: [Version number]
+- Install method: [Helm, OLM]
 
 **Additional context**
 <!--Add any other context  here.-->

.github/workflows/ci.yml

@@ -24,20 +24,6 @@ jobs:
           paths_ignore: '["*.md","**.md.gotmpl","examples/**"]'
           concurrent_skipping: false
 
-  detect-ent:
-    name: Detect enterprise
-    runs-on: ubuntu-latest
-    outputs:
-      ent: ${{ steps.ent.outputs.ent }}
-    steps:
-      - name: Detect enterprise
-        id: ent
-        env: 
-          DOCKERHUB_USER: ${{ secrets.DOCKERHUB_USER }}
-        if: "${{ env.DOCKERHUB_USER != '' }}"
-        run: |
-          echo "ent='true'" >> $GITHUB_OUTPUT
-
   lint:
     name: Lint
     runs-on: ubuntu-latest
@@ -76,15 +62,9 @@ jobs:
       - name: Build
         run: make build
 
-      - name: Build Enterprise
-        run: make build-ent
-
       - name: Build Docker
         run: make docker-build
 
-      - name: Build Enterprise Docker
-        run: make docker-build-ent
-
   unit-test:
     name: Unit tests
     runs-on: ubuntu-latest
@@ -125,67 +105,12 @@ jobs:
           make cluster
           make install
           make install-minio
+          make install-cert-manager
           make net
 
       - name: Test
         run: make test-int
 
-  integration-test-ent:
-    name: Integration tests enterprise
-    runs-on: ubuntu-latest
-    needs: 
-      - detect-noop
-      - detect-ent
-    if: ${{ needs.detect-noop.outputs.noop != 'true' && needs.detect-ent.outputs.ent != '' }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: "go.mod"
-          cache: true
-
-      - name: Login Docker MariaDB
-        uses: docker/login-action@v3
-        with:
-          registry: docker-registry.mariadb.com
-          username: ${{ secrets.DOCKER_MARIADB_USER }}
-          password: ${{ secrets.DOCKER_MARIADB_PASSWORD }}
-
-      - name: Cluster
-        run: |
-          make cluster
-          make registry
-          make install-ent
-          make install-minio
-          make net
-
-      - name: Test
-        run: make test-int-ent
-
-  olm:
-    name: OLM
-    runs-on: ubuntu-latest
-    needs: detect-noop
-    if: ${{ needs.detect-noop.outputs.noop != 'true' }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Validate
-        run: make bundle-validate
-
-      - name: Build image
-        run: make bundle-build
-
-      - name: Cluster
-        run: make cluster
-
-      - name: Scorecard
-        run: make bundle-scorecard
-
   artifacts:
     name: Artifacts
     runs-on: ubuntu-latest
@@ -198,12 +123,12 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Generate
-        run: make generate
+        run: make gen
 
       - name: Check diff
         uses: mmontes11/[email protected]
         with:
-          message: Generated artifacts are not up to date. Run 'make generate' and commit the changes.
+          message: Generated artifacts are not up to date. Run 'make gen' and commit the changes.
 
       - name: Verify CRD size
         shell: bash
@@ -217,23 +142,4 @@ jobs:
           if [ "$crd_size" -ge "$max_size" ]; then
             echo "Error: CRDs exceed 900KB (current size: $((crd_size / 1024)) KB)"
             exit 1
-          fi
-
-  licenses:
-    name: Licenses
-    runs-on: ubuntu-latest
-    needs: detect-noop
-    if: ${{ needs.detect-noop.outputs.noop != 'true' }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Generate
-        run: make licenses
-
-      - name: Check licenses
-        run: |
-          if [ ! -d "licenses" ] || [ ! -n "$(ls -A licenses)" ]; then
-            echo "Error: No licenses generated"
-            exit 1
           fi