AGENT-857: Agent day2 use clusterinfo by andfasano · Pull Request #8009 · openshift/installer

andfasano · 2024-02-13T16:24:18Z

This patch follows #7997, and starts injecting the ClusterInfo into the agent assets graph. Mainly, the various assets - depending on the current workflow set - will grab the required inputs either from the OptionalInstallConfig or ClusterInfo assets.
So, this patch prepares the ground properly to allow modifying the Ignition asset in a subsequent PR.

openshift-ci-robot · 2024-02-13T16:24:22Z

@andfasano: This pull request references AGENT-857 which is a valid jira issue.

Details

In response to this:

/draft

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-robot · 2024-02-20T15:18:57Z

@andfasano: This pull request references AGENT-857 which is a valid jira issue.

Details

In response to this:

This patch follows #7997, and starts injecting the ClusterInfo into the agent assets graph. Mainly, the various assets - depending on the current workflow set - will grab the required inputs either from the OptionalInstallConfig or ClusterInfo assets.
So, this patch prepares the ground properly to allow modifying the Ignition asset in a subsequent PR.

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.

pkg/asset/agent/joiner/clusterinfo.go

pkg/asset/agent/manifests/agentpullsecret.go

pkg/asset/agent/manifests/infraenv.go

rwsu · 2024-02-26T21:10:22Z

/test e2e-aws-ovn-edge-zones-manifest-validation

rwsu

Small spelling issue.

/approve

pkg/asset/agent/joiner/clusterinfo_test.go

openshift-ci · 2024-02-26T21:33:26Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rwsu

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [rwsu]

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

These fake clients will be used to unit test ClusterInfo

openshift-ci · 2024-03-01T21:18:52Z

@andfasano: The following tests 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/e2e-gcp-ovn-xpn	8b9ea4eea3ab85fbb4b94e8fb25130e6068606c4	link	false	`/test e2e-gcp-ovn-xpn`
ci/prow/e2e-vsphere-zones-techpreview	8b9ea4eea3ab85fbb4b94e8fb25130e6068606c4	link	false	`/test e2e-vsphere-zones-techpreview`
ci/prow/e2e-gcp-ovn-shared-vpc	8b9ea4eea3ab85fbb4b94e8fb25130e6068606c4	link	false	`/test e2e-gcp-ovn-shared-vpc`
ci/prow/e2e-agent-compact-ipv4-appliance-diskimage	`6912900`	link	false	`/test e2e-agent-compact-ipv4-appliance-diskimage`
ci/prow/e2e-agent-compact-ipv4-appliance	`6912900`	link	false	`/test e2e-agent-compact-ipv4-appliance`
ci/prow/okd-e2e-aws-ovn-upgrade	`6912900`	link	false	`/test okd-e2e-aws-ovn-upgrade`
ci/prow/okd-e2e-agent-compact-ipv4	`6912900`	link	false	`/test okd-e2e-agent-compact-ipv4`

Full PR test history. Your PR dashboard.

Details

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.

cmd/node-joiner/main.go

bfournie · 2024-03-08T00:04:45Z

pkg/asset/agent/joiner/clusterinfo.go

+	ImageDigestSources            []types.ImageDigestSource
+	DeprecatedImageContentSources []types.ImageContentSource
+	PlatformType                  hiveext.PlatformType
+	SSHKey                        string


Do you need to add InstallConfig fields like CPUPartitioning,FIPS, or any of the Networking fields?

That's a good question @bfournie. @zaneb @rwsu @pawanpinjarkar what are your thoughts about it? I'd say that in this first iteration we could try to address just the min fields required, and eventually add them later in successive iterations

OK, with the caveat that we can't get beyond Dev Preview without this stuff.

As a first iteration I meant the current PR. Since there are others still pending based on this one (#8080 and #8093), and others will follow as part the owner story AGENT-850, my preference would be to land the current PR as it is and address such points in successive PRs

@bfournie from a first pass it looks like the mentioned settings are cluster dependent, so anything that could be set directly on the node. During the joining process I'd expect the fetched ignition would contain any necessary bits, I will verify for the case of FIPS for example.

bfournie · 2024-03-08T00:21:17Z

Looks reasonable to me, just one question which may be covered in follow-on.

pawanpinjarkar · 2024-03-12T17:21:22Z

...openshift-install/testdata/agent/unconfigured-ignition/configurations/from-ztp-manifests.txt

  namespace: cluster0
 spec:
  cpuArchitecture: x86_64
+  ipxeScriptType: ""


The usage of ipxeScriptType is unclear to me. The only possible values in assisted are DiscoveryImageAlways and BootOrderControl. How is the agent installer using these values?

I re-checked, and the test changes were triggered by the refactoring/changes in infraenv.go

andfasano · 2024-03-13T08:03:53Z

/retest-required

bfournie · 2024-03-27T18:43:38Z

/lgtm

openshift-ci-robot · 2024-03-27T20:18:10Z

/retest-required

Remaining retests: 0 against base HEAD ca71358 and 2 for PR HEAD 6912900 in total

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 13, 2024

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 Feb 13, 2024

andfasano force-pushed the agent-day2-use-clusterinfo branch from 61765f2 to d6e5b2b Compare February 13, 2024 16:30

openshift-ci bot requested review from bfournie and sadasu February 13, 2024 16:36

andfasano force-pushed the agent-day2-use-clusterinfo branch 3 times, most recently from 6cfa3c5 to ebc9aa3 Compare February 15, 2024 14:50

andfasano mentioned this pull request Feb 16, 2024

AGENT-853: Add ClusterInfo asset #7997

Merged

andfasano force-pushed the agent-day2-use-clusterinfo branch 7 times, most recently from 8b9ea4e to c8c31ce Compare February 19, 2024 16:00

andfasano changed the title ~~[WIP] AGENT-857: Agent day2 use clusterinfo~~ AGENT-857: Agent day2 use clusterinfo Feb 20, 2024

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 Feb 20, 2024

andfasano force-pushed the agent-day2-use-clusterinfo branch from 99488f4 to b561aba Compare February 20, 2024 17:44

rwsu suggested changes Feb 21, 2024

View reviewed changes

rwsu approved these changes Feb 26, 2024

View reviewed changes

pkg/asset/agent/joiner/clusterinfo_test.go Outdated Show resolved Hide resolved

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 26, 2024

andfasano force-pushed the agent-day2-use-clusterinfo branch from cb42b4a to 0f029ff Compare February 27, 2024 09:08

andfasano mentioned this pull request Feb 28, 2024

AGENT-874: use AddNodesConfig asset #8080

Merged

andfasano added 2 commits March 1, 2024 13:02

added ClusterInfo asset

20c9b51

inject ClusterInfo into AgentPullSecret asset

db1306b

andfasano added 17 commits March 1, 2024 13:02

skip ClusterDeployment manifest generation

87bcda5

skip AgentClusterInstall manifest generation

984db04

inject ClusterInfo into InfraEnv asset

f715dfa

inject ClusterInfo into ClusterImageSet asset

ac8191c

skip (temporary) NMStateConfig manifest generation

e0cfcf4

inject ClusterInfo into RegistriesConf asset

a11a5fc

inject ClusterInfo into CaBundle asset

330aa38

skip (temporary) AgentHosts asset generation

496de06

additional lint fixes

9d12c3b

add dir persistent flag

ed7d590

inject ClusterInfo into AgentImage asset

5eca200

skip Kargs asset generation

fb9e519

reuse install-config sshkey for InfraEnv asset

b616f76

minor lint fixes

2e4089b

vendoring kubernetes and openshift fake client

8562b2e

These fake clients will be used to unit test ClusterInfo

added unit test for ClusterInfo

829233e

Use ClusterName instead of ClusterID

6912900

andfasano force-pushed the agent-day2-use-clusterinfo branch from 0f029ff to 6912900 Compare March 1, 2024 18:02

rwsu reviewed Mar 7, 2024

View reviewed changes

cmd/node-joiner/main.go Show resolved Hide resolved

bfournie reviewed Mar 8, 2024

View reviewed changes

pawanpinjarkar reviewed Mar 12, 2024

View reviewed changes

openshift-ci bot assigned bfournie Mar 27, 2024

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

openshift-merge-bot bot merged commit 4e5fe0d into openshift:master Mar 27, 2024

Conversation

andfasano commented Feb 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Feb 13, 2024 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Feb 20, 2024 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rwsu commented Feb 26, 2024

Uh oh!

rwsu left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

openshift-ci bot commented Feb 26, 2024

Uh oh!

openshift-ci bot commented Mar 1, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

bfournie Mar 8, 2024

Choose a reason for hiding this comment

Uh oh!

andfasano Mar 11, 2024

Choose a reason for hiding this comment

Uh oh!

zaneb Mar 12, 2024

Choose a reason for hiding this comment

Uh oh!

andfasano Mar 14, 2024

Choose a reason for hiding this comment

Uh oh!

andfasano Mar 25, 2024

Choose a reason for hiding this comment

Uh oh!

bfournie commented Mar 8, 2024

Uh oh!

pawanpinjarkar Mar 12, 2024

Choose a reason for hiding this comment

Uh oh!

andfasano Mar 12, 2024

Choose a reason for hiding this comment

Uh oh!

andfasano commented Mar 13, 2024

Uh oh!

bfournie commented Mar 27, 2024

Uh oh!

openshift-ci-robot commented Mar 27, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

andfasano commented Feb 13, 2024 •

edited

Loading

openshift-ci-robot commented Feb 13, 2024 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Feb 20, 2024 •

edited by openshift-ci bot

Loading

openshift-ci bot commented Mar 1, 2024 •

edited

Loading