Merge branch 'main' into feature/parallel-recovery

Signed-off-by: Sebastian Woehrl <[email protected]>

docs/userguide/main.md

@@ -682,6 +682,10 @@ Internally you should use self-signed certificates (you can let the operator gen
 
 The operator contains several features that automate management tasks that might be needed during the cluster lifecycle. The different available options are documented here.
 
+### Cluster recovery
+
+This operator automatically handles common failure scenarios and restarts crashed pods, normally this is done in a one-by-one fashion to maintain quorum and cluster stability. In case the operator detects several crashed or missing pods (for a nodepool) at the same time it will switch into a special recovery mode and start all pods at once and allow the cluster to form a new quorum.
+
 ### Rolling Upgrades
 
 The operator supports automatic rolling version upgrades. To do so simply change the `general.version` in your cluster spec and reapply it:
@@ -879,10 +883,6 @@ The last thing that you have to do is to add that security configuration to your
         generate: true
 ```
 
-## Cluster recovery
-
-This operator automatically handles common failure scenarios and restarts crashed pods, normally this is done in a one-by-one fashion to maintain quorum and cluster stability. In case the operator detects several crashed or missing pods (for a nodepool) at the same time it will switch into a special recovery mode and start all pods at once and allow the cluster to form a new quorum.
-
 Changing the admin password after the cluster has been created is possible via the same way. You must update your securityconfig (in the `securityconfig-secret`) and the content of the `admin-credentials-secret` to both reflect the new password. Note that currently the operator cannot make changes in the securityconfig itself. As such you must always update the securityconfig in the secret with the new password and in addition provide it via the credentials secret so that the operator can still access the cluster.
 
 ### Custom Dashboards user

opensearch-operator/pkg/helpers/constants.go

@@ -3,10 +3,13 @@ package helpers
 import "os"
 
 const (
-	DashboardConfigName   = "opensearch_dashboards.yml"
-	DashboardChecksumName = "checksum/dashboards.yml"
-	ClusterLabel          = "opster.io/opensearch-cluster"
-	NodePoolLabel         = "opster.io/opensearch-nodepool"
+	DashboardConfigName       = "opensearch_dashboards.yml"
+	DashboardChecksumName     = "checksum/dashboards.yml"
+	ClusterLabel              = "opster.io/opensearch-cluster"
+	NodePoolLabel             = "opster.io/opensearch-nodepool"
+	OsUserNameAnnotation      = "opensearchuser/name"
+	OsUserNamespaceAnnotation = "opensearchuser/namespace"
+	DnsBaseEnvVariable        = "DNS_BASE"
 )
 
 func ClusterDnsBase() string {