From 43c43c61238f0fd4c4bba40b2a188e98e0ae1fe0 Mon Sep 17 00:00:00 2001 From: Ricardo Noriega Date: Thu, 3 Aug 2023 16:58:17 +0200 Subject: [PATCH 1/2] Set default iso target to edge-installer as per docs Signed-off-by: Ricardo Noriega --- internal/controller/imagebuilderimage_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/controller/imagebuilderimage_controller.go b/internal/controller/imagebuilderimage_controller.go index 776a2b5..e12e3ff 100644 --- a/internal/controller/imagebuilderimage_controller.go +++ b/internal/controller/imagebuilderimage_controller.go @@ -43,7 +43,7 @@ import ( const ubiImage = "registry.access.redhat.com/ubi9:latest" const utilsImage = "quay.io/cgament/composer-cli" const imageBuilderImageLabel = "osbuild-operator-image" -const defaultIsoTarget = "edge-simplified-installer" +const defaultIsoTarget = "edge-installer" const defaultBlueprintTemplate = `name = "{{ .Name }}" version = "0.0.1" modules = [] From 11410de54b44d0cadd6279ecf09c2a0fc6d93d94 Mon Sep 17 00:00:00 2001 From: Ricardo Noriega Date: Thu, 3 Aug 2023 17:36:19 +0200 Subject: [PATCH 2/2] Replace NGINX from Docker to avoid rate limits Signed-off-by: Ricardo Noriega --- internal/controller/imagebuilderimage_controller.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/controller/imagebuilderimage_controller.go b/internal/controller/imagebuilderimage_controller.go index e12e3ff..3f6b491 100644 --- a/internal/controller/imagebuilderimage_controller.go +++ b/internal/controller/imagebuilderimage_controller.go @@ -507,8 +507,8 @@ func (r *ImageBuilderImageReconciler) WebDeployment(objectMeta metav1.ObjectMeta Spec: corev1.PodSpec{ Containers: []corev1.Container{ { - Name: "nginx", - Image: "docker.io/nginxinc/nginx-unprivileged", + Name: "httpd", + Image: "registry.redhat.io/rhel9/httpd-24:latest", Resources: corev1.ResourceRequirements{ Limits: corev1.ResourceList{ corev1.ResourceCPU: resource.MustParse("500m"), @@ -523,7 +523,7 @@ func (r *ImageBuilderImageReconciler) WebDeployment(objectMeta metav1.ObjectMeta VolumeMounts: []corev1.VolumeMount{ { Name: "data-pv", - MountPath: "/usr/share/nginx/html/", + MountPath: "/var/www/html/", SubPath: imageName, }, },