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-16759: Copy cluster proxy settings to imported local-cluster AgentCluster Install #6051

Merged
merged 1 commit into from Mar 11, 2024

Conversation

paul-maidment
Copy link
Contributor

@paul-maidment paul-maidment commented Mar 5, 2024

The settings for HTTPProxy and HTTPSProxy should be copied to the AgentClusterInstall that is created during the import of the local cluster.
This PR ensures that this takes place.

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 Mar 5, 2024
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 5, 2024

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

In response to this:

The local cluster settings for HTTPProxy and HTTPSProxy should be copied to the AgentClusterInstall This PR ensures that this takes place.

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-ci openshift-ci bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 5, 2024
@openshift-ci openshift-ci bot requested review from gamli75 and jhernand March 5, 2024 09:13
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 5, 2024
Copy link

codecov bot commented Mar 5, 2024

Codecov Report

Attention: Patch coverage is 58.62069% with 12 lines in your changes are missing coverage. Please review.

Project coverage is 68.28%. Comparing base (ffc9aef) to head (76e54ae).
Report is 5 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #6051      +/-   ##
==========================================
- Coverage   68.39%   68.28%   -0.12%     
==========================================
  Files         239      239              
  Lines       35454    35560     +106     
==========================================
+ Hits        24249    24281      +32     
- Misses       9100     9175      +75     
+ Partials     2105     2104       -1     
Files Coverage Δ
...oller/controllers/agentserviceconfig_controller.go 85.20% <ø> (ø)
...terimport/local_cluster_import_operations_mocks.go 78.74% <100.00%> (+1.62%) ⬆️
pkg/localclusterimport/import_local_cluster.go 83.41% <72.72%> (-0.80%) ⬇️
...alclusterimport/local_cluster_import_operations.go 0.00% <0.00%> (ø)

... and 5 files with indirect coverage changes

@paul-maidment paul-maidment force-pushed the MGMT-16759 branch 3 times, most recently from 4babfb8 to 2f58948 Compare March 6, 2024 11:07
@paul-maidment
Copy link
Contributor Author

Looks like edge-e2e-ai-operator-disconnected-capi is generally broken for others too, so not failing due to any issues in this PR.

@paul-maidment
Copy link
Contributor Author

/override pull-ci-openshift-assisted-service-master-edge-e2e-ai-operator-disconnected-capi

@paul-maidment
Copy link
Contributor Author

/override ci/prow/edge-e2e-ai-operator-disconnected-capi

Copy link

openshift-ci bot commented Mar 6, 2024

@paul-maidment: Overrode contexts on behalf of paul-maidment: ci/prow/edge-e2e-ai-operator-disconnected-capi

In response to this:

/override pull-ci-openshift-assisted-service-master-edge-e2e-ai-operator-disconnected-capi

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.

Copy link

openshift-ci bot commented Mar 6, 2024

@paul-maidment: Overrode contexts on behalf of paul-maidment: ci/prow/edge-e2e-ai-operator-disconnected-capi

In response to this:

/override ci/prow/edge-e2e-ai-operator-disconnected-capi

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.

@eranco74
Copy link
Contributor

eranco74 commented Mar 10, 2024

Why would we want this behavior?
What if the spoke cluster should use a different proxy?
If the spoke cluster requires a proxy the user can provide it explicitly.
NM, I now notice that this behavior is for imported cluster, please make it clear in the commit message.
Otherwise, LGTM

@paul-maidment paul-maidment changed the title MGMT-16759: Copy cluster proxy settings to local-cluster AgentCluster Install MGMT-16759: Copy cluster proxy settings to imported local-cluster AgentCluster Install Mar 11, 2024
…entClusterInstall

The settings for HTTPProxy and HTTPSProxy should be copied to the AgentClusterInstall that is created during the import of the local cluster.
This PR ensures that this takes place.
@openshift-ci-robot
Copy link

openshift-ci-robot commented Mar 11, 2024

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

In response to this:

The settings for HTTPProxy and HTTPSProxy should be copied to the AgentClusterInstall that is created during the import of the local cluster.
This PR ensures that this takes place.

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.

@paul-maidment
Copy link
Contributor Author

Why would we want this behavior? What if the spoke cluster should use a different proxy? If the spoke cluster requires a proxy the user can provide it explicitly. NM, I now notice that this behavior is for imported cluster, please make it clear in the commit message. Otherwise, LGTM

Done. Description and title updated in the PR and commit.

Copy link
Contributor

@CrystalChun CrystalChun left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 11, 2024
Copy link

openshift-ci bot commented Mar 11, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: CrystalChun, 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 [CrystalChun,paul-maidment]

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

Copy link

openshift-ci bot commented Mar 11, 2024

@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-merge-bot openshift-merge-bot bot merged commit f24b433 into openshift:master Mar 11, 2024
17 checks passed
@openshift-bot
Copy link
Contributor

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-agent-installer-api-server-container-v4.16.0-202403120045.p0.gf24b433.assembly.stream.el8 for distgit ose-agent-installer-api-server.
All builds following this will include this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants