Merge branch 'main' of https://github.com/sigarus/dragonfly-operator …

…into main
dragonflydb · Nov 5, 2024 · d7f0b16 · d7f0b16
2 parents 1c0141f + 3aa1306
commit d7f0b16
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/api/v1alpha1/dragonfly_types.go b/api/v1alpha1/dragonfly_types.go
@@ -35,6 +35,12 @@ type DragonflySpec struct {
 	// Image is the Dragonfly image to use
 	Image string `json:"image,omitempty"`
 
+	// (Optional) imagePullPolicy to set to Dragonfly, default is Always
+	// +optional
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default:="Always"
+	ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
+
 	// (Optional) Dragonfly container args to pass to the container
 	// Refer to the Dragonfly documentation for the list of supported args
 	// +optional

diff --git a/config/crd/bases/dragonflydb.io_dragonflies.yaml b/config/crd/bases/dragonflydb.io_dragonflies.yaml
@@ -1371,6 +1371,11 @@ spec:
               image:
                 description: Image is the Dragonfly image to use
                 type: string
+              imagePullPolicy:
+                default: Always
+                description: (Optional) imagePullPolicy to set to Dragonfly, default
+                  is Always
+                type: string
               labels:
                 additionalProperties:
                   type: string

diff --git a/internal/resources/resources.go b/internal/resources/resources.go
@@ -148,7 +148,7 @@ func GetDragonflyResources(ctx context.Context, df *resourcesv1.Dragonfly) ([]cl
 								SuccessThreshold:    1,
 								TimeoutSeconds:      5,
 							},
-							ImagePullPolicy: corev1.PullAlways,
+							ImagePullPolicy: df.Spec.ImagePullPolicy,
 						},
 					},
 				},