more version bumps

razvan · razvan · commit 3a6482eccc73 · 2026-06-19T15:58:13.000+02:00
diff --git a/docs/modules/opensearch/examples/getting_started/getting_started.sh b/docs/modules/opensearch/examples/getting_started/getting_started.sh
@@ -141,7 +141,7 @@ kubectl create secret generic opensearch-credentials \
 
 helm install opensearch-dashboards opensearch-dashboards \
     --repo https://opensearch-project.github.io/helm-charts \
-    --version 3.4.0 \
+    --version 3.6.0 \
     --values opensearch-dashboards-values.yaml \
     --wait
 # end::opensearch-dashboards[]
diff --git a/docs/modules/opensearch/examples/getting_started/getting_started.sh.j2 b/docs/modules/opensearch/examples/getting_started/getting_started.sh.j2
@@ -141,7 +141,7 @@ kubectl create secret generic opensearch-credentials \
 
 helm install opensearch-dashboards opensearch-dashboards \
     --repo https://opensearch-project.github.io/helm-charts \
-    --version 3.4.0 \
+    --version 3.6.0 \
     --values opensearch-dashboards-values.yaml \
     --wait
 # end::opensearch-dashboards[]
diff --git a/docs/modules/opensearch/examples/getting_started/opensearch-dashboards-values.yaml b/docs/modules/opensearch/examples/getting_started/opensearch-dashboards-values.yaml
@@ -1,7 +1,7 @@
 ---
 image:
   repository: oci.stackable.tech/sdp/opensearch-dashboards
-  tag: 3.4.0-stackable0.0.0-dev
+  tag: 3.6.0-stackable0.0.0-dev
 serviceAccount:
   create: false
   name: simple-opensearch-serviceaccount
diff --git a/docs/modules/opensearch/examples/getting_started/opensearch-dashboards-values.yaml.j2 b/docs/modules/opensearch/examples/getting_started/opensearch-dashboards-values.yaml.j2
@@ -1,7 +1,7 @@
 ---
 image:
   repository: oci.stackable.tech/sdp/opensearch-dashboards
-  tag: 3.4.0-stackable{{ versions.opensearch }}
+  tag: 3.6.0-stackable{{ versions.opensearch }}
 serviceAccount:
   create: false
   name: simple-opensearch-serviceaccount
diff --git a/docs/modules/opensearch/examples/getting_started/opensearch.yaml b/docs/modules/opensearch/examples/getting_started/opensearch.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-opensearch
 spec:
   image:
-    productVersion: 3.4.0
+    productVersion: 3.6.0
   clusterConfig:
     security:
       settings:
diff --git a/docs/modules/opensearch/pages/usage-guide/opensearch-dashboards.adoc b/docs/modules/opensearch/pages/usage-guide/opensearch-dashboards.adoc
@@ -13,7 +13,7 @@ A basic `values.yaml` file to deploy OpenSearch Dashboards with this chart might
 opensearchHosts: null # <1>
 image: # <2>
   repository: oci.stackable.tech/sdp/opensearch-dashboards
-  tag: 3.4.0-stackable0.0.0-dev
+  tag: 3.6.0-stackable0.0.0-dev
 serviceAccount:
   create: false
   name: opensearch-serviceaccount # <3>
@@ -92,7 +92,7 @@ After the values are adjusted according to your deployment, especially `opensear
 ----
 helm install opensearch-dashboards opensearch-dashboards \
     --repo https://opensearch-project.github.io/helm-charts \
-    --version 3.4.0 \
+    --version 3.6.0 \
     --values opensearch-dashboards-values.yaml \
     --wait
 ----
diff --git a/docs/modules/opensearch/pages/usage-guide/opensearch-dashboards.adoc.j2 b/docs/modules/opensearch/pages/usage-guide/opensearch-dashboards.adoc.j2
@@ -13,7 +13,7 @@ A basic `values.yaml` file to deploy OpenSearch Dashboards with this chart might
 opensearchHosts: null # <1>
 image: # <2>
   repository: oci.stackable.tech/sdp/opensearch-dashboards
-  tag: 3.4.0-stackable{{ versions.opensearch }}
+  tag: 3.6.0-stackable{{ versions.opensearch }}
 serviceAccount:
   create: false
   name: opensearch-serviceaccount # <3>
@@ -92,7 +92,7 @@ After the values are adjusted according to your deployment, especially `opensear
 ----
 helm install opensearch-dashboards opensearch-dashboards \
     --repo https://opensearch-project.github.io/helm-charts \
-    --version 3.4.0 \
+    --version 3.6.0 \
     --values opensearch-dashboards-values.yaml \
     --wait
 ----
diff --git a/docs/modules/opensearch/pages/usage-guide/security.adoc b/docs/modules/opensearch/pages/usage-guide/security.adoc
@@ -163,7 +163,7 @@ metadata:
   name: opensearch
 spec:
   image:
-    productVersion: 3.4.0
+    productVersion: 3.6.0
   clusterConfig:
     tls:
       serverSecretClass: tls # <1>
diff --git a/rust/operator-binary/src/controller.rs b/rust/operator-binary/src/controller.rs
@@ -602,14 +602,14 @@ mod tests {
     fn validated_cluster() -> ValidatedCluster {
         ValidatedCluster::new(
             ResolvedProductImage {
-                product_version: "3.4.0".to_owned(),
-                app_version_label_value: LabelValue::from_str("3.4.0-stackable0.0.0-dev")
+                product_version: "3.6.0".to_owned(),
+                app_version_label_value: LabelValue::from_str("3.6.0-stackable0.0.0-dev")
                     .expect("should be a valid label value"),
-                image: "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev".to_string(),
+                image: "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev".to_string(),
                 image_pull_policy: "Always".to_owned(),
                 pull_secrets: None,
             },
-            ProductVersion::from_str_unsafe("3.4.0"),
+            ProductVersion::from_str_unsafe("3.6.0"),
             ClusterName::from_str_unsafe("my-opensearch"),
             NamespaceName::from_str_unsafe("default"),
             uuid!("e6ac237d-a6d4-43a1-8135-f36506110912"),
diff --git a/rust/operator-binary/src/controller/build.rs b/rust/operator-binary/src/controller/build.rs
@@ -177,14 +177,14 @@ mod tests {
     fn validated_cluster() -> ValidatedCluster {
         ValidatedCluster::new(
             ResolvedProductImage {
-                product_version: "3.4.0".to_owned(),
-                app_version_label_value: LabelValue::from_str("3.4.0-stackable0.0.0-dev")
+                product_version: "3.6.0".to_owned(),
+                app_version_label_value: LabelValue::from_str("3.6.0-stackable0.0.0-dev")
                     .expect("should be a valid label value"),
-                image: "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev".to_string(),
+                image: "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev".to_string(),
                 image_pull_policy: "Always".to_owned(),
                 pull_secrets: None,
             },
-            ProductVersion::from_str_unsafe("3.4.0"),
+            ProductVersion::from_str_unsafe("3.6.0"),
             ClusterName::from_str_unsafe("my-opensearch"),
             NamespaceName::from_str_unsafe("default"),
             uuid!("e6ac237d-a6d4-43a1-8135-f36506110912"),
diff --git a/rust/operator-binary/src/controller/build/node_config.rs b/rust/operator-binary/src/controller/build/node_config.rs
@@ -534,7 +534,7 @@ mod tests {
     }
 
     fn node_config(test_config: TestConfig) -> NodeConfig {
-        let image: ProductImage = serde_json::from_str(r#"{"productVersion": "3.4.0"}"#)
+        let image: ProductImage = serde_json::from_str(r#"{"productVersion": "3.6.0"}"#)
             .expect("should be a valid ProductImage");
 
         let role_group_name = RoleGroupName::from_str_unsafe("data");
@@ -603,10 +603,10 @@ mod tests {
 
         let cluster = ValidatedCluster::new(
             ResolvedProductImage {
-                product_version: "3.4.0".to_owned(),
-                app_version_label_value: LabelValue::from_str("3.4.0-stackable0.0.0-dev")
+                product_version: "3.6.0".to_owned(),
+                app_version_label_value: LabelValue::from_str("3.6.0-stackable0.0.0-dev")
                     .expect("should be a valid label value"),
-                image: "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev".to_string(),
+                image: "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev".to_string(),
                 image_pull_policy: "Always".to_owned(),
                 pull_secrets: None,
             },
diff --git a/rust/operator-binary/src/controller/build/product_logging/config.rs b/rust/operator-binary/src/controller/build/product_logging/config.rs
@@ -91,7 +91,7 @@ fn log4j2_console_appender_config(
             "PatternLayout".to_owned(),
         ),
         // Same as the default layout pattern of the console appender
-        // see https://github.com/opensearch-project/OpenSearch/blob/3.4.0/distribution/src/config/log4j2.properties#L17
+        // see https://github.com/opensearch-project/OpenSearch/blob/3.6.0/distribution/src/config/log4j2.properties#L17
         (
             "appender.CONSOLE.layout.pattern".to_owned(),
             "[%d{ISO8601}][%-5p][%-25c{1.}] [%node_name]%marker %m%n".to_owned(),
diff --git a/rust/operator-binary/src/controller/build/role_builder.rs b/rust/operator-binary/src/controller/build/role_builder.rs
@@ -422,7 +422,7 @@ mod tests {
     }
 
     fn role_builder<'a>(context_names: &'a ContextNames) -> RoleBuilder<'a> {
-        let image: ProductImage = serde_json::from_str(r#"{"productVersion": "3.4.0"}"#)
+        let image: ProductImage = serde_json::from_str(r#"{"productVersion": "3.6.0"}"#)
             .expect("should be a valid ProductImage");
 
         let role_group_config = OpenSearchRoleGroupConfig {
@@ -458,10 +458,10 @@ mod tests {
 
         let cluster = ValidatedCluster::new(
             ResolvedProductImage {
-                product_version: "3.4.0".to_owned(),
-                app_version_label_value: LabelValue::from_str("3.4.0-stackable0.0.0-dev")
+                product_version: "3.6.0".to_owned(),
+                app_version_label_value: LabelValue::from_str("3.6.0-stackable0.0.0-dev")
                     .expect("should be a valid label value"),
-                image: "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev".to_string(),
+                image: "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev".to_string(),
                 image_pull_policy: "Always".to_owned(),
                 pull_secrets: None,
             },
@@ -513,7 +513,7 @@ mod tests {
                         "app.kubernetes.io/instance": "my-opensearch-cluster",
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable"
                     },
                     "name": "my-opensearch-cluster-serviceaccount",
@@ -551,7 +551,7 @@ mod tests {
                         "app.kubernetes.io/instance": "my-opensearch-cluster",
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable"
                     },
                     "name": "my-opensearch-cluster-rolebinding",
@@ -602,7 +602,7 @@ mod tests {
                         "app.kubernetes.io/instance": "my-opensearch-cluster",
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable"
                     },
                     "name": "my-opensearch-cluster-seed-nodes",
@@ -658,7 +658,7 @@ mod tests {
                         "app.kubernetes.io/instance": "my-opensearch-cluster",
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable",
                     },
                     "name": "my-opensearch-cluster",
@@ -710,7 +710,7 @@ mod tests {
                         "app.kubernetes.io/instance": "my-opensearch-cluster",
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable",
                     },
                     "name": "my-opensearch-cluster",
@@ -755,7 +755,7 @@ mod tests {
                         "app.kubernetes.io/instance": "my-opensearch-cluster",
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable",
                     },
                     "name": "my-opensearch-cluster-security-config",
diff --git a/rust/operator-binary/src/controller/build/role_group_builder.rs b/rust/operator-binary/src/controller/build/role_group_builder.rs
@@ -1544,10 +1544,10 @@ mod tests {
 
     fn validated_cluster(security_mode: TestSecurityMode) -> ValidatedCluster {
         let image = ResolvedProductImage {
-            product_version: "3.4.0".to_owned(),
-            app_version_label_value: LabelValue::from_str("3.4.0-stackable0.0.0-dev")
+            product_version: "3.6.0".to_owned(),
+            app_version_label_value: LabelValue::from_str("3.6.0-stackable0.0.0-dev")
                 .expect("should be a valid label value"),
-            image: "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev".to_string(),
+            image: "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev".to_string(),
             image_pull_policy: "Always".to_owned(),
             pull_secrets: None,
         };
@@ -1733,7 +1733,7 @@ mod tests {
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
                         "app.kubernetes.io/role-group": "default",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable"
                     },
                     "name": "my-opensearch-cluster-nodes-default",
@@ -2131,7 +2131,7 @@ mod tests {
                     "value": "$(_POD_NAME).my-opensearch-cluster-nodes-default-headless.default.svc.cluster.local"
                 },
             ],
-            "image": "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev",
+            "image": "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev",
             "imagePullPolicy": "Always",
             "name": "opensearch",
             "ports": [
@@ -2241,7 +2241,7 @@ mod tests {
                     "value": "info",
                 },
             ],
-            "image": "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev",
+            "image": "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev",
             "imagePullPolicy": "Always",
             "name": "vector",
             "resources": {
@@ -2326,7 +2326,7 @@ mod tests {
                     },
                 },
             ],
-            "image": "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev",
+            "image": "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev",
             "imagePullPolicy": "Always",
             "name": "update-security-config",
             "resources": {
@@ -2437,7 +2437,7 @@ mod tests {
                 "/bin/bash",
                 "-c"
             ],
-            "image": "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev",
+            "image": "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev",
             "imagePullPolicy": "Always",
             "name": "init-keystore",
             "resources": {},
@@ -2477,7 +2477,7 @@ mod tests {
                     },
                 },
             ],
-            "image": "oci.stackable.tech/sdp/opensearch:3.4.0-stackable0.0.0-dev",
+            "image": "oci.stackable.tech/sdp/opensearch:3.6.0-stackable0.0.0-dev",
             "imagePullPolicy": "Always",
             "name": "create-admin-certificate",
             "resources": {
@@ -3107,7 +3107,7 @@ mod tests {
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
                         "app.kubernetes.io/role-group": "default",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable",
                         "restarter.stackable.tech/enabled": "true"
                     },
@@ -3146,7 +3146,7 @@ mod tests {
                                 "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                                 "app.kubernetes.io/name": "opensearch",
                                 "app.kubernetes.io/role-group": "default",
-                                "app.kubernetes.io/version": "3.4.0",
+                                "app.kubernetes.io/version": "3.6.0",
                                 "stackable.tech/opensearch-role.cluster_manager": "true",
                                 "stackable.tech/opensearch-role.data": "true",
                                 "stackable.tech/opensearch-role.ingest": "true",
@@ -3195,7 +3195,7 @@ mod tests {
                                     "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                                     "app.kubernetes.io/name": "opensearch",
                                     "app.kubernetes.io/role-group": "default",
-                                    "app.kubernetes.io/version": "3.4.0",
+                                    "app.kubernetes.io/version": "3.6.0",
                                     "stackable.tech/vendor": "Stackable"
                                 },
                                 "name": "listener"
@@ -3225,7 +3225,7 @@ mod tests {
                                     "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                                     "app.kubernetes.io/name": "opensearch",
                                     "app.kubernetes.io/role-group": "default",
-                                    "app.kubernetes.io/version": "3.4.0",
+                                    "app.kubernetes.io/version": "3.6.0",
                                     "stackable.tech/vendor": "Stackable",
                                 },
                                 "name": "discovery-service-listener",
@@ -3310,7 +3310,7 @@ mod tests {
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
                         "app.kubernetes.io/role-group": "default",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "prometheus.io/scrape": "true",
                         "stackable.tech/vendor": "Stackable"
                     },
@@ -3376,7 +3376,7 @@ mod tests {
                         "app.kubernetes.io/managed-by": "opensearch.stackable.tech_opensearchcluster",
                         "app.kubernetes.io/name": "opensearch",
                         "app.kubernetes.io/role-group": "default",
-                        "app.kubernetes.io/version": "3.4.0",
+                        "app.kubernetes.io/version": "3.6.0",
                         "stackable.tech/vendor": "Stackable"
                     },
                     "name": "my-opensearch-cluster-nodes-default",
diff --git a/rust/operator-binary/src/controller/preprocess.rs b/rust/operator-binary/src/controller/preprocess.rs
@@ -88,7 +88,7 @@ mod tests {
             },
             "spec": {
                 "image": {
-                    "productVersion": "3.4.0"
+                    "productVersion": "3.6.0"
                 },
                 "clusterConfig": {
                     "security": {
diff --git a/rust/operator-binary/src/controller/validate.rs b/rust/operator-binary/src/controller/validate.rs
diff --git a/rust/operator-binary/src/crd/roundtrip_test_data.yaml b/rust/operator-binary/src/crd/roundtrip_test_data.yaml
diff --git a/rust/operator-binary/src/framework/types/operator.rs b/rust/operator-binary/src/framework/types/operator.rs
