Bump operator newest v2.3.0-24.3.1 version

.github/workflows/pull_requests.yaml

@@ -54,35 +54,35 @@ jobs:
               - 'charts/redpanda/ci/*'
               - 'charts/redpanda/files/*'
               - 'charts/redpanda/templates/**'
-              - 'charts/redpanda/(.helmignore|values.schema.json|Chart.yaml)'
+              - 'charts/redpanda/(.helmignore|values.schema.json|Chart.yaml|values.yaml)'
             charts-console:
               - 'charts/console/ci/*'
               - 'charts/console/files/*'
               - 'charts/console/templates/**'
-              - 'charts/console/(.helmignore|values.schema.json|Chart.yaml)'
+              - 'charts/console/(.helmignore|values.schema.json|Chart.yaml|values.yaml)'
             charts-connectors:
               - '.github/workflows/test_connectors.yaml'
               - 'charts/connectors/ci/*'
               - 'charts/connectors/files/*'
               - 'charts/connectors/templates/**'
-              - 'charts/connectors/(.helmignore|values.schema.json|Chart.yaml)'
+              - 'charts/connectors/(.helmignore|values.schema.json|Chart.yaml|values.yaml)'
             charts-kminion:
               - '.github/workflows/test_kminion.yaml'
               - 'charts/kminion/ci/*'
               - 'charts/kminion/files/*'
               - 'charts/kminion/templates/**'
-              - 'charts/kminion/(.helmignore|values.schema.json|Chart.yaml)'
+              - 'charts/kminion/(.helmignore|values.schema.json|Chart.yaml|values.yaml)'
             charts-operator:
               - '.github/workflows/test_operator.yaml'
               - 'charts/operator/ci/*'
               - 'charts/operator/files/*'
               - 'charts/operator/templates/**'
-              - 'charts/operator/(.helmignore|values.schema.json|Chart.yaml)'
+              - 'charts/operator/(.helmignore|values.schema.json|Chart.yaml|values.yaml)'
             charts-connect:
               - 'charts/connect/ci/*'
               - 'charts/connect/files/*'
               - 'charts/connect/templates/**'
-              - 'charts/connect/(.helmignore|values.schema.json|Chart.yaml)'
+              - 'charts/connect/(.helmignore|values.schema.json|Chart.yaml|values.yaml)'
             go-code:
               - '.github/workflows/pull_requests.yaml'
               - '**/testdata/**'

CHANGELOG.md

@@ -8,6 +8,14 @@
 #### Fixed
 #### Removed
 
+
+### [5.9.12](https://github.com/redpanda-data/helm-charts/releases/tag/redpanda-5.9.12) - 2024-11-22
+#### Added
+#### Changed
+* Chart version to update operator side-car container tag
+#### Fixed
+#### Removed
+
 ### [5.9.11](https://github.com/redpanda-data/helm-charts/releases/tag/redpanda-5.9.11) - 2024-11-21
 #### Added
 * Ability to generate Redpanda with Connector resources from go code
@@ -240,6 +248,15 @@
 #### Fixed
 #### Removed
 
+### [0.4.33](https://github.com/redpanda-data/helm-charts/releases/tag/operator-0.4.33) - 2024-11-22
+#### Added
+* Missing permissions for ClusterRoles, ClusterRoleBindings, Horizontal Pod Autoscaler, cert-manager/Certificate,
+  cert-manager/Issuer, redpanda/Users, and redpanda/Schemas.
+#### Changed
+* Application version for newly operator release v2.3.0-24.3.1
+#### Fixed
+#### Removed
+
 ### [0.4.32](https://github.com/redpanda-data/helm-charts/releases/tag/operator-0.4.32) - 2024-10-31
 #### Added
 * Strategic merge of Pod volumes

charts/operator/Chart.yaml

@@ -6,11 +6,11 @@ type: application
 # The chart version and the app version are not the same and will not track
 # together. The chart version is a semver representation of changes to this
 # chart.
-version: 0.4.32
+version: 0.4.33
 
 # This is the default version of the operator being deployed.
 # ** NOTE for maintainers: please enssure the artifacthub image annotation is updated before merging
-appVersion: v2.2.5-24.2.7
+appVersion: v2.3.0-24.3.1
 
 kubeVersion: ">= 1.25.0-0"
 
@@ -36,11 +36,11 @@ annotations:
       url: https://helm.sh/docs/intro/install/
   artifacthub.io/images: |
     - name: redpanda-operator
-      image: docker.redpanda.com/redpandadata/redpanda-operator:v2.2.5-24.2.7
+      image: docker.redpanda.com/redpandadata/redpanda-operator:v2.3.0-24.3.1
     - name: configurator
-      image: docker.redpanda.com/redpandadata/configurator:v2.2.5-24.2.7
+      image: docker.redpanda.com/redpandadata/configurator:v2.3.0-24.3.1
     - name: redpanda
-      image: docker.redpanda.com/redpandadata/redpanda:v24.2.7
+      image: docker.redpanda.com/redpandadata/redpanda:v24.2.10
     - name: kube-rbac-proxy
       image: gcr.io/kubebuilder/kube-rbac-proxy:v0.14.0
   artifacthub.io/crds: |

charts/operator/README.md

@@ -3,7 +3,7 @@
 description: Find the default values and descriptions of settings in the Redpanda Operator Helm chart.
 ---
 
-![Version: 0.4.32](https://img.shields.io/badge/Version-0.4.32-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.2.5-24.2.7](https://img.shields.io/badge/AppVersion-v2.2.5--24.2.7-informational?style=flat-square)
+![Version: 0.4.33](https://img.shields.io/badge/Version-0.4.33-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.3.0-24.3.1](https://img.shields.io/badge/AppVersion-v2.3.0--24.3.1-informational?style=flat-square)
 
 This page describes the official Redpanda Operator Helm Chart. In particular, this page describes the contents of the chart’s [`values.yaml` file](https://github.com/redpanda-data/helm-charts/blob/main/charts/operator/values.yaml). Each of the settings is listed and described on this page, along with any default values.
 

charts/operator/chart_test.go

@@ -1,28 +1,103 @@
 package operator
 
 import (
+	"bytes"
 	"encoding/json"
 	"fmt"
+	"log"
 	"os"
+	"os/exec"
 	"regexp"
 	"slices"
 	"strconv"
 	"testing"
 
 	fuzz "github.com/google/gofuzz"
 	"github.com/redpanda-data/helm-charts/pkg/helm"
+	"github.com/redpanda-data/helm-charts/pkg/kube"
 	"github.com/redpanda-data/helm-charts/pkg/testutil"
 	"github.com/santhosh-tekuri/jsonschema/v5"
+	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/tools/txtar"
 	corev1 "k8s.io/api/core/v1"
+	rbacv1 "k8s.io/api/rbac/v1"
+	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/utils/ptr"
+	"sigs.k8s.io/kustomize/api/konfig"
+	"sigs.k8s.io/kustomize/kustomize/v5/commands/build"
+	"sigs.k8s.io/kustomize/kyaml/filesys"
 	"sigs.k8s.io/yaml"
 )
 
+func TestMain(m *testing.M) {
+	// Chart deps are kept within ./charts as a tgz archive, which is git
+	// ignored. Helm dep build will ensure that ./charts is in sync with
+	// Chart.lock, which is tracked by git.
+	// This is performed in TestMain as there may be many tests that run the
+	// redpanda helm chart.
+	out, err := exec.Command("helm", "repo", "add", "prometheus", "https://prometheus-community.github.io/helm-charts").CombinedOutput()
+	if err != nil {
+		log.Fatalf("failed to run helm repo add: %s", out)
+	}
+
+	out, err = exec.Command("helm", "dep", "build", ".").CombinedOutput()
+	if err != nil {
+		log.Fatalf("failed to run helm dep build: %s", out)
+	}
+
+	os.Exit(m.Run())
+}
+
+func TestHelmKustomizeEquivalence(t *testing.T) {
+	ctx := testutil.Context(t)
+	client, err := helm.New(helm.Options{ConfigHome: testutil.TempDir(t)})
+	require.NoError(t, err)
+
+	kustomization, err := os.ReadFile("testdata/kustomization.yaml")
+	require.NoError(t, err)
+	require.Containsf(t, string(kustomization), ChartMeta().AppVersion, "kustomization.yaml should reference the current appVersion: %s", chartMeta.AppVersion)
+
+	values := PartialValues{FullnameOverride: ptr.To("redpanda"), RBAC: &PartialRBAC{CreateAdditionalControllerCRs: ptr.To(true)}}
+
+	rendered, err := client.Template(ctx, ".", helm.TemplateOptions{
+		Name:      "redpanda",
+		Namespace: "",
+		Values:    values,
+	})
+	require.NoError(t, err)
+
+	fSys := filesys.MakeFsOnDisk()
+	buffy := new(bytes.Buffer)
+	cmd := build.NewCmdBuild(
+		fSys, build.MakeHelp(konfig.ProgramName, "build"), buffy)
+	require.NoError(t, cmd.RunE(cmd, []string{"testdata"}))
+
+	helmObjs, err := kube.DecodeYAML(rendered, Scheme)
+	require.NoError(t, err)
+
+	require.NoError(t, apiextensionsv1.AddToScheme(Scheme))
+	kustomizeObjs, err := kube.DecodeYAML(buffy.Bytes(), Scheme)
+	require.NoError(t, err)
+
+	helmClusterRoleRules, helmRoleRules := ExtractRules(helmObjs)
+	kClusterRoleRules, kRoleRules := ExtractRules(kustomizeObjs)
+
+	assert.JSONEq(t, jsonStr(helmRoleRules), jsonStr(kRoleRules), "difference in Roles\n--- Helm / Missing from Kustomize\n+++ Kustomize / Missing from Helm")
+	assert.JSONEq(t, jsonStr(helmClusterRoleRules), jsonStr(kClusterRoleRules), "difference in ClusterRoles\n--- Helm / Missing from Kustomize\n+++ Kustomize / Missing from Helm")
+}
+
+func jsonStr(in any) string {
+	out, err := json.Marshal(in)
+	if err != nil {
+		panic(err)
+	}
+	return string(out)
+}
+
 // TestValues asserts that the chart's values.yaml file can be losslessly
 // loaded into our type [Values] struct.
 // NB: values.yaml should round trip through [Values], not [PartialValues], as
@@ -48,12 +123,6 @@ func TestTemplate(t *testing.T) {
 	client, err := helm.New(helm.Options{ConfigHome: testutil.TempDir(t)})
 	require.NoError(t, err)
 
-	// Chart deps are kept within ./charts as a tgz archive, which is git
-	// ignored. Helm dep build will ensure that ./charts is in sync with
-	// Chart.lock, which is tracked by git.
-	require.NoError(t, client.RepoAdd(ctx, "prometheus", "https://prometheus-community.github.io/helm-charts"))
-	require.NoError(t, client.DependencyBuild(ctx, "."), "failed to refresh helm dependencies")
-
 	casesArchive, err := txtar.ParseFile("testdata/template-cases.txtar")
 	require.NoError(t, err)
 
@@ -222,3 +291,37 @@ func makeSureTagIsNotEmptyString(values PartialValues, fuzzer *fuzz.Fuzzer) {
 		}
 	}
 }
+
+func CalculateRoleRules(rules []rbacv1.PolicyRule) map[string]map[string]struct{} {
+	flattened := map[string]map[string]struct{}{}
+	for _, rule := range rules {
+		for _, api := range rule.APIGroups {
+			for _, res := range rule.Resources {
+				key := fmt.Sprintf("%s#%s", api, res)
+
+				if _, ok := flattened[key]; !ok {
+					flattened[key] = map[string]struct{}{}
+				}
+
+				for _, verb := range rule.Verbs {
+					flattened[key][verb] = struct{}{}
+				}
+			}
+		}
+	}
+	return flattened
+}
+
+func ExtractRules(objs []kube.Object) (map[string]map[string]struct{}, map[string]map[string]struct{}) {
+	var rules []rbacv1.PolicyRule
+	var clusterRules []rbacv1.PolicyRule
+	for _, o := range objs {
+		switch obj := o.(type) {
+		case *rbacv1.Role:
+			rules = append(rules, obj.Rules...)
+		case *rbacv1.ClusterRole:
+			clusterRules = append(clusterRules, obj.Rules...)
+		}
+	}
+	return CalculateRoleRules(clusterRules), CalculateRoleRules(rules)
+}