Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MGMT-18561: MGMT-18562: Add kube api support for adding per cluster mirror registry in AgentClusterInstall #6868

Open
wants to merge 9 commits into
base: master
Choose a base branch
from

Conversation

eliorerz
Copy link
Contributor

@eliorerz eliorerz commented Oct 6, 2024

List all the issues related to this PR

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

/cc @eliorerz

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Oct 6, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 6, 2024

@eliorerz: This pull request references MGMT-18561 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.18.0" version, but no target version was set.

In response to this:

/cc @eliorerz

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

Copy link

openshift-ci bot commented Oct 6, 2024

@eliorerz: GitHub didn't allow me to request PR reviews from the following users: eliorerz.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc @eliorerz

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci openshift-ci bot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 6, 2024
Copy link

openshift-ci bot commented Oct 6, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eliorerz

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added api-review Categorizes an issue or PR as actively needing an API review. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Oct 6, 2024
Copy link

codecov bot commented Oct 6, 2024

Codecov Report

Attention: Patch coverage is 59.39850% with 108 lines in your changes missing coverage. Please review.

Project coverage is 68.64%. Comparing base (26185f1) to head (75b1133).
Report is 4 commits behind head on master.

Files with missing lines Patch % Lines
pkg/mirrorregistries/cluster_image_registry.go 38.20% 53 Missing and 2 partials ⚠️
internal/installcfg/builder/builder.go 67.74% 14 Missing and 6 partials ⚠️
...oller/controllers/clusterdeployments_controller.go 65.71% 8 Missing and 4 partials ⚠️
...rnal/controller/controllers/infraenv_controller.go 37.50% 6 Missing and 4 partials ⚠️
internal/ignition/discovery.go 68.00% 5 Missing and 3 partials ⚠️
internal/bminventory/inventory.go 92.59% 0 Missing and 2 partials ⚠️
pkg/mirrorregistries/generator.go 83.33% 1 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6868      +/-   ##
==========================================
- Coverage   68.71%   68.64%   -0.08%     
==========================================
  Files         249      252       +3     
  Lines       37440    37766     +326     
==========================================
+ Hits        25727    25924     +197     
- Misses       9414     9519     +105     
- Partials     2299     2323      +24     
Files with missing lines Coverage Δ
internal/bminventory/inventory_v2_handlers.go 56.60% <100.00%> (ø)
...ler/controllers/preprovisioningimage_controller.go 81.81% <100.00%> (ø)
internal/oc/release.go 73.51% <100.00%> (ø)
pkg/mirrorregistries/generator.go 67.64% <83.33%> (+3.06%) ⬆️
internal/bminventory/inventory.go 70.70% <92.59%> (ø)
internal/ignition/discovery.go 69.69% <68.00%> (+0.64%) ⬆️
...rnal/controller/controllers/infraenv_controller.go 63.02% <37.50%> (-0.88%) ⬇️
...oller/controllers/clusterdeployments_controller.go 71.59% <65.71%> (-0.28%) ⬇️
internal/installcfg/builder/builder.go 80.00% <67.74%> (-2.93%) ⬇️
pkg/mirrorregistries/cluster_image_registry.go 38.20% <38.20%> (ø)

... and 13 files with indirect coverage changes

@eliorerz eliorerz changed the title MGMT-18561: MGMT-18562: Add kube api support for adding mirror registry in agent cluster install [WIP] MGMT-18561: MGMT-18562: Add kube api support for adding mirror registry in agent cluster install Oct 6, 2024
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 6, 2024
@eliorerz eliorerz marked this pull request as draft October 7, 2024 12:30
@eliorerz eliorerz force-pushed the MGMT-18013-Add-KubeAPI-support-for-adding-mirror-registry-in-AgentClusterInstall-updated branch from 3599097 to ffc0a0d Compare October 7, 2024 12:31
@eliorerz
Copy link
Contributor Author

eliorerz commented Oct 7, 2024

/test edge-subsystem-kubeapi-aws

@eliorerz eliorerz force-pushed the MGMT-18013-Add-KubeAPI-support-for-adding-mirror-registry-in-AgentClusterInstall-updated branch from 32d710e to 404f4ed Compare October 11, 2024 23:22
@eliorerz eliorerz marked this pull request as ready for review October 11, 2024 23:23
@eliorerz eliorerz changed the title [WIP] MGMT-18561: MGMT-18562: Add kube api support for adding mirror registry in agent cluster install MGMT-18561: MGMT-18562: Add kube api support for adding mirror registry in agent cluster install Oct 11, 2024
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 11, 2024
@eliorerz
Copy link
Contributor Author

/retest

@eliorerz eliorerz changed the title MGMT-18561: MGMT-18562: Add kube api support for adding mirror registry in agent cluster install MGMT-18561: MGMT-18562: Add kube api support for adding per cluster mirror registry in agent cluster install Oct 12, 2024
@eliorerz
Copy link
Contributor Author

/retest

1 similar comment
@eliorerz
Copy link
Contributor Author

/retest

@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 14, 2024

@eliorerz: This pull request references MGMT-18561 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "4.18.0" version, but no target version was set.

In response to this:

List all the issues related to this PR

  • New Feature
  • Enhancement
  • Bug fix
  • Tests
  • Documentation
  • CI/CD

What environments does this code impact?

  • Automation (CI, tools, etc)
  • Cloud
  • Operator Managed Deployments
  • None

How was this code tested?

  • assisted-test-infra environment
  • dev-scripts environment
  • Reviewer's test appreciated
  • Waiting for CI to do a full test run
  • Manual (Elaborate on how it was tested)
  • No tests needed

/cc @eliorerz

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@eliorerz eliorerz changed the title MGMT-18561: MGMT-18562: Add kube api support for adding per cluster mirror registry in agent cluster install MGMT-18561: MGMT-18562: Add kube api support for adding per cluster mirror registry in AgentClusterInstall Oct 14, 2024
@CrystalChun
Copy link
Contributor

Tested the changes and verified it's trying the mirror registry 👍

     Failed to pull image "quay.io/cchun/testing@sha256:e1f8ac471c4cd63333590309829aa8f1210a62571179d39fc6989ab6a9c09e2e": rpc error: code = Unknown desc = (Mirrors also failed: [10.1.155.10:5000/cchun/testing@sha256:e1f8ac471c4cd63333590309829aa8f1210a62571179d39fc6989ab6a9c09e2e: pinging container registry 10.1.155.10:5000: Get "https://10.1.155.10:5000/v2/": http: server gave HTTP response to HTTPS client]): quay.io/cchun/testing@sha256:e1f8ac471c4cd63333590309829aa8f1210a62571179d39fc6989ab6a9c09e2e: reading manifest sha256:e1f8ac471c4cd63333590309829aa8f1210a62571179d39fc6989ab6a9c09e2e in quay.io/cchun/testing: unauthorized: access to the requested resource is not authorized

@eliorerz
Copy link
Contributor Author

/retest

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 17, 2024
Comment on lines 528 to 540
// MirrorRegistryConfigurationInfo holds the mirror registry configuration details
type MirrorRegistryConfigurationInfo struct {
ImageDigestMirrors []configv1.ImageDigestMirrors `json:"imageDigestMirrors,omitempty"`
ImageTagMirrors []configv1.ImageTagMirrors `json:"imageTagMirrors,omitempty"`
Insecure []string `json:"insecure,omitempty"`
}

// MirrorRegistryConfiguration holds the mirror registry configuration details
type MirrorRegistryConfiguration struct {
MirrorRegistryConfigurationInfo *MirrorRegistryConfigurationInfo `json:"mirrorRegistryConfigurationInfo,omitempty"`
RegistriesConf string `json:"registriesConf,omitempty"`
CaBundleCrt string `json:"caBundleCrt,omitempty"`
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These two types have the same description, yet they are different, can we distinguish between them in some meaningful way or combine them?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One is used to holds the data and the other is to "only" hold the data that we want to display to the user in the status. I'll update the documentation.

// +optional
OSImageVersion string `json:"osImageVersion,omitempty"`

// MirrorRegistryRef is a reference to ClusterMirrorRegistry ConfigMap that holds the registries toml
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This says "cluster" but an InfraEnv shouldn't have cluster data. I think we should have a better description for this.

Copy link
Contributor Author

@eliorerz eliorerz Oct 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That aws a mistake, I fofrgot to change the documentation when changed the property

internal/bminventory/inventory.go Show resolved Hide resolved
// It will convert it to an ImageDigestMirrorSet CR and/or an ImageTagMirrorSet.
// It will return these as marshalled JSON strings, and it will return a string list of insecure
// mirror registries (if they exist)
func GetImageRegistries(registryTOML string) ([]configv1.ImageDigestMirrors, []configv1.ImageTagMirrors, []string, error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we deduplicate and of this with ExtractLocationMirrorDataFromRegistriesFromToml?


// MirrorRegistryConfigurationInfo contains the mirror registry configuration for this cluster
// +optional
MirrorRegistryConfigurationInfo *MirrorRegistryConfigurationInfo `json:"mirrorRegistryConfigurationInfo,omitempty"`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we setting this in status? Do you think it's very important to tell the user what they told us or are we using this in some way?

Copy link
Contributor Author

@eliorerz eliorerz Oct 27, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Showing the user this information conveys two main points:

  1. Their TOML file is correctly configured and successfully fetching the passed information.
  2. When the user revisits this information, they can view the currently applied mirror registry configuration.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Their TOML file is correctly configured and successfully fetching the passed information

Wouldn't we fail and set SpecSynced condition with a helpful error of the file were malformed or we hit some other issue?

When the user revisits this information, they can view the currently applied mirror registry configuration.

🤷 I'm not sure it's more valuable to have multiple places where this is listed out (the original configmap and this status). If we say the spec is synced and they set the reference then that should be enough.

I would only expect something in status if it's being defined/decided by the controller rather than just repackaging information the user sent to us.

@eliorerz eliorerz force-pushed the MGMT-18013-Add-KubeAPI-support-for-adding-mirror-registry-in-AgentClusterInstall-updated branch from 404f4ed to 110b923 Compare October 27, 2024 12:32
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 27, 2024
@eliorerz
Copy link
Contributor Author

/retest

1 similar comment
@eliorerz
Copy link
Contributor Author

/retest

@eliorerz eliorerz force-pushed the MGMT-18013-Add-KubeAPI-support-for-adding-mirror-registry-in-AgentClusterInstall-updated branch from d9bfc7a to 203d61f Compare October 28, 2024 08:39
Copy link

openshift-ci bot commented Oct 28, 2024

@eliorerz: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test e2e-agent-compact-ipv4
  • /test edge-assisted-operator-catalog-publish-verify
  • /test edge-ci-index
  • /test edge-e2e-ai-operator-ztp
  • /test edge-e2e-ai-operator-ztp-sno-day2-workers
  • /test edge-e2e-ai-operator-ztp-sno-day2-workers-late-binding
  • /test edge-e2e-metal-assisted
  • /test edge-e2e-metal-assisted-4-12
  • /test edge-e2e-metal-assisted-4-control-planes-4-17
  • /test edge-e2e-metal-assisted-4-control-planes-4-18
  • /test edge-e2e-metal-assisted-5-control-planes-4-17
  • /test edge-e2e-metal-assisted-5-control-planes-4-18
  • /test edge-e2e-metal-assisted-cnv-4-16
  • /test edge-e2e-metal-assisted-cnv-4-17
  • /test edge-e2e-metal-assisted-lvm
  • /test edge-e2e-metal-assisted-mtv-4-17
  • /test edge-e2e-metal-assisted-odf-4-16
  • /test edge-e2e-metal-assisted-odf-4-17
  • /test edge-images
  • /test edge-lint
  • /test edge-subsystem-aws
  • /test edge-subsystem-kubeapi-aws
  • /test edge-unit-test
  • /test edge-verify-generated-code
  • /test images
  • /test mce-images

The following commands are available to trigger optional jobs:

  • /test e2e-agent-ha-dualstack
  • /test e2e-agent-sno-ipv6
  • /test edge-e2e-ai-operator-disconnected-capi
  • /test edge-e2e-ai-operator-ztp-3masters
  • /test edge-e2e-ai-operator-ztp-capi
  • /test edge-e2e-ai-operator-ztp-compact-day2-masters
  • /test edge-e2e-ai-operator-ztp-compact-day2-workers
  • /test edge-e2e-ai-operator-ztp-disconnected
  • /test edge-e2e-ai-operator-ztp-hypershift-zero-nodes
  • /test edge-e2e-ai-operator-ztp-multiarch-3masters-ocp
  • /test edge-e2e-ai-operator-ztp-multiarch-sno-ocp
  • /test edge-e2e-ai-operator-ztp-node-labels
  • /test edge-e2e-ai-operator-ztp-remove-node
  • /test edge-e2e-ai-operator-ztp-sno-day2-masters
  • /test edge-e2e-ai-operator-ztp-sno-day2-workers-ignitionoverride
  • /test edge-e2e-metal-assisted-4-13
  • /test edge-e2e-metal-assisted-4-14
  • /test edge-e2e-metal-assisted-4-15
  • /test edge-e2e-metal-assisted-4-16
  • /test edge-e2e-metal-assisted-bond
  • /test edge-e2e-metal-assisted-bond-4-14
  • /test edge-e2e-metal-assisted-day2
  • /test edge-e2e-metal-assisted-day2-arm-workers
  • /test edge-e2e-metal-assisted-day2-single-node
  • /test edge-e2e-metal-assisted-external
  • /test edge-e2e-metal-assisted-external-4-14
  • /test edge-e2e-metal-assisted-ipv4v6
  • /test edge-e2e-metal-assisted-ipv6
  • /test edge-e2e-metal-assisted-kube-api-late-binding-single-node
  • /test edge-e2e-metal-assisted-kube-api-late-unbinding-ipv4-single-node
  • /test edge-e2e-metal-assisted-kube-api-net-suite
  • /test edge-e2e-metal-assisted-mce-4-16
  • /test edge-e2e-metal-assisted-mce-sno-4-16
  • /test edge-e2e-metal-assisted-metallb
  • /test edge-e2e-metal-assisted-none
  • /test edge-e2e-metal-assisted-onprem
  • /test edge-e2e-metal-assisted-single-node
  • /test edge-e2e-metal-assisted-static-ip-suite
  • /test edge-e2e-metal-assisted-static-ip-suite-4-14
  • /test edge-e2e-metal-assisted-tang
  • /test edge-e2e-metal-assisted-tpmv2
  • /test edge-e2e-metal-assisted-upgrade-agent
  • /test edge-e2e-nutanix-assisted
  • /test edge-e2e-nutanix-assisted-2workers
  • /test edge-e2e-nutanix-assisted-4-14
  • /test edge-e2e-oci-assisted
  • /test edge-e2e-oci-assisted-4-14
  • /test edge-e2e-oci-assisted-iscsi
  • /test edge-e2e-vsphere-assisted
  • /test edge-e2e-vsphere-assisted-4-14
  • /test edge-e2e-vsphere-assisted-4-15
  • /test edge-e2e-vsphere-assisted-4-16
  • /test edge-e2e-vsphere-assisted-umn
  • /test okd-scos-images
  • /test push-pr-image

Use /test all to run the following jobs that were automatically triggered:

  • pull-ci-openshift-assisted-service-master-e2e-agent-compact-ipv4
  • pull-ci-openshift-assisted-service-master-edge-assisted-operator-catalog-publish-verify
  • pull-ci-openshift-assisted-service-master-edge-ci-index
  • pull-ci-openshift-assisted-service-master-edge-e2e-ai-operator-disconnected-capi
  • pull-ci-openshift-assisted-service-master-edge-e2e-ai-operator-ztp
  • pull-ci-openshift-assisted-service-master-edge-e2e-ai-operator-ztp-capi
  • pull-ci-openshift-assisted-service-master-edge-e2e-metal-assisted
  • pull-ci-openshift-assisted-service-master-edge-images
  • pull-ci-openshift-assisted-service-master-edge-lint
  • pull-ci-openshift-assisted-service-master-edge-subsystem-aws
  • pull-ci-openshift-assisted-service-master-edge-subsystem-kubeapi-aws
  • pull-ci-openshift-assisted-service-master-edge-unit-test
  • pull-ci-openshift-assisted-service-master-edge-verify-generated-code
  • pull-ci-openshift-assisted-service-master-images
  • pull-ci-openshift-assisted-service-master-mce-images

In response to this:

/test ci/prow/edge-subsystem-kubeapi-aws

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@eliorerz
Copy link
Contributor Author

/test edge-subsystem-kubeapi-aws

@eliorerz
Copy link
Contributor Author

/retest

@CrystalChun
Copy link
Contributor

Reverified the latest changes are still pulling from the mirror registry after the rebase

  Warning  Failed          78s (x2 over 94s)  kubelet            Failed to pull image "quay.io/cchun/testing@sha256:e1f8ac471c4cd63333590309829aa8f1210a62571179d39fc6989ab6a9c09e2e": (Mirrors also failed: [10.1.178.25:5000/cchun/testing@sha256:e1f8ac471c4cd63333590309829aa8f1210a62571179d39fc6989ab6a9c09e2e: pinging container registry 10.1.178.25:5000: Get "https://10.1.178.25:5000/v2/": http: server gave HTTP response to HTTPS client]): quay.io/cchun/testing@sha256:e1f8ac471c4cd63333590309829aa8f1210a62571179d39fc6989ab6a9c09e2e: reading manifest sha256:e1f8ac471c4cd63333590309829aa8f1210a62571179d39fc6989ab6a9c09e2e in quay.io/cchun/testing: unauthorized: access to the requested resource is not authorized

@@ -2325,3 +2346,27 @@ func getClusterDeploymentAdminKubeConfigSecretName(cd *hivev1.ClusterDeployment)
}
return fmt.Sprintf(adminKubeConfigStringTemplate, cd.Name)
}

// processMirrorRegistryConfig retrieves the mirror registry configuration from the referenced ConfigMap
func (r *ClusterDeploymentsReconciler) processMirrorRegistryConfig(ctx context.Context, log logrus.FieldLogger, clusterInstall *hiveext.AgentClusterInstall) (*hiveext.MirrorRegistryConfiguration, error) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should label this configmap with the backup label.

I think there's a function already for that.

Copy link
Contributor Author

@eliorerz eliorerz Oct 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll add this logic (EnsureConfigMapIsLabelled) at the end of ProcessMirrorRegistryConfig that way it will ensure backup for both create and update

@@ -228,8 +229,13 @@ func (r *InfraEnvReconciler) updateInfraEnv(ctx context.Context, log logrus.Fiel
updateParams.InfraEnvUpdateParams.KernelArguments = internalKernelArgs(infraEnv.Spec.KernelArguments)
}

// UpdateInfraEnvInternal will generate an ISO only if there it was not generated before,
return r.Installer.UpdateInfraEnvInternal(ctx, updateParams, nil)
mirrorRegistryConfiguration, err := mirrorregistries.ProcessMirrorRegistryConfig(ctx, log, r.Client, infraEnv.Spec.MirrorRegistryRef)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same in these cases, for both create and update we should ensure this configmap is backed up.

@@ -546,9 +547,14 @@ func (r *PreprovisioningImageReconciler) AddIronicAgentToInfraEnv(ctx context.Co
return false, err
}

mirrorRegistryConfiguration, err := mirrorregistries.ProcessMirrorRegistryConfig(ctx, log, r.Client, infraEnv.Spec.MirrorRegistryRef)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This function is only intended to set the internal override. We shouldn't need to also consider something the infraenv controller is already doing here. It's safe to remove this.

@carbonin
Copy link
Member

Did you consider adding the mirror registries config to the infraenv/cluster in the database? Why not go that way?

@eliorerz
Copy link
Contributor Author

Did you consider adding the mirror registries config to the infraenv/cluster in the database? Why not go that way?

Yes, this was my initial approach, but after discussing it with several people and identifying multiple edge cases (such as sync issues) without any real benefits, I decided not to implement it in the database.

Copy link

openshift-ci bot commented Oct 29, 2024

@eliorerz: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/edge-e2e-metal-assisted-mtv-4-17 203d61f link true /test edge-e2e-metal-assisted-mtv-4-17

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@@ -5897,7 +5906,7 @@ func (b *bareMetalInventory) V2DownloadInfraEnvFiles(ctx context.Context, params
switch params.FileName {
case "discovery.ign":
discoveryIsoType := swag.StringValue(params.DiscoveryIsoType)
content, err = b.IgnitionBuilder.FormatDiscoveryIgnitionFile(ctx, infraEnv, b.IgnitionConfig, false, b.authHandler.AuthType(), discoveryIsoType)
content, err = b.IgnitionBuilder.FormatDiscoveryIgnitionFile(ctx, infraEnv, b.IgnitionConfig, false, b.authHandler.AuthType(), discoveryIsoType, nil)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means this override won't get into the discovery image. Is that okay?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feels like this really needs to be in the database for this to work.

Copy link
Member

@carbonin carbonin Oct 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
api-review Categorizes an issue or PR as actively needing an API review. approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants