Skip to content

Commit

Permalink
NO-JIRA: set diskStorageAccountType in aks e2e
Browse files Browse the repository at this point in the history
setting diskSotrageAccountType so that if the kube validation on the nodepool crd for this changes it will be caught in the e2e
  • Loading branch information
Patryk-Stefanski committed Dec 11, 2024
1 parent 92bbced commit 9236be1
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
3 changes: 2 additions & 1 deletion cmd/nodepool/azure/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ type RawAzurePlatformCreateOptions struct {
func DefaultOptions() *RawAzurePlatformCreateOptions {
return &RawAzurePlatformCreateOptions{
AzurePlatformCreateOptions: &AzurePlatformCreateOptions{
DiskSize: 120,
DiskSize: 120,
DiskStorageAccountType: string(hyperv1.DiskStorageAccountTypesPremiumLRS),
},
AzureMarketPlaceImageInfo: &AzureMarketPlaceImageInfo{},
}
Expand Down
4 changes: 2 additions & 2 deletions docs/content/contribute/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ We need to add the latest supported version in the `hypershift` repository. We n

- `support/supportedversion/version.go` which contains the variable called `LatestSupportedVersion`. This one contains, as you can imagine, the Latest supported version. We need to put the new version here.
- `support/supportedversion/version_test.go` contains the tests for the to validate the Latest version. It should comply with the established contract to support 2 versions prior to the Latest.

[Example Supported Version Bump PR](https://github.com/openshift/hypershift/pull/5146/files)

We also need to bump the base images in our Dockerfiles.
Expand All @@ -63,7 +63,7 @@ We also need to bump the base images in our Dockerfiles.

### [Openshift/Release](https://github.com/openshift/release) Repository

The Step registry config should be updated by Test Platform. However, the Test Platform is not aware of custom configurations of the different version for specifc hypershift tests.
The Step registry config should be updated by Test Platform. However, the Test Platform is not aware of custom configurations of the different version for specific hypershift tests.
So, we need to check over the Step registry config and make sure that the hypershift tests are correctly configured. Below is an example of the necessary changes to the Step registry config after test platform bumps:

[Example Release Repo PR](https://github.com/openshift/release/pull/59120/files)
Expand Down
2 changes: 1 addition & 1 deletion support/azureutil/azureutil_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ func TestCreateEnvVarsForAzureManagedIdentity(t *testing.T) {
want []corev1.EnvVar
}{
{
name: "returns a slice of environment variables iwth the azure creds",
name: "returns a slice of environment variables with the azure creds",
args: args{
azureClientID: "my-client-id",
azureTenantID: "my-tenant-id",
Expand Down
4 changes: 2 additions & 2 deletions support/controlplane-component/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func (c *controlPlaneWorkload) applyWatchedResourcesAnnotation(cpContext Control
hashedData = append(hashedData, util.HashSimple(value))
}
}
// if not sorted, we could get a different value on each reconcilation loop and cause unneeded rollout.
// if not sorted, we could get a different value on each reconciliation loop and cause unneeded rollout.
slices.Sort(hashedData)

if podTemplate.Annotations == nil {
Expand Down Expand Up @@ -173,7 +173,7 @@ func replaceContainersImageFromPayload(imageProvider imageprovider.ReleaseImageP
containers[i].Image = payloadImage
} else if key == "cluster-version-operator" {
// fallback to hcp releaseImage if "cluster-version-operator" image is not available.
// This could happen for example in local dev enviroments if the "OPERATE_ON_RELEASE_IMAGE" env variable is not set.
// This could happen for example in local dev environments if the "OPERATE_ON_RELEASE_IMAGE" env variable is not set.
containers[i].Image = util.HCPControlPlaneReleaseImage(hcp)
}
}
Expand Down

0 comments on commit 9236be1

Please sign in to comment.