For Azure cloud prepare get the image from existing Machineset #594
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
🤖 Created branch: z_pr594/aswinsuryan/azure-image |
aswinsuryan
force-pushed
the
azure-image
branch
13 times, most recently
from
5c6b986
to
570e71c
Compare
aswinsuryan
requested review from
mkolesnik,
Oats87,
skitt,
sridhargaddam and
tpantelis
as code owners
|
Setting priority as high and marking for backport, as currently all OpenShift 4.12 Azure based deployments are blocked without this fix. |
This was referenced Feb 9, 2023
skitt
previously requested changes
Feb 9, 2023
aswinsuryan
force-pushed
the
azure-image
branch
from
547d18e
to
e44a051
Compare
aswinsuryan
force-pushed
the
azure-image
branch
from
2442946
to
00ca647
Compare
mkolesnik
reviewed
Feb 9, 2023
aswinsuryan
force-pushed
the
azure-image
branch
from
fbb487d
to
0cf928f
Compare
skitt
approved these changes
Feb 10, 2023
mkolesnik
approved these changes
Feb 12, 2023
skitt
requested changes
Feb 13, 2023
pkg/azure/ocpgwdeployer.go
Outdated
Comment on lines
128
to
130
| image, imageErr := d.msDeployer.GetWorkerNodeImage(nil, nil, d.InfraID) | ||
| if imageErr != nil { | ||
| return errors.Wrap(err, "error retrieving worker node image") |
There was a problem hiding this comment.
Suggested change
| image, imageErr := d.msDeployer.GetWorkerNodeImage(nil, nil, d.InfraID) | |
| if imageErr != nil { | |
| return errors.Wrap(err, "error retrieving worker node image") | |
| image, err := d.msDeployer.GetWorkerNodeImage(nil, nil, d.InfraID) | |
| if err != nil { | |
| return errors.Wrap(err, "error retrieving worker node image") |
There was a problem hiding this comment.
This lead to linting error
pkg/azure/ocpgwdeployer.go:133:3: ineffectual assignment to err (ineffassign)
err = d.deployDedicatedGWNode(machineSets, gatewayNodesToDeploy, image, status)
Hence reverting, Will fix the issue in line 132.
aswinsuryan
force-pushed
the
azure-image
branch
from
0cf928f
to
686bced
Compare
skitt
previously approved these changes
Feb 13, 2023
Signed-off-by: Aswin Suryanarayanan <aswinsuryan@gmail.com>
aswinsuryan
force-pushed
the
azure-image
branch
from
686bced
to
4ae59d3
Compare
aswinsuryan
dismissed
skitt’s stale review
A suggested change was reverted after approval.
skitt
reviewed
Feb 13, 2023
Comment on lines
+128
to
+131
| image, imageErr := d.msDeployer.GetWorkerNodeImage(nil, nil, d.InfraID) | ||
| if imageErr != nil { | ||
| return errors.Wrap(imageErr, "error retrieving worker node image") | ||
| } |
There was a problem hiding this comment.
Suggested change
| image, imageErr := d.msDeployer.GetWorkerNodeImage(nil, nil, d.InfraID) | |
| if imageErr != nil { | |
| return errors.Wrap(imageErr, "error retrieving worker node image") | |
| } | |
| var image string | |
| image, err = d.msDeployer.GetWorkerNodeImage(nil, nil, d.InfraID) | |
| if err != nil { | |
| return errors.Wrap(err, "error retrieving worker node image") | |
| } |
skitt
approved these changes
Feb 13, 2023
|
🤖 Closed branches: [z_pr594/aswinsuryan/azure-image] |
|
@aswinsuryan can you take care of the 0.13 and 0.12 backports? |
It requires two other back ports to resolve conflicts, It is not required in 0.12 as Azure support is added in 0.13 |
dfarrell07
added
release-note-needed
release-note-handled
and removed
release-note-needed
labels
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For Azure cloud prepare it uses a hard-coded path and infra id for the machine set. Now it is changed the image. from one of the existing worker nodes.
Signed-off-by: Aswin Suryanarayanan aswinsuryan@gmail.com