[Enhancement] Support ImagePullPolicy (#514)

Signed-off-by: yandongxiao <[email protected]>
StarRocks · Apr 22, 2024 · 2829c25 · 2829c25
1 parent 53ffc04
commit 2829c25
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 4 deletions.
diff --git a/config/crd/bases/starrocks.com_starrocksclusters.yaml b/config/crd/bases/starrocks.com_starrocksclusters.yaml
@@ -1056,6 +1056,13 @@ spec:
                   image:
                     description: Image for a starrocks deployment.
                     type: string
+                  imagePullPolicy:
+                    description: |-
+                      Image pull policy.
+                      One of Always, Never, IfNotPresent.
+                      Defaults to IfNotPresent for compatibility.
+                      More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                    type: string
                   imagePullSecrets:
                     description: |-
                       ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the
@@ -5739,6 +5746,13 @@ spec:
                   image:
                     description: Image for a starrocks deployment.
                     type: string
+                  imagePullPolicy:
+                    description: |-
+                      Image pull policy.
+                      One of Always, Never, IfNotPresent.
+                      Defaults to IfNotPresent for compatibility.
+                      More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                    type: string
                   imagePullSecrets:
                     description: |-
                       ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the
@@ -9626,6 +9640,13 @@ spec:
                   image:
                     description: Image for a starrocks deployment.
                     type: string
+                  imagePullPolicy:
+                    description: |-
+                      Image pull policy.
+                      One of Always, Never, IfNotPresent.
+                      Defaults to IfNotPresent for compatibility.
+                      More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                    type: string
                   imagePullSecrets:
                     description: |-
                       ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the
@@ -11095,6 +11116,13 @@ spec:
                   image:
                     description: Image for a starrocks deployment.
                     type: string
+                  imagePullPolicy:
+                    description: |-
+                      Image pull policy.
+                      One of Always, Never, IfNotPresent.
+                      Defaults to IfNotPresent for compatibility.
+                      More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                    type: string
                   imagePullSecrets:
                     description: |-
                       ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the

diff --git a/config/crd/bases/starrocks.com_starrockswarehouses.yaml b/config/crd/bases/starrocks.com_starrockswarehouses.yaml
@@ -1667,6 +1667,13 @@ spec:
                   image:
                     description: Image for a starrocks deployment.
                     type: string
+                  imagePullPolicy:
+                    description: |-
+                      Image pull policy.
+                      One of Always, Never, IfNotPresent.
+                      Defaults to IfNotPresent for compatibility.
+                      More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+                    type: string
                   imagePullSecrets:
                     description: |-
                       ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the

diff --git a/deploy/starrocks.com_starrocksclusters.yaml b/deploy/starrocks.com_starrocksclusters.yaml
@@ -535,6 +535,8 @@ spec:
                     type: array
                   image:
                     type: string
+                  imagePullPolicy:
+                    type: string
                   imagePullSecrets:
                     items:
                       properties:
@@ -2806,6 +2808,8 @@ spec:
                     type: array
                   image:
                     type: string
+                  imagePullPolicy:
+                    type: string
                   imagePullSecrets:
                     items:
                       properties:
@@ -4649,6 +4653,8 @@ spec:
                     type: object
                   image:
                     type: string
+                  imagePullPolicy:
+                    type: string
                   imagePullSecrets:
                     items:
                       properties:
@@ -5365,6 +5371,8 @@ spec:
                     type: array
                   image:
                     type: string
+                  imagePullPolicy:
+                    type: string
                   imagePullSecrets:
                     items:
                       properties:

diff --git a/deploy/starrocks.com_starrockswarehouses.yaml b/deploy/starrocks.com_starrockswarehouses.yaml
@@ -857,6 +857,8 @@ spec:
                     type: array
                   image:
                     type: string
+                  imagePullPolicy:
+                    type: string
                   imagePullSecrets:
                     items:
                       properties:

diff --git a/helm-charts/charts/kube-starrocks/charts/starrocks/templates/starrockscluster.yaml b/helm-charts/charts/kube-starrocks/charts/starrocks/templates/starrockscluster.yaml
@@ -18,6 +18,7 @@ spec:
     {{- end }}
     image: "{{ .Values.starrocksFESpec.image.repository }}:{{ include "starrockscluster.fe.image.tag" . }}"
     replicas: {{ .Values.starrocksFESpec.replicas }}
+    imagePullPolicy: {{ .Values.starrocksFESpec.imagePullPolicy }}
     {{- /*
     support both resources and resource for backward compatibility
     */}}
@@ -222,6 +223,7 @@ spec:
     {{- end }}
     image: "{{ .Values.starrocksBeSpec.image.repository }}:{{ include "starrockscluster.be.image.tag" . }}"
     replicas: {{ .Values.starrocksBeSpec.replicas }}
+    imagePullPolicy: {{ .Values.starrocksBeSpec.imagePullPolicy }}
     {{- /*
     support both resources and resource for backward compatibility
     */}}
@@ -441,6 +443,7 @@ spec:
     {{- if .Values.starrocksCnSpec.replicas }}
     replicas: {{ .Values.starrocksCnSpec.replicas }}
     {{- end }}
+    imagePullPolicy: {{ .Values.starrocksCnSpec.imagePullPolicy }}
     {{- if or .Values.starrocksCnSpec.serviceAccount .Values.starrocksCluster.componentValues.serviceAccount }}
     serviceAccount: {{ include "starrockscluster.cn.serviceAccount" . }}
     {{- end }}
@@ -666,6 +669,7 @@ spec:
       {{- toYaml .Values.starrocksFeProxySpec.imagePullSecrets | nindent 4 }}
     {{- end }}
     replicas: {{ .Values.starrocksFeProxySpec.replicas }}
+    imagePullPolicy: {{ .Values.starrocksFeProxySpec.imagePullPolicy }}
     resolver: {{ .Values.starrocksFeProxySpec.resolver }}
     {{- if .Values.starrocksFeProxySpec.resources }}
       {{- toYaml .Values.starrocksFeProxySpec.resources | nindent 4 }}

diff --git a/helm-charts/charts/kube-starrocks/charts/starrocks/values.yaml b/helm-charts/charts/kube-starrocks/charts/starrocks/values.yaml
@@ -126,6 +126,7 @@ starrocksFESpec:
     # image sliced by "repository:tag"
     repository: starrocks/fe-ubuntu
     tag: ""
+  imagePullPolicy: IfNotPresent
   # add annotations for fe pods. For example, if you want to config monitor for datadog, you can config the annotations.
   annotations: {}
   # If runAsNonRoot is true, the container is run as non-root user.
@@ -339,6 +340,7 @@ starrocksCnSpec:
     # image sliced by "repository:tag"
     repository: starrocks/cn-ubuntu
     tag: ""
+  imagePullPolicy: IfNotPresent
   # serviceAccount for cn access cloud service.
   serviceAccount: ""
   # add annotations for cn pods. example, if you want to config monitor for datadog, you can config the annotations.
@@ -577,6 +579,7 @@ starrocksBeSpec:
     # image sliced by "repository:tag"
     repository: starrocks/be-ubuntu
     tag: ""
+  imagePullPolicy: IfNotPresent
   # serviceAccount for be access cloud service.
   serviceAccount: ""
   # add annotations for be pods. example, if you want to config monitor for datadog, you can config the annotations.
@@ -808,6 +811,7 @@ starrocksFeProxySpec:
   # specify the fe proxy deploy or not.
   enabled: false
   replicas: 1
+  imagePullPolicy: IfNotPresent
   # default nginx:1.24.0
   image:
     repository: ""

diff --git a/helm-charts/charts/kube-starrocks/values.yaml b/helm-charts/charts/kube-starrocks/values.yaml
@@ -234,6 +234,7 @@ starrocks:
       # image sliced by "repository:tag"
       repository: starrocks/fe-ubuntu
       tag: ""
+    imagePullPolicy: IfNotPresent
     # add annotations for fe pods. For example, if you want to config monitor for datadog, you can config the annotations.
     annotations: {}
     # If runAsNonRoot is true, the container is run as non-root user.
@@ -447,6 +448,7 @@ starrocks:
       # image sliced by "repository:tag"
       repository: starrocks/cn-ubuntu
       tag: ""
+    imagePullPolicy: IfNotPresent
     # serviceAccount for cn access cloud service.
     serviceAccount: ""
     # add annotations for cn pods. example, if you want to config monitor for datadog, you can config the annotations.
@@ -685,6 +687,7 @@ starrocks:
       # image sliced by "repository:tag"
       repository: starrocks/be-ubuntu
       tag: ""
+    imagePullPolicy: IfNotPresent
     # serviceAccount for be access cloud service.
     serviceAccount: ""
     # add annotations for be pods. example, if you want to config monitor for datadog, you can config the annotations.
@@ -916,6 +919,7 @@ starrocks:
     # specify the fe proxy deploy or not.
     enabled: false
     replicas: 1
+    imagePullPolicy: IfNotPresent
     # default nginx:1.24.0
     image:
       repository: ""

diff --git a/pkg/apis/starrocks/v1/load_type.go b/pkg/apis/starrocks/v1/load_type.go
@@ -20,6 +20,7 @@ type loadInterface interface {
 
 	GetStorageVolumes() []StorageVolume
 	GetServiceAccount() string
+	GetImagePullPolicy() corev1.PullPolicy
 }
 
 type StarRocksLoadSpec struct {
@@ -48,6 +49,13 @@ type StarRocksLoadSpec struct {
 	// +optional
 	Image string `json:"image"`
 
+	// Image pull policy.
+	// One of Always, Never, IfNotPresent.
+	// Defaults to IfNotPresent for compatibility.
+	// More info: https://kubernetes.io/docs/concepts/containers/images#updating-images
+	// +optional
+	ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty"`
+
 	// ImagePullSecrets is an optional list of references to secrets in the same namespace to use for pulling any of the
 	// images used by this PodSpec. If specified, these secrets will be passed to individual puller implementations for
 	// them to use.
@@ -275,3 +283,10 @@ func (spec *StarRocksLoadSpec) GetReadinessProbeFailureSeconds() *int32 {
 func (spec *StarRocksLoadSpec) GetLifecycle() *corev1.Lifecycle {
 	return spec.Lifecycle
 }
+
+func (spec *StarRocksLoadSpec) GetImagePullPolicy() corev1.PullPolicy {
+	if spec.ImagePullPolicy == "" {
+		return corev1.PullIfNotPresent
+	}
+	return spec.ImagePullPolicy
+}
diff --git a/pkg/subcontrollers/be/be_pod.go b/pkg/subcontrollers/be/be_pod.go
@@ -74,7 +74,7 @@ func (be *BeController) buildPodTemplate(src *srapi.StarRocksCluster, config map
 		Ports:           pod.Ports(beSpec, config),
 		Env:             envs,
 		Resources:       beSpec.ResourceRequirements,
-		ImagePullPolicy: corev1.PullIfNotPresent,
+		ImagePullPolicy: beSpec.GetImagePullPolicy(),
 		VolumeMounts:    volumeMounts,
 		StartupProbe:    pod.StartupProbe(beSpec.GetStartupProbeFailureSeconds(), webServerPort, pod.HEALTH_API_PATH),
 		LivenessProbe:   pod.LivenessProbe(beSpec.GetLivenessProbeFailureSeconds(), webServerPort, pod.HEALTH_API_PATH),

diff --git a/pkg/subcontrollers/cn/cn_pod.go b/pkg/subcontrollers/cn/cn_pod.go
@@ -84,7 +84,7 @@ func (cc *CnController) buildPodTemplate(ctx context.Context, object srobject.St
 		Ports:           pod.Ports(cnSpec, config),
 		Env:             envs,
 		Resources:       cnSpec.ResourceRequirements,
-		ImagePullPolicy: corev1.PullIfNotPresent,
+		ImagePullPolicy: cnSpec.GetImagePullPolicy(),
 		VolumeMounts:    volumeMounts,
 		StartupProbe:    pod.StartupProbe(cnSpec.GetStartupProbeFailureSeconds(), webServerPort, pod.HEALTH_API_PATH),
 		LivenessProbe:   pod.LivenessProbe(cnSpec.GetLivenessProbeFailureSeconds(), webServerPort, pod.HEALTH_API_PATH),

diff --git a/pkg/subcontrollers/fe/fe_pod.go b/pkg/subcontrollers/fe/fe_pod.go
@@ -70,7 +70,7 @@ func (fc *FeController) buildPodTemplate(src *srapi.StarRocksCluster, config map
 		Env:             envs,
 		Resources:       feSpec.ResourceRequirements,
 		VolumeMounts:    volMounts,
-		ImagePullPolicy: corev1.PullIfNotPresent,
+		ImagePullPolicy: feSpec.GetImagePullPolicy(),
 		StartupProbe:    pod.StartupProbe(feSpec.GetStartupProbeFailureSeconds(), httpPort, pod.HEALTH_API_PATH),
 		LivenessProbe:   pod.LivenessProbe(feSpec.GetLivenessProbeFailureSeconds(), httpPort, pod.HEALTH_API_PATH),
 		ReadinessProbe:  pod.ReadinessProbe(feSpec.GetReadinessProbeFailureSeconds(), httpPort, pod.HEALTH_API_PATH),

diff --git a/pkg/subcontrollers/feproxy/feproxy_controller.go b/pkg/subcontrollers/feproxy/feproxy_controller.go
@@ -214,7 +214,7 @@ func (controller *FeProxyController) buildPodTemplate(src *srapi.StarRocksCluste
 		Image:           image,
 		Ports:           pod.Ports(feProxySpec, nil),
 		Resources:       feProxySpec.ResourceRequirements,
-		ImagePullPolicy: corev1.PullIfNotPresent,
+		ImagePullPolicy: feProxySpec.GetImagePullPolicy(),
 		VolumeMounts:    volumeMounts,
 		LivenessProbe:   pod.LivenessProbe(feProxySpec.GetLivenessProbeFailureSeconds(), port, "/nginx/health"),
 		ReadinessProbe:  pod.ReadinessProbe(feProxySpec.GetReadinessProbeFailureSeconds(), port, "/nginx/health"),