✨ allow specifying container proxy settings

Signed-off-by: Ivan Milchev <[email protected]>
mondoohq · May 14, 2024 · 14d45f0 · 14d45f0
1 parent f33c194
commit 14d45f0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/api/v1alpha2/mondoooperatorconfig_types.go b/api/v1alpha2/mondoooperatorconfig_types.go
@@ -28,6 +28,8 @@ type MondooOperatorConfigSpec struct {
 	SkipContainerResolution bool `json:"skipContainerResolution,omitempty"`
 	// HttpProxy specifies a proxy to use for HTTP requests to the Mondoo Platform.
 	HttpProxy *string `json:"httpProxy,omitempty"`
+	// ContainerProxy specifies a proxy to use for container images.
+	ContainerProxy *string `json:"containerProxy,omitempty"`
 }
 
 type Metrics struct {

diff --git a/api/v1alpha2/zz_generated.deepcopy.go b/api/v1alpha2/zz_generated.deepcopy.go
diff --git a/config/crd/bases/k8s.mondoo.com_mondoooperatorconfigs.yaml b/config/crd/bases/k8s.mondoo.com_mondoooperatorconfigs.yaml
@@ -40,6 +40,10 @@ spec:
           spec:
             description: MondooOperatorConfigSpec defines the desired state of MondooOperatorConfig
             properties:
+              containerProxy:
+                description: ContainerProxy specifies a proxy to use for container
+                  images.
+                type: string
               httpProxy:
                 description: HttpProxy specifies a proxy to use for HTTP requests
                   to the Mondoo Platform.

diff --git a/controllers/container_image/resources.go b/controllers/container_image/resources.go
@@ -43,6 +43,10 @@ func CronJob(image, integrationMrn, clusterUid, privateImageScanningSecretName s
 		cmd = append(cmd, []string{"--api-proxy", *cfg.Spec.HttpProxy}...)
 	}
 
+	if cfg.Spec.ContainerProxy != nil {
+		cmd = append(cmd, []string{"--container-proxy", *cfg.Spec.ContainerProxy}...)
+	}
+
 	envVars := feature_flags.AllFeatureFlagsAsEnv()
 	envVars = append(envVars, corev1.EnvVar{Name: "MONDOO_AUTO_UPDATE", Value: "false"})
 	envVars = k8s.MergeEnv(envVars, m.Spec.Containers.Env)

diff --git a/controllers/mondoooperatorconfig_controller.go b/controllers/mondoooperatorconfig_controller.go
@@ -59,8 +59,8 @@ func (r *MondooOperatorConfigReconciler) Reconcile(ctx context.Context, req ctrl
 		return ctrl.Result{}, nil
 	}
 
-	if config.Spec.HttpProxy != nil {
-		urlParsed, err := url.Parse(*config.Spec.HttpProxy)
+	if config.Spec.ContainerProxy != nil {
+		urlParsed, err := url.Parse(*config.Spec.ContainerProxy)
 		if err != nil {
 			return ctrl.Result{}, err
 		}