Merge remote-tracking branch 'origin/main' into main

Author: viragtripathi

connectors/postgres/k8s-docs/README.md

@@ -127,7 +127,22 @@ The final link is the environment variable that instructs Redis Connect to use t
 
 ## 4. Configure the Redis Connect Deployment Manifests
 
-Update both the `redis-connect-postgres-stage.yaml` and `redis-connect-postgres-start.yaml` to map the appropriate environment variables in the `env:` section. Notable, the `REDISCONNECT_SOURCE_USERNAME`, `REDISCONNECT_SOURCE_PASSWORD`, `REDISCONNECT_TARGET_USERNAME` and `REDISCONNECT_TARGET_PASSWORD`. 
+Update both the `redis-connect-postgres-stage.yaml` and `redis-connect-postgres-start.yaml` to map the appropriate environment variables in the `env:` section. Notable, the `REDISCONNECT_SOURCE_USERNAME`, `REDISCONNECT_SOURCE_PASSWORD`, `REDISCONNECT_TARGET_USERNAME` and `REDISCONNECT_TARGET_PASSWORD`.  
+
+Examples are provided to populate environment variables from the manifest/yaml, from configmap, and from k8s secrets for sensitive info such as credentials:
+
+```
+          - name: REDISCONNECT_SOURCE_PASSWORD
+            value: admin123                          
+            # valueFrom:
+            #   configMapKeyRef:
+            #     key: REDISCONNECT_SOURCE_PASSWORD
+            #     name: redis-connect-postgres-config
+            # valueFrom:
+            #   secretKeyRef:
+            #     key: password
+            #     name: redis-connect-secret
+```
 
 ## 5. Stage the Redis Connect Job
 

connectors/postgres/k8s-docs/redis-connect-postgres-stage.yaml

@@ -15,19 +15,19 @@ spec:
       containers:
       - name:  redis-connect-postgres # Container name 
         image: redislabs/redis-connect-postgres:pre-release-alpine #repo/image:tag
-# #### comment out the following two lines for troubleshooting 
+# #### uncomment the following two lines for troubleshooting 
 #         command: [ "/bin/bash", "-c", "--" ]
 #         args: [ "while true; do sleep 30; done;" ]
 # ####
         command: [ "/opt/redislabs/redis-connect-postgres/bin/redisconnect.sh", "stage"] 
         imagePullPolicy: Always # IfNotPresent # Always pull image
         resources:
           limits:
-            cpu: "1000m"
-            memory: "1024Mi"
-          requests:
             cpu: "500m"
             memory: "256Mi"
+          requests:
+            cpu: "250m"
+            memory: "256Mi"
         ports:  
         - containerPort: 8282 # exposed container port to the REST API 
           protocol: TCP
@@ -62,12 +62,20 @@ spec:
             #   configMapKeyRef:
             #     key: REDISCONNECT_SOURCE_USERNAME
             #     name: redis-connect-postgres-config
+            # valueFrom:
+            #   secretKeyRef:
+            #     key: username
+            #     name: redis-connect-secret
           - name: REDISCONNECT_SOURCE_PASSWORD
             value: admin123
             # valueFrom:
             #   configMapKeyRef:
             #     key: REDISCONNECT_SOURCE_PASSWORD
             #     name: redis-connect-postgres-config
+            # valueFrom:
+            #   secretKeyRef:
+            #     key: password
+            #     name: redis-connect-secret
           - name: REDISCONNECT_JAVA_OPTIONS
             value: "-XX:+HeapDumpOnOutOfMemoryError -Xms256m -Xmx1g"
             # valueFrom:

connectors/postgres/k8s-docs/redis-connect-postgres-start.yaml

@@ -5,7 +5,7 @@ metadata:
   labels:
     app: redis-connect-postgres # deployment label
 spec:
-  replicas: 1 # a single replica pod
+  replicas: 2 # replicas for HA
   selector:
     matchLabels:
       app: redis-connect-postgres # which pods is the deployment managing, as defined by the pod template
@@ -14,17 +14,24 @@ spec:
       labels:
         app: redis-connect-postgres 
     spec:
+      affinity:
+        podAntiAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - redis-connect-postgres # must match Deployment:metadata:labels:app
+            topologyKey: "kubernetes.io/hostname"    
       containers:
       - name:  redis-connect-postgres # Container name 
         image: redislabs/redis-connect-postgres:pre-release-alpine #repo/image:tag
-#### comment out the following two lines while you are setting up your 
+#### uncomment the following two lines while you are setting up your 
         # command: [ "/bin/bash", "-c", "--" ]
         # args: [ "while true; do sleep 30; done;" ]
 ####
-#### 
-        # command: [ "/opt/redislabs/redis-connect-postgres/bin/redisconnect.sh", "stage"] 
         command: ["/opt/redislabs/redis-connect-postgres/bin/redisconnect.sh", "start"] 
-####
         imagePullPolicy: Always # IfNotPresent # Always pull image
         resources:
           limits:
@@ -67,12 +74,20 @@ spec:
             #   configMapKeyRef:
             #     key: REDISCONNECT_SOURCE_USERNAME
             #     name: redis-connect-postgres-config
+            # valueFrom:
+            #   secretKeyRef:
+            #     key: username
+            #     name: redis-connect-secret
           - name: REDISCONNECT_SOURCE_PASSWORD
             value: admin123
             # valueFrom:
             #   configMapKeyRef:
             #     key: REDISCONNECT_SOURCE_PASSWORD
             #     name: redis-connect-postgres-config
+            # valueFrom:
+            #   secretKeyRef:
+            #     key: password
+            #     name: redis-connect-secret
           - name: REDISCONNECT_JAVA_OPTIONS
             value: "-XX:+HeapDumpOnOutOfMemoryError -Xms256m -Xmx1g"
             # valueFrom: