Merge pull request #356 from guzzijones/alternate_registry

configurable utilityImage + clusterDomain and increase default db timeouts to avoid replicaset timeout

Author: cognifloyd

templates/_helpers.tpl

@@ -39,6 +39,18 @@ app.kubernetes.io/name: {{ $name }}
 app.kubernetes.io/instance: {{ $root.Release.Name }}
 {{- end -}}
 
+{{/*
+Generate Docker utility image line
+*/}}
+{{- define "stackstorm-ha.utilityImage" -}}
+{{- if .Values.image.utilityImage -}}
+{{ .Values.image.utilityImage }}
+{{- else -}}
+docker.io/library/busybox:1.28
+{{- end -}}
+{{- end -}}
+
+
 {{/*
 Generate Docker image repository: Public Docker Hub 'stackstorm' for FOSS version
 */}}
@@ -91,7 +103,7 @@ Generate comma-separated list of nodes for MongoDB-HA connection string, based o
 {{- range $index0 := until $replicas -}}
   {{- $index1 := $index0 | add1 -}}
   {{- if eq $architecture "replicaset" }}
-    {{- $mongo_fullname }}-{{ $index0 }}.{{ $mongo_fullname }}-headless{{ if ne $index1 $replicas }},{{ end }}
+    {{- $mongo_fullname }}-{{ $index0 }}.{{ $mongo_fullname }}-headless.{{ $.Release.Namespace }}.svc.{{ $.Values.clusterDomain }}{{ if ne $index1 $replicas }},{{ end }}
   {{- else }}
     {{- $mongo_fullname }}-{{ $index0 }}.{{ $mongo_fullname }}{{ if ne $index1 $replicas }},{{ end }}
   {{- end -}}
@@ -110,9 +122,9 @@ Generate list of nodes for Redis with Sentinel connection string, based on numbe
 {{- $sentinel_port := (index .Values "redis" "sentinel" "port") }}
 {{- range $index0 := until $replicas -}}
   {{- if eq $index0 0 -}}
-    {{ $.Release.Name }}-redis-node-{{ $index0 }}.{{ $.Release.Name }}-redis-headless:{{ $sentinel_port }}?sentinel={{ $master_name }}
+    {{ $.Release.Name }}-redis-node-{{ $index0 }}.{{ $.Release.Name }}-redis-headless.{{ $.Release.Namespace }}.svc.{{ $.Values.clusterDomain }}:{{ $sentinel_port }}?sentinel={{ $master_name }}
   {{- else -}}
-    &sentinel_fallback={{ $.Release.Name }}-redis-node-{{ $index0 }}.{{ $.Release.Name }}-redis-headless:{{ $sentinel_port }}
+    &sentinel_fallback={{ $.Release.Name }}-redis-node-{{ $index0 }}.{{ $.Release.Name }}-redis-headless.{{ $.Release.Namespace }}.svc.{{ $.Values.clusterDomain }}:{{ $sentinel_port }}
   {{- end -}}
 {{- end -}}
 {{- end -}}
@@ -165,7 +177,7 @@ Reduce duplication of the st2.*.conf volume details
 {{- if index .Values "mongodb" "enabled" }}
 {{- $mongodb_port := (int (index .Values "mongodb" "service" "port")) }}
 - name: wait-for-db
-  image: busybox:1.28
+  image: {{ template "stackstorm-ha.utilityImage" . }}
   command:
     - 'sh'
     - '-c'
@@ -185,7 +197,7 @@ Reduce duplication of the st2.*.conf volume details
   {{- if index .Values "rabbitmq" "enabled" }}
     {{- $rabbitmq_port := (int (index .Values "rabbitmq" "service" "port")) }}
 - name: wait-for-queue
-  image: busybox:1.28
+  image: {{ template "stackstorm-ha.utilityImage" . }}
   command:
     - 'sh'
     - '-c'

templates/deployments.yaml

@@ -1138,7 +1138,7 @@ spec:
       initContainers:
       {{- if $some_sensors_per_pod }}
       - name: {{ $name }}-init-config
-        image: busybox:1.28
+        image: '{{ template "stackstorm-ha.utilityImage" $ }}'
         volumeMounts:
         - name: st2-sensor-config-vol
           mountPath: /tmp/st2

templates/jobs.yaml

@@ -134,7 +134,7 @@ spec:
       initContainers:
       {{- include "stackstorm-ha.init-containers-wait-for-db" . | nindent 6 }}
       - name: wait-for-api
-        image: busybox:1.28
+        image: {{ template "stackstorm-ha.utilityImage" . }}
         {{- with .Values.securityContext }}
         securityContext: {{- toYaml . | nindent 10 }}
         {{- end }}

values.yaml

@@ -5,6 +5,11 @@
 ## Docker image settings, applied to all StackStorm pods
 ##
 image:
+  # utility image to use as sidecar for running startup scripts
+  # allows you to override the registry namespace as well if you are using a private registry
+  # ie
+  # utilityImage: "myprivateregsistry.local/ext.docker.io/library/busybox:1.28"
+  utilityImage: ""
   # Image pull policy
   pullPolicy: IfNotPresent
   # st2 image repository. Set this to override the default ("stackstorm").
@@ -20,7 +25,13 @@ image:
   # See: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
   #pullSecret: "your-pull-secret"
 
-
+##
+## local cluster domain suffix to enable fqdn lookups for redis, mongo
+##  kube-dns defaults to cluster.local and allows override with --domain
+##  core-dns has no default but allows config in k8 configmap
+##    https://kubernetes.io/docs/tasks/administer-cluster/dns-custom-nameservers/#configuration-of-stub-domain-and-upstream-nameserver-using-coredns
+##
+clusterDomain: cluster.local
 
 ##
 ## Service Account
@@ -70,6 +81,11 @@ st2:
   config: |
     [api]
     allow_origin = '*'
+    # fixes no replicaset found bug;  
+    [database]
+    # Connection and server selection timeout (in ms).
+    connection_timeout = 5000
+
 
   #Override Definitions can be added here.
   #https://docs.stackstorm.com/latest/packs.html#overriding-pack-defaults