diff --git a/addons/falkordb/templates/cmpd-falkordb-cluster.yaml b/addons/falkordb/templates/cmpd-falkordb-cluster.yaml index 8a6968fef..2442b8aad 100644 --- a/addons/falkordb/templates/cmpd-falkordb-cluster.yaml +++ b/addons/falkordb/templates/cmpd-falkordb-cluster.yaml @@ -319,7 +319,7 @@ spec: option: Required - name: SERVICE_PORT value: "6379" - expression: {{ `{{if ne (index . "REDIS_CLUSTER_HOST_NETWORK_PORT") ""}}{{.REDIS_CLUSTER_HOST_NETWORK_PORT}}{{else}}{{.SERVICE_PORT}}{{end}}` | toYaml }} + expression: {{ `{{if index . "REDIS_CLUSTER_HOST_NETWORK_PORT"}}{{.REDIS_CLUSTER_HOST_NETWORK_PORT}}{{else}}{{.SERVICE_PORT}}{{end}}` | toYaml }} ## the env of falkordb server port for dbctl to connect to falkordb cluster server - name: DBCTL_REDIS_SERVICE_PORT value: $(SERVICE_PORT) @@ -335,7 +335,7 @@ spec: option: Required - name: CLUSTER_BUS_PORT value: "16379" - expression: {{ `{{if ne (index . "REDIS_CLUSTER_HOST_NETWORK_BUS_PORT") ""}}{{.REDIS_CLUSTER_HOST_NETWORK_BUS_PORT}}{{else}}{{.CLUSTER_BUS_PORT}}{{end}}` | toYaml }} + expression: {{ `{{if index . "REDIS_CLUSTER_HOST_NETWORK_BUS_PORT"}}{{.REDIS_CLUSTER_HOST_NETWORK_BUS_PORT}}{{else}}{{.CLUSTER_BUS_PORT}}{{end}}` | toYaml }} {{- if $.Values.enableMetrics }} ## the falkordb server metrics container host network port when using host network mode, the port will be allocated automatically by KubeBlocks - name: REDIS_METRICS_HOST_NETWORK_PORT @@ -349,7 +349,7 @@ spec: option: Required - name: REDIS_METRICS_HTTP_PORT value: "9121" - expression: {{ `{{if ne (index . "REDIS_METRICS_HOST_NETWORK_PORT") ""}}{{.REDIS_METRICS_HOST_NETWORK_PORT}}{{else}}{{.REDIS_METRICS_HTTP_PORT}}{{end}}` | toYaml }} + expression: {{ `{{if index . "REDIS_METRICS_HOST_NETWORK_PORT"}}{{.REDIS_METRICS_HOST_NETWORK_PORT}}{{else}}{{.REDIS_METRICS_HTTP_PORT}}{{end}}` | toYaml }} ## the falkordb cluster host network port list for all shard pods, the all pods in same shard has the same host network port allocated automatically by KubeBlocks. ## the value format is like "shard-chg:1057,shard-khh:1056,shard-mpg:1053" - name: REDIS_CLUSTER_ALL_SHARDS_HOST_NETWORK_PORT diff --git a/addons/falkordb/templates/cmpd-falkordb-sentinel.yaml b/addons/falkordb/templates/cmpd-falkordb-sentinel.yaml index 2fd197d3c..03fd4fc59 100644 --- a/addons/falkordb/templates/cmpd-falkordb-sentinel.yaml +++ b/addons/falkordb/templates/cmpd-falkordb-sentinel.yaml @@ -153,7 +153,7 @@ spec: option: Required - name: SENTINEL_SERVICE_PORT value: "26379" - expression: {{ `{{if ne (index . "REDIS_SENTINEL_HOST_NETWORK_PORT") ""}}{{.REDIS_SENTINEL_HOST_NETWORK_PORT}}{{else}}{{.SENTINEL_SERVICE_PORT}}{{end}}` | toYaml }} + expression: {{ `{{if index . "REDIS_SENTINEL_HOST_NETWORK_PORT"}}{{.REDIS_SENTINEL_HOST_NETWORK_PORT}}{{else}}{{.SENTINEL_SERVICE_PORT}}{{end}}` | toYaml }} ## the env of falkordb sentinel server port for dbctl to connect to falkordb cluster server - name: DBCTL_REDIS_SENTINEL_SERVICE_PORT value: $(SENTINEL_SERVICE_PORT) diff --git a/addons/falkordb/templates/cmpd-falkordb.yaml b/addons/falkordb/templates/cmpd-falkordb.yaml index 8227ddb72..87cc2ec2f 100644 --- a/addons/falkordb/templates/cmpd-falkordb.yaml +++ b/addons/falkordb/templates/cmpd-falkordb.yaml @@ -200,7 +200,7 @@ spec: option: Required - name: SERVICE_PORT value: "6379" - expression: {{ `{{if ne (index . "REDIS_HOST_NETWORK_PORT") ""}}{{.REDIS_HOST_NETWORK_PORT}}{{else}}{{.SERVICE_PORT}}{{end}}` | toYaml }} + expression: {{ `{{if index . "REDIS_HOST_NETWORK_PORT"}}{{.REDIS_HOST_NETWORK_PORT}}{{else}}{{.SERVICE_PORT}}{{end}}` | toYaml }} ## the env of falkordb server port for dbctl to connect to falkordb server - name: DBCTL_REDIS_SERVICE_PORT value: $(SERVICE_PORT) @@ -217,7 +217,7 @@ spec: option: Required - name: REDIS_METRICS_HTTP_PORT value: "9121" - expression: {{ `{{if ne (index . "REDIS_METRICS_HOST_NETWORK_PORT") ""}}{{.REDIS_METRICS_HOST_NETWORK_PORT}}{{else}}{{.REDIS_METRICS_HTTP_PORT}}{{end}}` | toYaml }} + expression: {{ `{{if index . "REDIS_METRICS_HOST_NETWORK_PORT"}}{{.REDIS_METRICS_HOST_NETWORK_PORT}}{{else}}{{.REDIS_METRICS_HTTP_PORT}}{{end}}` | toYaml }} {{- end }} ## the component name of falkordb sentinel when falkordb sentinel is enabled, it's the fullname of falkordb-sent component - name: SENTINEL_COMPONENT_NAME @@ -274,7 +274,7 @@ spec: port: name: falkordb-sent option: Required - expression: {{ `{{if ne (index . "SENTINEL_SERVICE_PORT") ""}}{{.SENTINEL_SERVICE_PORT}}{{else}}26379{{end}}` | toYaml }} + expression: {{ `{{if index . "SENTINEL_SERVICE_PORT"}}{{.SENTINEL_SERVICE_PORT}}{{else}}26379{{end}}` | toYaml }} - name: PHY_MEMORY valueFrom: resourceVarRef: diff --git a/addons/mongodb/templates/cmpd.yaml b/addons/mongodb/templates/cmpd.yaml index 801eafd52..d2cfed3a5 100644 --- a/addons/mongodb/templates/cmpd.yaml +++ b/addons/mongodb/templates/cmpd.yaml @@ -326,7 +326,7 @@ spec: port: name: mongodb option: Optional - expression: {{ `{{if ne (index . "KB_SERVICE_PORT") ""}}{{.KB_SERVICE_PORT}}{{else}}27017{{end}}` | toYaml }} + expression: {{ `{{if index . "KB_SERVICE_PORT"}}{{.KB_SERVICE_PORT}}{{else}}27017{{end}}` | toYaml }} - name: SYNCER_SERVICE_PORT valueFrom: hostNetworkVarRef: @@ -345,7 +345,7 @@ spec: port: name: exporter option: Optional - expression: {{ `{{if ne (index . "EXPORTER_SERVICE_PORT") ""}}{{.EXPORTER_SERVICE_PORT}}{{else}}9216{{end}}` | toYaml }} + expression: {{ `{{if index . "EXPORTER_SERVICE_PORT"}}{{.EXPORTER_SERVICE_PORT}}{{else}}9216{{end}}` | toYaml }} hostNetwork: containerPorts: - container: mongodb diff --git a/addons/oceanbase-ce/templates/_helpers.tpl b/addons/oceanbase-ce/templates/_helpers.tpl index 7749c989d..dfdad0df7 100644 --- a/addons/oceanbase-ce/templates/_helpers.tpl +++ b/addons/oceanbase-ce/templates/_helpers.tpl @@ -168,7 +168,7 @@ vars: name: sql option: Optional optional: true - expression: {{ `{{if ne (index . "OB_SERVICE_PORT") ""}}{{.OB_SERVICE_PORT}}{{else}}2881{{end}}` | toYaml }} + expression: {{ `{{if index . "OB_SERVICE_PORT"}}{{.OB_SERVICE_PORT}}{{else}}2881{{end}}` | toYaml }} - name: OB_RPC_PORT valueFrom: hostNetworkVarRef: @@ -178,7 +178,7 @@ vars: name: rpc option: Optional optional: true - expression: {{ `{{if ne (index . "OB_RPC_PORT") ""}}{{.OB_RPC_PORT}}{{else}}2882{{end}}` | toYaml }} + expression: {{ `{{if index . "OB_RPC_PORT"}}{{.OB_RPC_PORT}}{{else}}2882{{end}}` | toYaml }} - name: SERVICE_PORT valueFrom: hostNetworkVarRef: @@ -188,7 +188,7 @@ vars: name: http option: Optional optional: true - expression: {{ `{{if ne (index . "SERVICE_PORT") ""}}{{.SERVICE_PORT}}{{else}}8088{{end}}` | toYaml }} + expression: {{ `{{if index . "SERVICE_PORT"}}{{.SERVICE_PORT}}{{else}}8088{{end}}` | toYaml }} - name: MANAGER_PORT valueFrom: hostNetworkVarRef: @@ -198,7 +198,7 @@ vars: name: http option: Optional optional: true - expression: {{ `{{if ne (index . "MANAGER_PORT") ""}}{{.MANAGER_PORT}}{{else}}8089{{end}}` | toYaml }} + expression: {{ `{{if index . "MANAGER_PORT"}}{{.MANAGER_PORT}}{{else}}8089{{end}}` | toYaml }} - name: COMP_MYSQL_PORT value: $(OB_SERVICE_PORT) - name: OB_COMPONENT_NAME diff --git a/addons/redis/templates/cmpd-redis-cluster.yaml b/addons/redis/templates/cmpd-redis-cluster.yaml index 6b48f6374..88c13bc39 100644 --- a/addons/redis/templates/cmpd-redis-cluster.yaml +++ b/addons/redis/templates/cmpd-redis-cluster.yaml @@ -339,7 +339,7 @@ spec: option: Required - name: SERVICE_PORT value: "6379" - expression: {{ `{{if ne (index . "REDIS_CLUSTER_HOST_NETWORK_PORT") ""}}{{.REDIS_CLUSTER_HOST_NETWORK_PORT}}{{else}}{{.SERVICE_PORT}}{{end}}` | toYaml }} + expression: {{ `{{if index . "REDIS_CLUSTER_HOST_NETWORK_PORT"}}{{.REDIS_CLUSTER_HOST_NETWORK_PORT}}{{else}}{{.SERVICE_PORT}}{{end}}` | toYaml }} ## the env of redis server port for dbctl to connect to redis cluster server - name: DBCTL_REDIS_SERVICE_PORT value: $(SERVICE_PORT) @@ -355,7 +355,7 @@ spec: option: Required - name: CLUSTER_BUS_PORT value: "16379" - expression: {{ `{{if ne (index . "REDIS_CLUSTER_HOST_NETWORK_BUS_PORT") ""}}{{.REDIS_CLUSTER_HOST_NETWORK_BUS_PORT}}{{else}}{{.CLUSTER_BUS_PORT}}{{end}}` | toYaml }} + expression: {{ `{{if index . "REDIS_CLUSTER_HOST_NETWORK_BUS_PORT"}}{{.REDIS_CLUSTER_HOST_NETWORK_BUS_PORT}}{{else}}{{.CLUSTER_BUS_PORT}}{{end}}` | toYaml }} {{- if $.Values.enableMetrics }} ## the redis server metrics container host network port when using host network mode, the port will be allocated automatically by KubeBlocks - name: REDIS_METRICS_HOST_NETWORK_PORT @@ -369,7 +369,7 @@ spec: option: Required - name: REDIS_METRICS_HTTP_PORT value: "9121" - expression: {{ `{{if ne (index . "REDIS_METRICS_HOST_NETWORK_PORT") ""}}{{.REDIS_METRICS_HOST_NETWORK_PORT}}{{else}}{{.REDIS_METRICS_HTTP_PORT}}{{end}}` | toYaml }} + expression: {{ `{{if index . "REDIS_METRICS_HOST_NETWORK_PORT"}}{{.REDIS_METRICS_HOST_NETWORK_PORT}}{{else}}{{.REDIS_METRICS_HTTP_PORT}}{{end}}` | toYaml }} ## the redis server metrics container host network server port when using host network mode, the port will be allocated automatically by KubeBlocks - name: REDIS_METRICS_HOST_NETWORK_SERVER_PORT valueFrom: @@ -382,7 +382,7 @@ spec: option: Required - name: REDIS_METRICS_SERVER_PORT value: "8888" - expression: {{ `{{if ne (index . "REDIS_METRICS_HOST_NETWORK_SERVER_PORT") ""}}{{.REDIS_METRICS_HOST_NETWORK_SERVER_PORT}}{{else}}{{.REDIS_METRICS_SERVER_PORT}}{{end}}` | toYaml }} + expression: {{ `{{if index . "REDIS_METRICS_HOST_NETWORK_SERVER_PORT"}}{{.REDIS_METRICS_HOST_NETWORK_SERVER_PORT}}{{else}}{{.REDIS_METRICS_SERVER_PORT}}{{end}}` | toYaml }} ## the redis cluster host network port list for all shard pods, the all pods in same shard has the same host network port allocated automatically by KubeBlocks. ## the value format is like "shard-chg:1057,shard-khh:1056,shard-mpg:1053" - name: REDIS_CLUSTER_ALL_SHARDS_HOST_NETWORK_PORT diff --git a/addons/redis/templates/cmpd-redis-sentinel.yaml b/addons/redis/templates/cmpd-redis-sentinel.yaml index be0781bcd..f4a39605a 100644 --- a/addons/redis/templates/cmpd-redis-sentinel.yaml +++ b/addons/redis/templates/cmpd-redis-sentinel.yaml @@ -157,7 +157,7 @@ spec: option: Required - name: SENTINEL_SERVICE_PORT value: "26379" - expression: {{ `{{if ne (index . "REDIS_SENTINEL_HOST_NETWORK_PORT") ""}}{{.REDIS_SENTINEL_HOST_NETWORK_PORT}}{{else}}{{.SENTINEL_SERVICE_PORT}}{{end}}` | toYaml }} + expression: {{ `{{if index . "REDIS_SENTINEL_HOST_NETWORK_PORT"}}{{.REDIS_SENTINEL_HOST_NETWORK_PORT}}{{else}}{{.SENTINEL_SERVICE_PORT}}{{end}}` | toYaml }} ## the env of redis sentinel server port for dbctl to connect to redis cluster server - name: DBCTL_REDIS_SENTINEL_SERVICE_PORT value: $(SENTINEL_SERVICE_PORT) diff --git a/addons/redis/templates/cmpd-redis.yaml b/addons/redis/templates/cmpd-redis.yaml index 1e6c25288..6b77a383d 100644 --- a/addons/redis/templates/cmpd-redis.yaml +++ b/addons/redis/templates/cmpd-redis.yaml @@ -217,7 +217,7 @@ spec: option: Required - name: SERVICE_PORT value: "6379" - expression: {{ `{{if ne (index . "REDIS_HOST_NETWORK_PORT") ""}}{{.REDIS_HOST_NETWORK_PORT}}{{else}}{{.SERVICE_PORT}}{{end}}` | toYaml }} + expression: {{ `{{if index . "REDIS_HOST_NETWORK_PORT"}}{{.REDIS_HOST_NETWORK_PORT}}{{else}}{{.SERVICE_PORT}}{{end}}` | toYaml }} ## the env of redis server port for dbctl to connect to redis server - name: DBCTL_REDIS_SERVICE_PORT value: $(SERVICE_PORT) @@ -234,7 +234,7 @@ spec: option: Required - name: REDIS_METRICS_HTTP_PORT value: "9121" - expression: {{ `{{if ne (index . "REDIS_METRICS_HOST_NETWORK_PORT") ""}}{{.REDIS_METRICS_HOST_NETWORK_PORT}}{{else}}{{.REDIS_METRICS_HTTP_PORT}}{{end}}` | toYaml }} + expression: {{ `{{if index . "REDIS_METRICS_HOST_NETWORK_PORT"}}{{.REDIS_METRICS_HOST_NETWORK_PORT}}{{else}}{{.REDIS_METRICS_HTTP_PORT}}{{end}}` | toYaml }} ## the redis server metrics container host network server port when using host network mode, the port will be allocated automatically by KubeBlocks, if not set, the default value is 8888 - name: REDIS_METRICS_HOST_NETWORK_SERVER_PORT valueFrom: @@ -247,7 +247,7 @@ spec: option: Required - name: REDIS_METRICS_SERVER_PORT value: "8888" - expression: {{ `{{if ne (index . "REDIS_METRICS_HOST_NETWORK_SERVER_PORT") ""}}{{.REDIS_METRICS_HOST_NETWORK_SERVER_PORT}}{{else}}{{.REDIS_METRICS_SERVER_PORT}}{{end}}` | toYaml }} + expression: {{ `{{if index . "REDIS_METRICS_HOST_NETWORK_SERVER_PORT"}}{{.REDIS_METRICS_HOST_NETWORK_SERVER_PORT}}{{else}}{{.REDIS_METRICS_SERVER_PORT}}{{end}}` | toYaml }} {{- end }} ## the component name of redis sentinel when redis sentinel is enabled, it's the fullname of redis-sentinel component - name: SENTINEL_COMPONENT_NAME @@ -304,7 +304,7 @@ spec: port: name: redis-sentinel option: Required - expression: {{ `{{if ne (index . "SENTINEL_SERVICE_PORT") ""}}{{.SENTINEL_SERVICE_PORT}}{{else}}26379{{end}}` | toYaml }} + expression: {{ `{{if index . "SENTINEL_SERVICE_PORT"}}{{.SENTINEL_SERVICE_PORT}}{{else}}26379{{end}}` | toYaml }} - name: PHY_MEMORY valueFrom: resourceVarRef: