MGMT-19792: Add discovery ignition URL to the infraenv status

api/v1beta1/infraenv_types.go

@@ -202,6 +202,9 @@ type BootArtifacts struct {
 	// IpxeScriptURL specifies an HTTP/S URL that contains the iPXE script
 	// +optional
 	IpxeScriptURL string `json:"ipxeScript"`
+	// DiscoveryIgnitionURL specifies an HTTP/S URL that contains the discovery ignition
+	// +optional
+	DiscoveryIgnitionURL string `json:"discoveryIgnitionURL"`
 }
 
 // +kubebuilder:object:root=true

config/crd/bases/agent-install.openshift.io_infraenvs.yaml

@@ -294,6 +294,10 @@ spec:
               bootArtifacts:
                 description: BootArtifacts specifies the URLs for each boot artifact
                 properties:
+                  discoveryIgnitionURL:
+                    description: DiscoveryIgnitionURL specifies an HTTP/S URL that
+                      contains the discovery ignition
+                    type: string
                   initrd:
                     description: InitrdURL specifies an HTTP/S URL that contains the
                       initrd

config/crd/resources.yaml

@@ -3213,6 +3213,10 @@ spec:
               bootArtifacts:
                 description: BootArtifacts specifies the URLs for each boot artifact
                 properties:
+                  discoveryIgnitionURL:
+                    description: DiscoveryIgnitionURL specifies an HTTP/S URL that
+                      contains the discovery ignition
+                    type: string
                   initrd:
                     description: InitrdURL specifies an HTTP/S URL that contains the
                       initrd

deploy/olm-catalog/manifests/agent-install.openshift.io_infraenvs.yaml

@@ -304,6 +304,10 @@ spec:
               bootArtifacts:
                 description: BootArtifacts specifies the URLs for each boot artifact
                 properties:
+                  discoveryIgnitionURL:
+                    description: DiscoveryIgnitionURL specifies an HTTP/S URL that
+                      contains the discovery ignition
+                    type: string
                   initrd:
                     description: InitrdURL specifies an HTTP/S URL that contains the
                       initrd

internal/controller/controllers/infraenv_controller.go

@@ -642,18 +642,38 @@ func (r *InfraEnvReconciler) setSignedBootArtifactURLs(infraEnv *aiv1beta1.Infra
 	if err != nil {
 		return err
 	}
-	baseURL, err := url.Parse(r.ServiceBaseURL)
+	scriptURL, err := url.Parse(r.ServiceBaseURL)
 	if err != nil {
 		return err
 	}
 	// ASC may be configured to use http in ipxe artifact URLs so that all ipxe clients could consume those
 	if r.InsecureIPXEURLs {
-		baseURL.Scheme = "http"
+		scriptURL.Scheme = "http"
 	}
-	baseURL.Path = path.Join(baseURL.Path, filesURL.Path)
-	baseURL.RawQuery = filesURL.RawQuery
+	scriptURL.Path = path.Join(scriptURL.Path, filesURL.Path)
+	scriptURL.RawQuery = filesURL.RawQuery
 
-	infraEnv.Status.BootArtifacts.IpxeScriptURL, err = signURL(baseURL.String(), r.AuthType, infraEnvID, gencrypto.InfraEnvKey)
+	infraEnv.Status.BootArtifacts.IpxeScriptURL, err = signURL(scriptURL.String(), r.AuthType, infraEnvID, gencrypto.InfraEnvKey)
+	if err != nil {
+		return err
+	}
+
+	builder = &installer.V2DownloadInfraEnvFilesURL{
+		InfraEnvID: strfmt.UUID(infraEnvID),
+		FileName:   "discovery.ign",
+	}
+	filesURL, err = builder.Build()
+	if err != nil {
+		return err
+	}
+	ignitionURL, err := url.Parse(r.ServiceBaseURL)
+	if err != nil {
+		return err
+	}
+	ignitionURL.Path = path.Join(ignitionURL.Path, filesURL.Path)
+	ignitionURL.RawQuery = filesURL.RawQuery
+
+	infraEnv.Status.BootArtifacts.DiscoveryIgnitionURL, err = signURL(ignitionURL.String(), r.AuthType, infraEnvID, gencrypto.InfraEnvKey)
 	if err != nil {
 		return err
 	}

internal/controller/controllers/infraenv_controller_test.go

@@ -383,6 +383,40 @@ var _ = Describe("infraEnv reconcile", func() {
 		Expect(scriptURL.Query().Has("ipxe_script_type")).To(BeFalse())
 	})
 
+	It("sets the discovery ignition boot artifact url", func() {
+		dbInfraEnv := &common.InfraEnv{
+			GeneratedAt: strfmt.DateTime(time.Now()),
+			InfraEnv: models.InfraEnv{
+				ID:              &sId,
+				CPUArchitecture: infraEnvArch,
+				DownloadURL:     "https://images.example.com/images/best-image",
+			},
+		}
+		mockInstallerInternal.EXPECT().GetInfraEnvByKubeKey(gomock.Any()).Return(backendInfraEnv, nil)
+		mockInstallerInternal.EXPECT().ValidatePullSecret(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).Return(nil)
+		mockInstallerInternal.EXPECT().UpdateInfraEnvInternal(gomock.Any(), gomock.Any(), nil, nil).Return(dbInfraEnv, nil).Times(1)
+		kubeInfraEnv := newInfraEnvImage("myInfraEnv", testNamespace, aiv1beta1.InfraEnvSpec{
+			PullSecretRef: &corev1.LocalObjectReference{Name: "pull-secret"},
+		})
+		Expect(c.Create(ctx, kubeInfraEnv)).To(Succeed())
+
+		_, err := ir.Reconcile(ctx, newInfraEnvRequest(kubeInfraEnv))
+		Expect(err).ToNot(HaveOccurred())
+
+		key := types.NamespacedName{
+			Namespace: testNamespace,
+			Name:      "myInfraEnv",
+		}
+		Expect(c.Get(ctx, key, kubeInfraEnv)).To(BeNil())
+
+		ignitionURL, err := url.Parse(kubeInfraEnv.Status.BootArtifacts.DiscoveryIgnitionURL)
+		Expect(err).ToNot(HaveOccurred())
+		Expect(ignitionURL.Scheme).To(Equal("https"))
+		Expect(ignitionURL.Host).To(Equal("www.acme.com"))
+		Expect(ignitionURL.Path).To(Equal(fmt.Sprintf("/api/assisted-install/v2/infra-envs/%s/downloads/files", sId)))
+		Expect(ignitionURL.Query().Get("file_name")).To(Equal("discovery.ign"))
+	})
+
 	Context("discovery kernel arguments", func() {
 		encodeKernelArguments := func(kargs []aiv1beta1.KernelArgument) *string {
 			internalKargs := internalKernelArgs(kargs)