[GEP-27] Use cloud profile bastion machine and image #948
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
gardener-robot
added
area/quality
gardener-robot-ci-2
added
the
reviewed/ok-to-test
gardener-robot-ci-1
added
needs/ok-to-test
pkg/controller/bastion/options.go
Outdated
| // getProviderSpecificImage returns the provider specific MachineImageVersion that matches with the given VmDetails | ||
| func getProviderSpecificImage(images []azure.MachineImages, vm VmDetails) (*armcompute.ImageReference, error) { | ||
| imageIndex := slices.IndexFunc(images, func(image azure.MachineImages) bool { | ||
| return image.Name == vm.ImageBaseName |
There was a problem hiding this comment.
We could be nice and use strings.EqualFold, but there might also be value in strictness.
Just a thought.
pkg/controller/bastion/vmdetails.go
Outdated
| ImageVersion string | ||
| } | ||
|
|
||
| // DetermineVmDetails calculates the |
pkg/controller/bastion/vmdetails.go
Outdated
Comment on lines
44
to
47
| machineIndex := slices.IndexFunc(machineTypes, func(machine core.MachineType) bool { | ||
| return machine.Name == bastion.MachineType.Name |
There was a problem hiding this comment.
same as above, Index should do the trick
There was a problem hiding this comment.
Index can only be used on primitive types and not for structs.
pkg/controller/bastion/vmdetails.go
Outdated
| } | ||
|
|
||
| // find the machine in cloud profile with the lowest amount of cpus | ||
| var minCpu int64 = math.MaxInt64 |
There was a problem hiding this comment.
Consider using a pointer and nil to signal unchanged var. Seems a tiny bit more semantically fitting. It's a matter of preference, though.
pkg/controller/bastion/vmdetails.go
Outdated
|
|
||
| findSupportedArchs := func(versions []core.MachineImageVersion, specVersion *string) { | ||
| for _, version := range versions { | ||
| if specVersion != nil && version.Version == *bastion.MachineImage.Version { |
There was a problem hiding this comment.
Since I was hit by that in the recent past: bastion could be nil. Maybe we should be careful just in case.
There was a problem hiding this comment.
Okay, I see, it cannot be nil. I'd prefer having it as an explicit parameter in that case, though. Clearer that way.
pkg/controller/bastion/vmdetails.go
Outdated
|
|
||
| // if only machineImage is set -> find all supported versions if no version is set otherwise return arch of version | ||
| if bastion.MachineImage != nil && bastion.MachineType == nil { | ||
| imageIndex := slices.IndexFunc(images, func(image core.MachineImage) bool { |
pkg/controller/bastion/vmdetails.go
Outdated
| } | ||
|
|
||
| // getImageVersion returns the image version for the bastion. | ||
| func getImageVersion(imageName, machineArch string, bastion *core.Bastion, images []core.MachineImage) (string, error) { |
There was a problem hiding this comment.
All this seems very familiar. Is there a way to deduplicate it? Maybe a shared function that is used in both places.
There was a problem hiding this comment.
Good point! Refactored by creating a function findImageByName.
pkg/controller/bastion/vmdetails.go
Outdated
| return *bastion.MachineImage.Version, nil | ||
| } | ||
|
|
||
| var newest *semver.Version |
There was a problem hiding this comment.
nit: strictly speaking, that would be greatest.
gardener-robot-ci-3
added
reviewed/ok-to-test
gardener-robot-ci-1
added
reviewed/ok-to-test
gardener-robot-ci-3
added
the
reviewed/ok-to-test
gardener-robot-ci-2
removed
the
reviewed/ok-to-test
gardener-robot-ci-1
added
reviewed/ok-to-test
gardener-robot-ci-3
added
the
reviewed/ok-to-test
gardener-robot-ci-2
removed
the
reviewed/ok-to-test
gardener-robot-ci-3
added
the
reviewed/ok-to-test
gardener-robot-ci-1
removed
the
reviewed/ok-to-test
|
/hold until updated gardener/gardener |
gardener-robot
added
the
reviewed/do-not-merge
gardener-robot-ci-2
added
reviewed/ok-to-test
AndreasBurger
added
the
reviewed/ok-to-test
gardener-robot-ci-2
removed
the
reviewed/ok-to-test
hebelsan
force-pushed
the
bastion-rework
branch
from
2739d43 to
ae9a2c9
Compare
gardener-robot-ci-2
added
reviewed/ok-to-test
gardener-robot
added
size/m
gardener-robot-ci-1
added
reviewed/ok-to-test
|
/unhold |
gardener-robot
removed
the
reviewed/do-not-merge
gardener-robot
added
reviewed/lgtm
gardener-robot-ci-2
added
reviewed/ok-to-test
gardener-robot
added
the
status/closed
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.
How to categorize this PR?
/area quality
/kind enhancement
/platform azure
What this PR does / why we need it:
Instead of using a hardcoded bastion image we will use the image provided in the bastion section of the cloud profile.
See also GEP proposal
Which issue(s) this PR fixes:
Fixes #
Special notes for your reviewer:
We need to wait until the bastion section is released with gardener/gardener/types_cloudprofile.go.
Release note: