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.

Sign up for GitHub

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

Jump to bottom

MGMT-15405: Add a URL to infraenv to show download link from static network config #5638

Merged
merged 1 commit into from Nov 5, 2023
Merged

MGMT-15405: Add a URL to infraenv to show download link from static network config #5638

merged 1 commit into from Nov 5, 2023

Conversation

paul-maidment
Copy link
Contributor

@paul-maidment paul-maidment commented Oct 30, 2023 •
edited by openshift-ci bot

In MGMT-11443 a download link was created for static network config.

This PR adds the generated URL for the static network to the infraenv if the static network config is defined.

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?

@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 30, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 30, 2023 •
edited by openshift-ci bot

@paul-maidment: This pull request references MGMT-15405 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 story to target the "4.15.0" version, but no target version was set.

In response to this:

In MGMT-11443 a download link was created for static network config.

This PR adds the generated URL for the static network to the infraenv if the static network config is defined.

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 kubernetes/test-infra repository.

1 similar comment
@openshift-ci-robot
Copy link

openshift-ci-robot commented Oct 30, 2023 •
edited by openshift-ci bot

@paul-maidment: This pull request references MGMT-15405 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 story to target the "4.15.0" version, but no target version was set.

In response to this:

In MGMT-11443 a download link was created for static network config.

This PR adds the generated URL for the static network to the infraenv if the static network config is defined.

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 kubernetes/test-infra repository.

@openshift-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Oct 30, 2023
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 30, 2023
@codecov
Copy link

codecov bot commented Oct 30, 2023 •
edited

Codecov Report

Merging #5638 (1f87ead) into master (596a179) will increase coverage by 0.13%.
Report is 13 commits behind head on master.
The diff coverage is 81.81%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #5638      +/-   ##
==========================================
+ Coverage   67.71%   67.85%   +0.13%     
==========================================
  Files         233      233              
  Lines       34211    34436     +225     
==========================================
+ Hits        23166    23365     +199     
- Misses       8982     9007      +25     
- Partials     2063     2064       +1
Files Coverage Δ
...rnal/controller/controllers/infraenv_controller.go 64.52% <81.81%> (-3.42%) ⬇️

... and 5 files with indirect coverage changes

@openshift-ci openshift-ci bot added the api-review Categorizes an issue or PR as actively needing an API review. label Oct 30, 2023
avishayt
avishayt reviewed Nov 1, 2023
View reviewed changes
api/v1beta1/infraenv_types.go Outdated
@@ -166,6 +166,8 @@ type InfraEnvStatus struct {
// BootArtifacts specifies the URLs for each boot artifact
// +optional
BootArtifacts BootArtifacts `json:"bootArtifacts"`
// StaticNetworkDownloadURL specifies an HTTP/S URL that contains the static network config
StaticNetworkDownloadURL string `json:"staticNetworkDownloadURL,omitempty"`
Copy link
Contributor

Choose a reason for hiding this comment

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

The ticket says it should be added to the debug info section. That makes sense because it's something used for debugging.

internal/controller/controllers/infraenv_controller.go Outdated
@@ -660,6 +683,13 @@ func (r *InfraEnvReconciler) updateInfraEnvStatus(
isoUpdated = true
}

if internalInfraEnv.StaticNetworkConfig != "" && internalInfraEnv.ID != nil {
Copy link
Contributor

Choose a reason for hiding this comment

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

  1. How would internalInfraEnv.ID be nil?
  2. You should check if infraEnv.Status.StaticNetworkDownloadURL is empty, otherwise you'll generate the same URL on every reconcile

@paul-maidment
MGMT-15405: Add a URL to infraenv to show download link from static n…
1f87ead 
…etwork config

In MGMT-11443 a download link was created for static network config.

This PR adds the generated URL for the static network to the infraenv if the static network config is defined.
@paul-maidment
Copy link
Contributor Author

/test edge-assisted-operator-catalog-publish-verify

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 5, 2023
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Nov 5, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: avishayt, paul-maidment

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 [avishayt,paul-maidment]

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

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 73b1599 and 2 for PR HEAD 1f87ead in total

@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Nov 5, 2023

@paul-maidment: all tests passed!

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/test-infra repository. I understand the commands that are listed here.

@openshift-ci openshift-ci bot merged commit 5b9d5f9 into openshift:master Nov 5, 2023
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@avishayt avishayt avishayt approved these changes

@danmanor danmanor Awaiting requested review from danmanor

Assignees

@avishayt avishayt

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. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@paul-maidment @openshift-ci-robot @avishayt