Remove duplicate configs, just fall back to existing default configs, but fed in as env vars instead of secrets

Author: marcleblanc2

charts/sourcegraph/README.md

@@ -315,8 +315,6 @@ In addition to the documented values, all services also support the following va
 | sourcegraph.nodeSelector | object | `{}` | Global NodeSelector, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector) |
 | sourcegraph.podAnnotations | object | `{}` | Add extra annotations to attach to all pods |
 | sourcegraph.podLabels | object | `{}` | Add extra labels to attach to all pods |
-| sourcegraph.redisCacheEndpoint | string | `""` | If disabling Kubernetes secrets, and using our bundled Redis containers where this endpoint string does not contain a secret, then set this to "redis-cache:6379". If disabling Kubernetes secrets, and using an external Redis service where this endpoint string contains a secret, then set this to "", and inject the REDIS_CACHE_ENDPOINT environment variable on the needed pods (frontend, gitserver, searcher, and worker) |
-| sourcegraph.redisStoreEndpoint | string | `""` | If disabling Kubernetes secrets, and using our bundled Redis containers where this endpoint string does not contain a secret, then set this to "redis-store:6379". If disabling Kubernetes secrets, and using an external Redis service where this endpoint string contains a secret, then set this to "", and inject the REDIS_STORE_ENDPOINT environment variable on the needed pods (frontend, gitserver, searcher, and worker) |
 | sourcegraph.revisionHistoryLimit | int | `10` | Global deployment clean up policy, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#clean-up-policy) |
 | sourcegraph.serviceLabels | object | `{}` | Add extra labels to all services |
 | sourcegraph.tolerations | list | `[]` | Global Tolerations, learn more from the [Kubernetes documentation](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) |

charts/sourcegraph/templates/_helpers.tpl

@@ -251,9 +251,9 @@ app.kubernetes.io/name: jaeger
 {{- define "sourcegraph.redisConnection" -}}
 {{- if .Values.sourcegraph.disableKubernetesSecrets -}}
 - name: REDIS_CACHE_ENDPOINT
-  value: {{ .Values.sourcegraph.redisCacheEndpoint }}
+  value: {{ .Values.redisCache.connection.endpoint }}
 - name: REDIS_STORE_ENDPOINT
-  value: {{ .Values.sourcegraph.redisStoreEndpoint }}
+  value: {{ .Values.redisStore.connection.endpoint }}
 {{- else -}}
 - name: REDIS_CACHE_ENDPOINT
   valueFrom:

charts/sourcegraph/values.yaml

@@ -40,12 +40,6 @@ sourcegraph:
   serviceLabels: {}
   # -- Disable the creation of Kubernetes secrets objects
   disableKubernetesSecrets: false
-  # -- If disabling Kubernetes secrets, and using our bundled Redis containers where this endpoint string does not contain a secret, then set this to "redis-cache:6379". If disabling Kubernetes secrets, and using an external Redis service where this endpoint string contains a secret, then set this to "", and inject the REDIS_CACHE_ENDPOINT environment variable on the needed pods (frontend, gitserver, searcher, and worker)
-  redisCacheEndpoint: ""
-  # redisCacheEndpoint: redis-cache:6379
-  # -- If disabling Kubernetes secrets, and using our bundled Redis containers where this endpoint string does not contain a secret, then set this to "redis-store:6379". If disabling Kubernetes secrets, and using an external Redis service where this endpoint string contains a secret, then set this to "", and inject the REDIS_STORE_ENDPOINT environment variable on the needed pods (frontend, gitserver, searcher, and worker)
-  redisStoreEndpoint: ""
-  # redisStoreEndpoint: redis-store:6379
 
 # Generic application configuration options, used by most applications below
 # app: # Generally matches directory name