Added imagePullPolicy option to CRD

api/v1alpha1/opentelemetrycollector_types.go

@@ -36,6 +36,11 @@ type OpenTelemetryCollectorSpec struct {
 	// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
 	Replicas *int32 `json:"replicas,omitempty"`
 
+	// ImagePullPolicy indicates the pull policy to be used for retrieving the container image (Always, Never, IfNotPresent)
+	// +optional
+	// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
+	ImagePullPolicy v1.PullPolicy `json:"imagePullPolicy,omitempty"`
+
 	// Image indicates the container image to use for the OpenTelemetry Collector.
 	// +optional
 	// +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true

bundle/manifests/opentelemetry-operator.clusterserviceversion.yaml

@@ -25,7 +25,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
     repository: github.com/open-telemetry/opentelemetry-operator
     support: OpenTelemetry Community
-  name: opentelemetry-operator.v0.33.0
+  name: opentelemetry-operator.v0.33.0-5-g3efd850
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -206,7 +206,7 @@ spec:
                 - --enable-leader-election
                 command:
                 - /manager
-                image: quay.io/opentelemetry/opentelemetry-operator:v0.33.0
+                image: controller
                 name: manager
                 ports:
                 - containerPort: 9443
@@ -298,7 +298,7 @@ spec:
   maturity: alpha
   provider:
     name: OpenTelemetry Community
-  version: 0.33.0
+  version: 0.33.0-5-g3efd850
   webhookdefinitions:
   - admissionReviewVersions:
     - v1

bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml

@@ -190,6 +190,10 @@ spec:
                 description: Image indicates the container image to use for the OpenTelemetry
                   Collector.
                 type: string
+              imagePullPolicy:
+                description: ImagePullPolicy indicates the pull policy to be used
+                  for retrieving the container image (Always, Never, IfNotPresent)
+                type: string
               mode:
                 description: Mode represents how the collector should be deployed
                   (deployment, daemonset, statefulset or sidecar)

config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml

@@ -178,6 +178,10 @@ spec:
                 description: Image indicates the container image to use for the OpenTelemetry
                   Collector.
                 type: string
+              imagePullPolicy:
+                description: ImagePullPolicy indicates the pull policy to be used
+                  for retrieving the container image (Always, Never, IfNotPresent)
+                type: string
               mode:
                 description: Mode represents how the collector should be deployed
                   (deployment, daemonset, statefulset or sidecar)

docs/otelcol_cr_spec.md

@@ -37,6 +37,9 @@ spec:
 
   // +optional Image indicates the container image to use for the OpenTelemetry Collector.
   image: ""
+
+  // +optional ImagePullPolicy indicates what image pull policy to be used to retrieve the container image to use for the OpenTelemetry Collector.
+  imagePullPolicy: ""
 
   // +optional ServiceAccount indicates the name of an existing service account to use with this instance.
   serviceAccount: ""

pkg/collector/container.go

@@ -71,6 +71,7 @@ func Container(cfg config.Config, logger logr.Logger, otelcol v1alpha1.OpenTelem
 	return corev1.Container{
 		Name:            naming.Container(),
 		Image:           image,
+		ImagePullPolicy: otelcol.Spec.ImagePullPolicy,
 		VolumeMounts:    volumeMounts,
 		Args:            args,
 		Env:             envVars,

pkg/collector/container_test.go

@@ -222,3 +222,19 @@ func TestContainerArgs(t *testing.T) {
 	assert.Contains(t, c.Args, "--metrics-level=detailed")
 	assert.Contains(t, c.Args, "--log-level=debug")
 }
+
+func TestContainerImagePullPolicy(t *testing.T) {
+	// prepare
+	otelcol := v1alpha1.OpenTelemetryCollector{
+		Spec: v1alpha1.OpenTelemetryCollectorSpec{
+			ImagePullPolicy: corev1.PullIfNotPresent,
+		},
+	}
+	cfg := config.New()
+
+	// test
+	c := Container(cfg, logger, otelcol)
+
+	// verify
+	assert.Equal(t, c.ImagePullPolicy, corev1.PullIfNotPresent)
+}