Merge branch 'master' into fix-sdb-constants

kubedb · Feb 8, 2024 · 7594239 · 7594239
2 parents 7037cb1 + 3a9f337
commit 7594239
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 15 deletions.
diff --git a/apis/kubedb/v1alpha2/constants.go b/apis/kubedb/v1alpha2/constants.go
@@ -437,17 +437,20 @@ const (
 	// =========================== Redis Constants ============================
 	RedisConfigKey = "redis.conf" // RedisConfigKey is going to create for the customize redis configuration
 	// DefaultConfigKey is going to create for the default redis configuration
-	RedisContainerName          = ResourceSingularRedis
-	RedisSentinelContainerName  = "redissentinel"
-	DefaultConfigKey            = "default.conf"
-	RedisShardKey               = RedisKey + "/shard"
-	RedisDatabasePortName       = "db"
-	RedisPrimaryServicePortName = "primary"
-	RedisDatabasePort           = 6379
-	RedisSentinelPort           = 26379
-	RedisGossipPortName         = "gossip"
-	RedisGossipPort             = 16379
-	RedisSentinelPortName       = "sentinel"
+	RedisContainerName             = ResourceSingularRedis
+	RedisSentinelContainerName     = "redissentinel"
+	DefaultConfigKey               = "default.conf"
+	RedisShardKey                  = RedisKey + "/shard"
+	RedisDatabasePortName          = "db"
+	RedisPrimaryServicePortName    = "primary"
+	RedisDatabasePort              = 6379
+	RedisSentinelPort              = 26379
+	RedisGossipPortName            = "gossip"
+	RedisGossipPort                = 16379
+	RedisSentinelPortName          = "sentinel"
+	RedisInitContainerName         = "redis-init"
+	RedisCoordinatorContainerName  = "rd-coordinator"
+	RedisSentinelInitContainerName = "sentinel-init"
 
 	RedisScriptVolumeName      = "script-vol"
 	RedisScriptVolumePath      = "/scripts"
@@ -460,6 +463,8 @@ const (
 	RedisSentinelTLSVolumePath = "/sentinel-certs"
 	RedisConfigVolumeName      = "redis-config"
 	RedisConfigVolumePath      = "/usr/local/etc/redis/"
+	RedisInitVolumeName        = "init-volume"
+	RedisInitVolumePath        = "/init"
 
 	RedisNodeFlagMaster = "master"
 	RedisNodeFlagNoAddr = "noaddr"
@@ -468,8 +473,11 @@ const (
 	RedisKeyFileSecretSuffix = "key"
 	RedisPEMSecretSuffix     = "pem"
 	RedisRootUsername        = "default"
-	EnvRedisUser             = "USERNAME"
-	EnvRedisPassword         = "REDISCLI_AUTH"
+
+	EnvRedisUser              = "USERNAME"
+	EnvRedisPassword          = "REDISCLI_AUTH"
+	EnvRedisMode              = "REDIS_MODE"
+	EnvRedisMajorRedisVersion = "MAJOR_REDIS_VERSION"
 
 	// =========================== PgBouncer Constants ============================
 	PgBouncerUpstreamServerCA               = "upstream-server-ca.crt"
@@ -540,7 +548,12 @@ const (
 	EnvZooKeeperClusterSize     = "CLUSTER_SIZE"
 	EnvZooKeeperUser            = "ZK_USER"
 	EnvZooKeeperPassword        = "ZK_PASSWORD"
-	ZooKeeperSuperUsername      = "super"
+	EnvZooKeeperJaasFilePath    = "ZK_JAAS_FILE_PATH"
+	EnvZooKeeperJVMFLags        = "JVMFLAGS"
+
+	ZooKeeperSuperUsername       = "super"
+	ZooKeeperSASLAuthLoginConfig = "-Djava.security.auth.login.config"
+	ZooKeeperJaasFilePath        = "/data/jaas.conf"
 )
 
 // List of possible condition types for a KubeDB object

diff --git a/apis/kubedb/v1alpha2/openapi_generated.go b/apis/kubedb/v1alpha2/openapi_generated.go
diff --git a/apis/kubedb/v1alpha2/zookeeper_types.go b/apis/kubedb/v1alpha2/zookeeper_types.go
@@ -60,6 +60,9 @@ type ZooKeeperSpec struct {
 	// +optional
 	Replicas *int32 `json:"replicas"`
 
+	// +kubebuilder:default=8080
+	AdminServerPort int32 `json:"adminServerPort"`
+
 	// Storage to specify how storage shall be used.
 	Storage *core.PersistentVolumeClaimSpec `json:"storage,omitempty"`
 

diff --git a/crds/kubedb.com_zookeepers.yaml b/crds/kubedb.com_zookeepers.yaml
@@ -41,6 +41,10 @@ spec:
             type: object
           spec:
             properties:
+              adminServerPort:
+                default: 8080
+                format: int32
+                type: integer
               authSecret:
                 properties:
                   externallyManaged:
@@ -2732,6 +2736,7 @@ spec:
               version:
                 type: string
             required:
+            - adminServerPort
             - version
             type: object
           status: