update ops def

Author: wangyelei

addons/redis/scripts/reset-master.sh

@@ -2,13 +2,17 @@
 if [ -z "${SENTINEL_POD_NAME_LIST}" ]; then
    exit 0
 fi
+sentinel_service_port=$SENTINEL_SERVICE_PORT
+if [ "$TLS_ENABLED" == "true" ]; then
+    sentinel_service_port=$SENTINEL_NON_TLS_SERVICE_PORT
+fi
 for sentinel_pod in $(echo ${SENTINEL_POD_NAME_LIST} | tr ',' '\n'); do
     echo "reset master in sentinel ${pod}..."
     fqdn="$sentinel_pod.$SENTINEL_HEADLESS_SERVICE_NAME.$CLUSTER_NAMESPACE.svc.cluster.local"
     if [ -n "${SENTINEL_PASSWORD}" ]; then
-        redis-cli -h $fqdn -p 26379 -a ${SENTINEL_PASSWORD} sentinel reset ${REDIS_COMPONENT_NAME}
+        redis-cli -h $fqdn -p $sentinel_service_port -a ${SENTINEL_PASSWORD} sentinel reset ${REDIS_COMPONENT_NAME}
     else
-        redis-cli -h $fqdn -p 26379 sentinel reset ${REDIS_COMPONENT_NAME}
+        redis-cli -h $fqdn -p $sentinel_service_port sentinel reset ${REDIS_COMPONENT_NAME}
     fi
     if [ $? -eq 0 ]; then
         echo "reset master in sentinel ${pod} succeeded"

addons/redis/templates/opsdefinition-account.yaml

@@ -24,6 +24,14 @@ spec:
           valueFrom:
             envRef:
               envName: SERVICE_PORT
+        - name: NON_TLS_SERVICE_PORT
+          valueFrom:
+            envRef:
+              envName: NON_TLS_SERVICE_PORT
+        - name: TLS_ENABLED
+          valueFrom:
+            envRef:
+              envName: TLS_ENABLED
         - name: REDIS_DEFAULT_USER
           valueFrom:
             envRef:
@@ -89,6 +97,14 @@ spec:
           valueFrom:
             envRef:
               envName: SENTINEL_SERVICE_PORT
+        - name: NON_TLS_SERVICE_PORT
+          valueFrom:
+            envRef:
+              envName: SENTINEL_NON_TLS_SERVICE_PORT
+        - name: TLS_ENABLED
+          valueFrom:
+            envRef:
+              envName: TLS_ENABLED
         - name: REDIS_DEFAULT_USER
           valueFrom:
             envRef:
@@ -162,6 +178,14 @@ spec:
           valueFrom:
             envRef:
               envName: SERVICE_PORT
+        - name: NON_TLS_SERVICE_PORT
+          valueFrom:
+            envRef:
+              envName: NON_TLS_SERVICE_PORT
+        - name: TLS_ENABLED
+          valueFrom:
+            envRef:
+              envName: TLS_ENABLED
         - name: REDIS_DEFAULT_USER
           valueFrom:
             envRef: