OCPBUGS-55300: For agent-installer remove bypass of manifest generation #7606

bfournie · 2025-04-23T23:36:28Z

When OVE UI uses the downloads/credentials endpoint the API handler generates the InstallConfig for the agent-based installer in order to make the credentials available in the Ready state. In order to prevent overwriting the kubeadmin-password, the generation of the InstallConfig the second time was bypassed (#7546). This inadvertently prevented the operator manifests from also being generated, and since the OVE UI configures the operators after it retrieves the credentials, the operators are not correctly installed.

This fix removes the bypass of the GenerateInstallConfig. To prevent the kubeadmin-password overwrite a installer change has been made openshift/installer#9679

List all the issues related to this PR

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

Checklist

Title and description added to both, commit and PR.
Relevant issues have been associated (see CONTRIBUTING guide)
This change does not require a documentation update (docstring, docs, README, etc)
Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

Are the title and description (in both PR and commit) meaningful and clear?
Is there a bug required (and linked) for this change?
Should this PR be backported?

openshift-ci-robot · 2025-04-23T23:36:35Z

@bfournie: This pull request references Jira Issue OCPBUGS-55300, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.19.0) matches configured target version for branch (4.19.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @mhanss

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

When OVE UI uses the downloads/credentials endpoint the API handler generates the InstallConfig for the agent-based installer in order to make the credentials available in the Ready state. In order to prevent overwriting the kubeadmin-password, the generation of the InstallConfig the second time was bypassed (#7546). This inadvertently prevented the operator manifests from also being generated, and since the OVE UI configures the operators after it retrieves the credentials, the operators are not correctly installed.

This fix removes the bypass of the GenerateInstallConfig and skips the upload of the kubeadmin-password if it has already been uploaded in order to prevent overwriting it.

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

Checklist

Title and description added to both, commit and PR.

Relevant issues have been associated (see CONTRIBUTING guide)

This change does not require a documentation update (docstring, docs, README, etc)

Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

Are the title and description (in both PR and commit) meaningful and clear?

Is there a bug required (and linked) for this change?

Should this PR be backported?

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.

codecov · 2025-04-24T00:52:30Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 68.05%. Comparing base (5099cdf) to head (60ead81).
Report is 8 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #7606      +/-   ##
==========================================
+ Coverage   67.34%   68.05%   +0.71%     
==========================================
  Files         335      335              
  Lines       42363    44113    +1750     
==========================================
+ Hits        28530    30022    +1492     
- Misses      11261    11330      +69     
- Partials     2572     2761     +189

see 9 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

andfasano · 2025-04-24T09:35:33Z

internal/ignition/installmanifests.go

+func skipAgentUpload(ctx context.Context, key string, s3Client s3wrapper.API) bool {
+	skipFiles := []string{
+		"kubeadmin-password",
+		"99_kubeadmin-password-secret.yaml",


From a quick test the console login is still broken. The password update is skipped, but it seems that "99_kubeadmin-password-secret.yaml" is generated before (so this skip is ignored here essentially), so very likely it's stil being generated with the new kubeadmin-password.hash

When OVE UI uses the downloads/credentials endpoint the API handler generates the InstallConfig for the agent-based installer in order to make the credentials available in the Ready state. In order to prevent overwriting the kubeadmin-password, the generation of the InstallConfig the second time was bypassed (openshift#7546). This inadvertently prevented the operator manifests from also being generated, and since the OVE UI configures the operators after it retrieves the credentials, the operators are not correctly installed. This fix removes the bypass of the GenerateInstallConfig and skips the upload of the kubeadmin-password if it has already been uploaded in order to prevent overwriting it.

openshift-ci-robot · 2025-04-24T23:03:44Z

openshift-ci-robot · 2025-04-24T23:05:23Z

@bfournie: This pull request references Jira Issue OCPBUGS-55300, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.19.0) matches configured target version for branch (4.19.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @mhanss

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

When OVE UI uses the downloads/credentials endpoint the API handler generates the InstallConfig for the agent-based installer in order to make the credentials available in the Ready state. In order to prevent overwriting the kubeadmin-password, the generation of the InstallConfig the second time was bypassed (#7546). This inadvertently prevented the operator manifests from also being generated, and since the OVE UI configures the operators after it retrieves the credentials, the operators are not correctly installed.

This fix removes the bypass of the GenerateInstallConfig. To prevent the kubeadmin-password overwrite a installer change has been made openshift/installer#9679

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

Checklist

Title and description added to both, commit and PR.

Relevant issues have been associated (see CONTRIBUTING guide)

This change does not require a documentation update (docstring, docs, README, etc)

Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

Are the title and description (in both PR and commit) meaningful and clear?

Is there a bug required (and linked) for this change?

Should this PR be backported?

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.

bfournie · 2025-04-28T11:59:24Z

/retest-required

andfasano · 2025-04-28T14:32:16Z

/lgtm

andfasano · 2025-04-28T14:32:44Z

cc @danielerez for approval

danielerez · 2025-04-28T15:06:49Z

/approve

openshift-ci · 2025-04-28T15:07:03Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bfournie, danielerez

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:

~~OWNERS~~ [danielerez]

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

bfournie · 2025-04-28T20:59:48Z

/retest

openshift-ci-robot · 2025-04-29T00:23:33Z

/retest-required

Remaining retests: 0 against base HEAD 20e7243 and 2 for PR HEAD 60ead81 in total

openshift-ci · 2025-04-29T03:23:56Z

@bfournie: 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/okd-scos-e2e-aws-ovn	`60ead81`	link	false	`/test okd-scos-e2e-aws-ovn`

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.

openshift-ci-robot · 2025-04-29T03:27:13Z

@bfournie: Jira Issue OCPBUGS-55300: Some pull requests linked via external trackers have merged:

openshift/assisted-service#7606

The following pull requests linked via external trackers have not merged:

openshift/installer#9679 is open

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-55300 has not been moved to the MODIFIED state.

In response to this:

When OVE UI uses the downloads/credentials endpoint the API handler generates the InstallConfig for the agent-based installer in order to make the credentials available in the Ready state. In order to prevent overwriting the kubeadmin-password, the generation of the InstallConfig the second time was bypassed (#7546). This inadvertently prevented the operator manifests from also being generated, and since the OVE UI configures the operators after it retrieves the credentials, the operators are not correctly installed.

This fix removes the bypass of the GenerateInstallConfig. To prevent the kubeadmin-password overwrite a installer change has been made openshift/installer#9679

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

Checklist

Title and description added to both, commit and PR.

Relevant issues have been associated (see CONTRIBUTING guide)

This change does not require a documentation update (docstring, docs, README, etc)

Does this change include unit-tests (note that code changes require unit-tests)

Reviewers Checklist

Are the title and description (in both PR and commit) meaningful and clear?

Is there a bug required (and linked) for this change?

Should this PR be backported?

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.

openshift-bot · 2025-04-29T06:11:43Z

[ART PR BUILD NOTIFIER]

Distgit: ose-agent-installer-api-server
This PR has been included in build ose-agent-installer-api-server-container-v4.19.0-202504290521.p0.g2039bff.assembly.stream.el9.
All builds following this will include this PR.

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 Apr 23, 2025

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Apr 23, 2025

openshift-ci bot requested a review from mhanss April 23, 2025 23:36

openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 23, 2025

openshift-ci bot requested review from CrystalChun and pastequo April 23, 2025 23:36

andfasano mentioned this pull request Apr 24, 2025

MGMT-20486: Use default source names openshift/appliance#375

Merged

andfasano reviewed Apr 24, 2025

View reviewed changes

bfournie force-pushed the agent-skip-upload-files branch from 62fb342 to 60ead81 Compare April 24, 2025 23:02

openshift-ci bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 24, 2025

bfournie changed the title ~~WIP OCPBUGS-55300: For agent-installer skip upload of kubeadmin files~~ WIP OCPBUGS-55300: For agent-installer remove bypass of manifest generation Apr 24, 2025

bfournie changed the title ~~WIP OCPBUGS-55300: For agent-installer remove bypass of manifest generation~~ OCPBUGS-55300: For agent-installer remove bypass of manifest generation Apr 28, 2025

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 Apr 28, 2025

openshift-ci bot assigned andfasano Apr 28, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 28, 2025

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 28, 2025

openshift-merge-bot bot merged commit 2039bff into openshift:master Apr 29, 2025
19 of 20 checks passed

bfournie deleted the agent-skip-upload-files branch April 29, 2025 10:43

OCPBUGS-55300: For agent-installer remove bypass of manifest generation #7606

OCPBUGS-55300: For agent-installer remove bypass of manifest generation #7606

Uh oh!

Conversation

bfournie commented Apr 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

Uh oh!

openshift-ci-robot commented Apr 23, 2025

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

Uh oh!

codecov bot commented Apr 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

andfasano Apr 24, 2025

Choose a reason for hiding this comment

Uh oh!

openshift-ci-robot commented Apr 24, 2025

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

Uh oh!

openshift-ci-robot commented Apr 24, 2025

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

Uh oh!

bfournie commented Apr 28, 2025

Uh oh!

andfasano commented Apr 28, 2025

Uh oh!

andfasano commented Apr 28, 2025

Uh oh!

danielerez commented Apr 28, 2025

Uh oh!

openshift-ci bot commented Apr 28, 2025

Uh oh!

bfournie commented Apr 28, 2025

Uh oh!

openshift-ci-robot commented Apr 29, 2025

Uh oh!

openshift-ci bot commented Apr 29, 2025

Uh oh!

Uh oh!

openshift-ci-robot commented Apr 29, 2025

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Checklist

Reviewers Checklist

Uh oh!

openshift-bot commented Apr 29, 2025

Uh oh!

Uh oh!

bfournie commented Apr 23, 2025 •

edited

Loading

codecov bot commented Apr 24, 2025 •

edited

Loading