azure: upi: sync install workflow with installer changes #34678

r4f4 · 2022-12-08T22:06:40Z

~~This change is inter-dependent on openshift/installer#6684~~
This change adds support to both Managed Images and Image Galleries for the UPI workflow. Image Galleries support was added in the installer to enable aarch64 IPI deployments and openshift/installer#6684 will soon enable it for UPI as well.

openshift-ci-robot · 2022-12-08T22:07:54Z

@r4f4: the following rehearsable tests have been affected by this change:

Test name	Repo	Type	Reason
periodic-ci-openshift-openshift-tests-private-release-4.13-amd64-nightly-4.13-upgrade-from-stable-4.12-azure-upi-p3-f28	N/A	periodic	Registry content changed
periodic-ci-openshift-release-master-nightly-4.11-e2e-azure-upi	N/A	periodic	Registry content changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 10 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 20 rehearsals
Comment: /pj-rehearse max to run up to 35 rehearsals
Comment: /pj-rehearse auto-ack to run up to 10 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse refresh to get an updated list of affected jobs (useful if you have new pushes to the branch)

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

Prashanth684 · 2022-12-08T22:13:24Z

/hold
unitl openshift/installer#6684 merges

r4f4 · 2022-12-09T15:46:00Z

/pj-rehearse

r4f4 · 2022-12-10T17:40:02Z

/pj-rehearse pull-ci-openshift-installer-master-e2e-azure-ovn-upi

openshift-ci-robot · 2022-12-10T17:40:51Z

@r4f4: job(s): pull-ci-openshift-installer-master-e2e-azure-ovn-upi either don't exist or were not found to be affected, and cannot be rehearsed

r4f4 · 2022-12-10T18:18:28Z

/pj-rehearse refresh

openshift-ci-robot · 2022-12-10T18:19:16Z

@r4f4: the following rehearsable tests have been affected by this change:

Test name	Repo	Type	Reason
pull-ci-openshift-installer-master-e2e-azure-ovn-upi	openshift/installer	presubmit	Ci-operator config changed
pull-ci-openshift-priv-installer-master-e2e-azure-ovn-upi	openshift-priv/installer	presubmit	Registry content changed
periodic-ci-openshift-openshift-tests-private-release-4.13-amd64-nightly-azure-upi-p3-f28	N/A	periodic	Registry content changed

r4f4 · 2022-12-10T18:21:52Z

/pj-rehearse pull-ci-openshift-installer-master-e2e-azure-ovn-upi

r4f4 · 2022-12-11T20:42:47Z

/pj-rehearse pull-ci-openshift-installer-master-e2e-azure-ovn-upi

r4f4 · 2022-12-11T23:56:28Z

/pj-rehearse pull-ci-openshift-installer-master-e2e-azure-ovn-upi

r4f4 · 2022-12-12T09:21:37Z

/hold cancel
/assign @patrickdillon

openshift-ci · 2022-12-12T09:23:52Z

@r4f4: 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/rehearse/openshift-priv/installer/master/e2e-azure-ovn-upi	bde43a3b9767415608248ee230092fe740cc18c5	link	unknown	`/pj-rehearse pull-ci-openshift-priv-installer-master-e2e-azure-ovn-upi`
ci/rehearse/periodic-ci-openshift-openshift-tests-private-release-4.13-amd64-nightly-azure-upi-p3-f28	bde43a3b9767415608248ee230092fe740cc18c5	link	unknown	`/pj-rehearse periodic-ci-openshift-openshift-tests-private-release-4.13-amd64-nightly-azure-upi-p3-f28`
ci/rehearse/openshift/installer/master/e2e-azure-ovn-upi	e0485e914b646da21ec1d3f9625d548f10020f0d	link	unknown	`/pj-rehearse pull-ci-openshift-installer-master-e2e-azure-ovn-upi`

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.

r4f4 · 2022-12-12T09:50:32Z

/pj-rehearse ack

ci-operator/step-registry/upi/install/azure/upi-install-azure-commands.sh

Prashanth684 · 2022-12-13T23:15:32Z

/lgtm

This change adds support to both Managed Images and Image Galleries for the UPI workflow. Image Galleries support was added to the openshift-installer to enable aarch64 IPI deployments and openshift/installer#6684 will soon eanble it for UPI as well.

MayXuQQ · 2022-12-16T16:31:56Z

create UPI cluster succeed, and after scaleup, worker created succeed.

$ oc get nodes
NAME STATUS ROLES AGE VERSION
maxu-u12-2-5zskw-master-0 Ready control-plane,master 56m v1.25.4+77bec7a
maxu-u12-2-5zskw-master-1 Ready control-plane,master 56m v1.25.4+77bec7a
maxu-u12-2-5zskw-master-2 Ready control-plane,master 56m v1.25.4+77bec7a
maxu-u12-2-5zskw-worker-eastus-1 Ready worker 39m v1.25.4+77bec7a
maxu-u12-2-5zskw-worker-eastus-2 Ready worker 36m v1.25.4+77bec7a
maxu-u12-2-5zskw-worker-eastus3-l9bkm Ready worker 5m29s v1.25.4+77bec7a

/label qe-approved

patrickdillon

/approve
/lgtm

patrickdillon · 2022-12-16T17:02:59Z

ci-operator/step-registry/upi/install/azure/upi-install-azure-commands.sh

-  --parameters baseName="$INFRA_ID"
+
+# Check if it's the new template using Image Galleries instead of Managed Images
+if grep -qs "Microsoft.Compute/galleries" 02_storage.json; then


I am reluctant to bring this up without a better suggestion, but I worry that putting conditionals in a template like this can be risky in terms of legibility/debugability. Our old system of templates became so convoluted that it was hard to follow the execution path, so i am perhaps overly hesitant whenever I see any conditionals.

The change introduced here is simple, so I think it is better than any of the alternatives I can come up with, which would be overkill or more confusing than this.

This was the best idea I could come up with to make this work with both Managed Images and Galleries. Relying on the installer or release payload versions didn't feel reliable enough. Once 4.12 migrates to Galleries and this workflow is run on 4.12+, then we can drop this conditional. But I agree with you this is not ideal.

@patrickdillon @barbacbd pointed out an interesting idea. We could use the contentVersion from the ARM template [1] [2]. It still a conditional but at least it checks for a version instead of a string inside the template. Then it's up to the Installer team to make sure that version is updated accordingly when there are changes to the templates.

[1] https://github.com/openshift/installer/blob/master/upi/azure/02_storage.json#L3
[2] https://learn.microsoft.com/en-us/azure/azure-resource-manager/templates/syntax#template-format

openshift-ci · 2022-12-16T17:03:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon, Prashanth684, r4f4

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:

~~ci-operator/step-registry/upi/install/azure/OWNERS~~ [patrickdillon]

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

openshift-ci bot requested review from bear-redhat and danilo-gemoli December 8, 2022 22:07

r4f4 mentioned this pull request Dec 8, 2022

OCPBUGS-4654: azure: upi: use Image Gallery in ARM templates openshift/installer#6684

Merged

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 8, 2022

r4f4 force-pushed the azure-upi-img-gallery branch from 0d61641 to bde43a3 Compare December 9, 2022 15:41

r4f4 force-pushed the azure-upi-img-gallery branch from 47152e5 to e0485e9 Compare December 11, 2022 23:56

r4f4 force-pushed the azure-upi-img-gallery branch from e0485e9 to 93fa131 Compare December 12, 2022 09:21

openshift-ci bot assigned patrickdillon Dec 12, 2022

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 12, 2022

openshift-ci-robot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Dec 12, 2022

r4f4 force-pushed the azure-upi-img-gallery branch 2 times, most recently from df42d2d to 8e2b88c Compare December 13, 2022 20:09

Prashanth684 reviewed Dec 13, 2022

View reviewed changes

ci-operator/step-registry/upi/install/azure/upi-install-azure-commands.sh Outdated Show resolved Hide resolved

openshift-ci bot assigned Prashanth684 Dec 13, 2022

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

r4f4 force-pushed the azure-upi-img-gallery branch from 8e2b88c to bbdbd8a Compare December 14, 2022 17:42

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Dec 14, 2022

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Dec 16, 2022

patrickdillon reviewed Dec 16, 2022

View reviewed changes

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

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

openshift-merge-robot merged commit 3c5f616 into openshift:master Dec 16, 2022

r4f4 deleted the azure-upi-img-gallery branch December 16, 2022 17:17

azure: upi: sync install workflow with installer changes #34678

azure: upi: sync install workflow with installer changes #34678

Uh oh!

Conversation

r4f4 commented Dec 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Dec 8, 2022

Uh oh!

Prashanth684 commented Dec 8, 2022

Uh oh!

r4f4 commented Dec 9, 2022

Uh oh!

r4f4 commented Dec 10, 2022

Uh oh!

openshift-ci-robot commented Dec 10, 2022

Uh oh!

r4f4 commented Dec 10, 2022

Uh oh!

openshift-ci-robot commented Dec 10, 2022

Uh oh!

r4f4 commented Dec 10, 2022

Uh oh!

r4f4 commented Dec 11, 2022

Uh oh!

r4f4 commented Dec 11, 2022

Uh oh!

r4f4 commented Dec 12, 2022

Uh oh!

openshift-ci bot commented Dec 12, 2022

Uh oh!

r4f4 commented Dec 12, 2022

Uh oh!

Uh oh!

Prashanth684 commented Dec 13, 2022

Uh oh!

MayXuQQ commented Dec 16, 2022

Uh oh!

patrickdillon left a comment

Choose a reason for hiding this comment

Uh oh!

patrickdillon Dec 16, 2022

Choose a reason for hiding this comment

Uh oh!

r4f4 Dec 16, 2022

Choose a reason for hiding this comment

Uh oh!

r4f4 Dec 21, 2022

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Dec 16, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

r4f4 commented Dec 8, 2022 •

edited

Loading