MGMT-5442: assisted-service should use official oc client #3657

eranco74 · 2022-04-12T12:07:21Z

The oc in this link contain the ICSP lookup feature openshift/oc#829
The lack of ICSP support is the reason the assisted-service didn't upstream oc since #1655

Should this PR be tested by the reviewer? no
Is this PR relying on CI for an e2e test run? yes
Should this PR be tested in a specific environment? disconnected env
Any logs, screenshots, etc that can help with the review process?

-->

List all the issues related to this PR

What environments does this code impact?

Hopefully it won't impact anything, but this code is in play in all environments

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

Assignees

/cc @tsorya
/cc @flaper87

Checklist

Title and description added to both, commit and PR.
Relevant issues have been associated (see CONTRIBUTING guide)
Reviewers have been listed
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?

The oc in this link contain the ICSP lookup feature openshift/oc#829 The lack of ICSP support is the reason the assisted-service didn't upstream oc since commit 317f122

openshift-ci · 2022-04-12T12:11:07Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: eranco74

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~~ [eranco74]

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

codecov · 2022-04-12T12:51:54Z

Codecov Report

Merging #3657 (76fe9a6) into master (204c4aa) will decrease coverage by 0.11%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #3657      +/-   ##
==========================================
- Coverage   65.92%   65.80%   -0.12%     
==========================================
  Files         176      176              
  Lines       24780    24949     +169     
==========================================
+ Hits        16335    16418      +83     
- Misses       6835     6918      +83     
- Partials     1610     1613       +3

Impacted Files	Coverage Δ
internal/network/utils.go	`19.71% <0.00%> (-3.62%)`	⬇️
internal/host/hostutil/test_utils.go	`10.78% <0.00%> (-1.89%)`	⬇️
internal/host/refresh_status_preprocessor.go	`94.61% <0.00%> (-0.53%)`	⬇️
internal/host/validator.go	`76.54% <0.00%> (-0.14%)`	⬇️
internal/spec/spec.go	`100.00% <0.00%> (ø)`
internal/host/statemachine.go	`100.00% <0.00%> (ø)`
...nternal/controller/controllers/agent_controller.go	`79.49% <0.00%> (+0.30%)`	⬆️
internal/host/validation_id.go	`95.00% <0.00%> (+4.09%)`	⬆️

eranco74 · 2022-04-12T15:06:56Z

/retest

eranco74 · 2022-04-13T07:51:55Z

/test ?

openshift-ci · 2022-04-13T07:52:02Z

@eranco74: The following commands are available to trigger required jobs:

/test ci-index
/test e2e-metal-assisted
/test e2e-metal-assisted-cnv
/test e2e-metal-assisted-ipv6
/test e2e-metal-assisted-kube-api-net-suite
/test e2e-metal-assisted-ocs
/test e2e-metal-assisted-operator-ztp
/test images
/test lint
/test subsystem-aws
/test subsystem-kubeapi-aws
/test unit-test
/test verify-generated-code

The following commands are available to trigger optional jobs:

/test e2e-ai-operator-ztp-ipv4v6-3masters-ocp-49
/test e2e-ai-operator-ztp-ipv4v6-sno-ocp-49
/test e2e-metal-assisted-4-10
/test e2e-metal-assisted-4-6
/test e2e-metal-assisted-4-8
/test e2e-metal-assisted-4-9
/test e2e-metal-assisted-capi
/test e2e-metal-assisted-day2
/test e2e-metal-assisted-ipv4v6
/test e2e-metal-assisted-kube-api-late-binding-single-node
/test e2e-metal-assisted-kube-api-late-unbinding-ipv4-single-node
/test e2e-metal-assisted-none
/test e2e-metal-assisted-onprem
/test e2e-metal-assisted-operator-disconnected
/test e2e-metal-assisted-operator-ztp-multinode-spoke
/test e2e-metal-assisted-single-node
/test e2e-metal-assisted-static-ip-suite
/test e2e-metal-assisted-tpmv2

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

pull-ci-openshift-assisted-service-master-ci-index
pull-ci-openshift-assisted-service-master-e2e-metal-assisted
pull-ci-openshift-assisted-service-master-e2e-metal-assisted-kube-api-net-suite
pull-ci-openshift-assisted-service-master-e2e-metal-assisted-operator-ztp
pull-ci-openshift-assisted-service-master-images
pull-ci-openshift-assisted-service-master-lint
pull-ci-openshift-assisted-service-master-subsystem-aws
pull-ci-openshift-assisted-service-master-subsystem-kubeapi-aws
pull-ci-openshift-assisted-service-master-unit-test
pull-ci-openshift-assisted-service-master-verify-generated-code

In response to this:

/test ?

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 · 2022-04-13T07:52:36Z

/test e2e-metal-assisted-operator-disconnected

tsorya · 2022-04-13T08:32:05Z

/lgtm

eranco74 · 2022-04-13T09:35:32Z

/retest-required

eranco74 · 2022-04-13T09:56:09Z

/test e2e-metal-assisted-operator-disconnected

eranco74 · 2022-04-13T10:24:26Z

/test e2e-metal-assisted-operator-disconnected

openshift-bot · 2022-04-13T10:40:52Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

openshift-ci · 2022-04-13T11:49:16Z

@eranco74: 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.

eranco74 · 2022-04-18T11:56:27Z

/cherry-pick release-ocm-2.5

openshift-cherrypick-robot · 2022-04-18T11:57:10Z

@eranco74: #3657 failed to apply on top of branch "release-ocm-2.5":

Applying: MGMT-5442: assisted-service should use official oc client The oc in this link contain the ICSP lookup feature https://github.com/openshift/oc/pull/829 The lack of ICSP support is the reason the assisted-service didn't upstream oc since commit 317f122ee4e78cfa98af2ad32403349261e4bccd
Using index info to reconstruct a base tree...
M	Dockerfile.assisted-service
Falling back to patching base and 3-way merge...
Auto-merging Dockerfile.assisted-service
CONFLICT (content): Merge conflict in Dockerfile.assisted-service
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 MGMT-5442: assisted-service should use official oc client The oc in this link contain the ICSP lookup feature https://github.com/openshift/oc/pull/829 The lack of ICSP support is the reason the assisted-service didn't upstream oc since commit 317f122ee4e78cfa98af2ad32403349261e4bccd
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-ocm-2.5

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.

…enshift#3657)" This reverts commit cdbb65b.

Revert oc client changes 1. Revert "NO-ISSUE: Add a retry when fetching oc with curl (openshift#3687)" This reverts commit 0da8d38. 2. Revert "MGMT-5442: assisted-service should use official oc client (openshift#3657)" This reverts commit cdbb65b. 3. Revert "Bug 2069976: Error with oc-mirror using an old outdated unsupported oc client in AI (openshift#3598)" This reverts commit 5361608.

) Revert oc client changes 1. Revert "NO-ISSUE: Add a retry when fetching oc with curl (#3687)" This reverts commit 0da8d38. 2. Revert "MGMT-5442: assisted-service should use official oc client (#3657)" This reverts commit cdbb65b. 3. Revert "Bug 2069976: Error with oc-mirror using an old outdated unsupported oc client in AI (#3598)" This reverts commit 5361608.

…3657) The oc in this link contain the ICSP lookup feature openshift/oc#829 The lack of ICSP support is the reason the assisted-service didn't upstream oc since commit 317f122

…enshift#3700) Revert oc client changes 1. Revert "NO-ISSUE: Add a retry when fetching oc with curl (openshift#3687)" This reverts commit 0da8d38. 2. Revert "MGMT-5442: assisted-service should use official oc client (openshift#3657)" This reverts commit cdbb65b. 3. Revert "Bug 2069976: Error with oc-mirror using an old outdated unsupported oc client in AI (openshift#3598)" This reverts commit 5361608.

…3657) The oc in this link contain the ICSP lookup feature openshift/oc#829 The lack of ICSP support is the reason the assisted-service didn't upstream oc since commit 317f122

…enshift#3700) Revert oc client changes 1. Revert "NO-ISSUE: Add a retry when fetching oc with curl (openshift#3687)" This reverts commit 0da8d38. 2. Revert "MGMT-5442: assisted-service should use official oc client (openshift#3657)" This reverts commit cdbb65b. 3. Revert "Bug 2069976: Error with oc-mirror using an old outdated unsupported oc client in AI (openshift#3598)" This reverts commit 5361608.

MGMT-5442: assisted-service should use official oc client

76fe9a6

The oc in this link contain the ICSP lookup feature openshift/oc#829 The lack of ICSP support is the reason the assisted-service didn't upstream oc since commit 317f122

openshift-ci bot requested review from flaper87 and tsorya April 12, 2022 12:07

openshift-ci bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. kind/dependency-change Categorizes issue or PR as related to changing dependencies labels Apr 12, 2022

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

openshift-ci bot assigned tsorya Apr 13, 2022

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

openshift-merge-robot merged commit cdbb65b into openshift:master Apr 13, 2022

vrutkovs added a commit to vrutkovs/assisted-service that referenced this pull request Apr 21, 2022

Revert "MGMT-5442: assisted-service should use official oc client (op…

67526ae

…enshift#3657)" This reverts commit cdbb65b.

vrutkovs added a commit to vrutkovs/assisted-service that referenced this pull request Apr 21, 2022

Revert "MGMT-5442: assisted-service should use official oc client (op…

5524cd7

…enshift#3657)" This reverts commit cdbb65b.

mkowalski added a commit to mkowalski/assisted-service that referenced this pull request Apr 22, 2022

Revert "MGMT-5442: assisted-service should use official oc client (op…

e908d05

…enshift#3657)" This reverts commit cdbb65b.

vrutkovs added a commit to vrutkovs/assisted-service that referenced this pull request Apr 22, 2022

Revert "MGMT-5442: assisted-service should use official oc client (op…

198e313

…enshift#3657)" This reverts commit cdbb65b.

vrutkovs added a commit to vrutkovs/assisted-service that referenced this pull request Apr 22, 2022

Revert "MGMT-5442: assisted-service should use official oc client (op…

b09feda

…enshift#3657)" This reverts commit cdbb65b.

eranco74 mentioned this pull request Apr 24, 2022

Bug 2077162: Can not provision SNOs in a disconnected environment #3700

Merged

21 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

MGMT-5442: assisted-service should use official oc client #3657

MGMT-5442: assisted-service should use official oc client #3657

eranco74 commented Apr 12, 2022

openshift-ci bot commented Apr 12, 2022

codecov bot commented Apr 12, 2022 •

edited

eranco74 commented Apr 12, 2022

eranco74 commented Apr 13, 2022

openshift-ci bot commented Apr 13, 2022

eranco74 commented Apr 13, 2022

tsorya commented Apr 13, 2022

eranco74 commented Apr 13, 2022

eranco74 commented Apr 13, 2022

eranco74 commented Apr 13, 2022

openshift-bot commented Apr 13, 2022

openshift-ci bot commented Apr 13, 2022

eranco74 commented Apr 18, 2022

openshift-cherrypick-robot commented Apr 18, 2022

MGMT-5442: assisted-service should use official oc client #3657

MGMT-5442: assisted-service should use official oc client #3657

Conversation

eranco74 commented Apr 12, 2022

List all the issues related to this PR

What environments does this code impact?

How was this code tested?

Assignees

Checklist

Reviewers Checklist

openshift-ci bot commented Apr 12, 2022

codecov bot commented Apr 12, 2022 • edited

Codecov Report

eranco74 commented Apr 12, 2022

eranco74 commented Apr 13, 2022

openshift-ci bot commented Apr 13, 2022

eranco74 commented Apr 13, 2022

tsorya commented Apr 13, 2022

eranco74 commented Apr 13, 2022

eranco74 commented Apr 13, 2022

eranco74 commented Apr 13, 2022

openshift-bot commented Apr 13, 2022

openshift-ci bot commented Apr 13, 2022

eranco74 commented Apr 18, 2022

openshift-cherrypick-robot commented Apr 18, 2022

codecov bot commented Apr 12, 2022 •

edited