Merge pull request #435 from pych/add-sidecar

Add sidecars and initcontainers
spotahome · Aug 31, 2022 · fa8c5b9 · fa8c5b9
2 parents a5f0462 + f151b69
commit fa8c5b9
Show file tree

Hide file tree

Showing 5 changed files with 5,043 additions and 259 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -45,7 +45,7 @@ jobs:
           kubernetes-version: ${{ matrix.kubernetes }}
           driver: none
       - name: Add redisfailover CRD
-        run: kubectl apply -f manifests/databases.spotahome.com_redisfailovers.yaml
+        run: kubectl create -f manifests/databases.spotahome.com_redisfailovers.yaml
       - run: make ci-integration-test
 
   chart-test:

diff --git a/api/redisfailover/v1/types.go b/api/redisfailover/v1/types.go
@@ -47,7 +47,9 @@ type RedisSettings struct {
 	Command                       []string                      `json:"command,omitempty"`
 	ShutdownConfigMap             string                        `json:"shutdownConfigMap,omitempty"`
 	Storage                       RedisStorage                  `json:"storage,omitempty"`
+	InitContainers                []corev1.Container            `json:"initContainers,omitempty"`
 	Exporter                      RedisExporter                 `json:"exporter,omitempty"`
+	ExtraContainers               []corev1.Container            `json:"extraContainers,omitempty"`
 	Affinity                      *corev1.Affinity              `json:"affinity,omitempty"`
 	SecurityContext               *corev1.PodSecurityContext    `json:"securityContext,omitempty"`
 	ContainerSecurityContext      *corev1.SecurityContext       `json:"containerSecurityContext,omitempty"`
@@ -79,7 +81,9 @@ type SentinelSettings struct {
 	NodeSelector             map[string]string             `json:"nodeSelector,omitempty"`
 	PodAnnotations           map[string]string             `json:"podAnnotations,omitempty"`
 	ServiceAnnotations       map[string]string             `json:"serviceAnnotations,omitempty"`
+	InitContainers           []corev1.Container            `json:"initContainers,omitempty"`
 	Exporter                 SentinelExporter              `json:"exporter,omitempty"`
+	ExtraContainers          []corev1.Container            `json:"extraContainers,omitempty"`
 	ConfigCopy               SentinelConfigCopy            `json:"configCopy,omitempty"`
 	HostNetwork              bool                          `json:"hostNetwork,omitempty"`
 	DNSPolicy                corev1.DNSPolicy              `json:"dnsPolicy,omitempty"`

diff --git a/example/redisfailover/sidecars.yaml b/example/redisfailover/sidecars.yaml
@@ -0,0 +1,44 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: sc
+---
+apiVersion: databases.spotahome.com/v1
+kind: RedisFailover
+metadata:
+  name: sidecars
+  namespace: sc
+spec:
+  sentinel:
+    initContainers:
+    - name: echo
+      image: busybox
+      command:
+      - "/bin/sh"
+      - "-c"
+      - "echo 'init container sentinel'"
+    replicas: 3
+    extraContainers:
+    - name: busybox
+      image: busybox
+      command:
+      - "/bin/sh"
+      - "-c"
+      - "sleep infinity"
+  redis:
+    replicas: 3
+    initContainers:
+    - name: echo
+      image: busybox
+      command:
+      - "/bin/sh"
+      - "-c"
+      - "echo 'init container redis'"
+    extraContainers:
+    - name: busybox
+      image: busybox
+      command:
+      - "/bin/sh"
+      - "-c"
+      - "sleep infinity"