Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions data/data/install.openshift.io_installconfigs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ spec:
- MachineAPI
- Build
- DeploymentConfig
- ImageRegistry
type: string
type: array
baselineCapabilitySet:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ require (
github.com/microsoftgraph/msgraph-sdk-go v0.47.0
github.com/nutanix-cloud-native/prism-go-client v0.2.1-0.20220804130801-c8a253627c64
github.com/onsi/gomega v1.27.6
github.com/openshift/api v0.0.0-20230807132801-600991d550ac
github.com/openshift/api v0.0.0-20230829144734-edd317298780
github.com/openshift/assisted-image-service v0.0.0-20230508133451-c15a62b72155
github.com/openshift/assisted-service/api v0.0.0
github.com/openshift/assisted-service/client v0.0.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1010,8 +1010,8 @@ github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xA
github.com/openshift/api v0.0.0-20200326160804-ecb9283fe820/go.mod h1:RKMJ5CBnljLfnej+BJ/xnOWc3kZDvJUaIAEq2oKSPtE=
github.com/openshift/api v0.0.0-20200827090112-c05698d102cf/go.mod h1:M3xexPhgM8DISzzRpuFUy+jfPjQPIcs9yqEYj17mXV8=
github.com/openshift/api v0.0.0-20200829102639-8a3a835f1acf/go.mod h1:M3xexPhgM8DISzzRpuFUy+jfPjQPIcs9yqEYj17mXV8=
github.com/openshift/api v0.0.0-20230807132801-600991d550ac h1:HqT8MmYGXiUGUW0BjygTGOOvqO2wIsTaG3q8nboJyPY=
github.com/openshift/api v0.0.0-20230807132801-600991d550ac/go.mod h1:yimSGmjsI+XF1mr+AKBs2//fSXIOhhetHGbMlBEfXbs=
github.com/openshift/api v0.0.0-20230829144734-edd317298780 h1:YkJr0cJmFd7lctcQ82I9zhxlSsrhwqOtHtw5rTIG5J8=
github.com/openshift/api v0.0.0-20230829144734-edd317298780/go.mod h1:yimSGmjsI+XF1mr+AKBs2//fSXIOhhetHGbMlBEfXbs=
github.com/openshift/assisted-image-service v0.0.0-20230508133451-c15a62b72155 h1:tw+b2D3hxRmjARubw7I9aZ84VumljbIXSZ+8zWX1Y0o=
github.com/openshift/assisted-image-service v0.0.0-20230508133451-c15a62b72155/go.mod h1:I+6C5J84eXUUFoOqXCVNOaHQkyYoFD2ObgBhz99B9gc=
github.com/openshift/assisted-service/api v0.0.0-20230822055104-ba04805cce13 h1:l7+3leGv8eryw04p8cXyusMszLE1Dkw1S3hQPU4tBpU=
Expand Down
5 changes: 3 additions & 2 deletions pkg/asset/machines/azure/machines.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"sort"
"strings"

"github.com/Azure/go-autorest/autorest/to"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -92,7 +93,7 @@ func Machines(clusterID string, config *types.InstallConfig, pool *types.Machine

failureDomains = append(failureDomains, domain)
}
machineSetProvider.Zone = nil
machineSetProvider.Zone = ""
controlPlaneMachineSet := &machinev1.ControlPlaneMachineSet{
TypeMeta: metav1.TypeMeta{
APIVersion: "machine.openshift.io/v1",
Expand Down Expand Up @@ -253,7 +254,7 @@ func provider(platform *azure.Platform, mpool *azure.MachinePool, osImage string
},
SecurityProfile: securityProfile,
UltraSSDCapability: ultraSSDCapability,
Zone: az,
Zone: to.String(az),
Subnet: subnet,
ManagedIdentity: managedIdentity,
Vnet: virtualNetwork,
Expand Down
3 changes: 1 addition & 2 deletions pkg/tfvars/azure/azure.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"math/rand"
"time"

"github.com/Azure/go-autorest/autorest/to"
"github.com/pkg/errors"

machineapi "github.com/openshift/api/machine/v1beta1"
Expand Down Expand Up @@ -101,7 +100,7 @@ func TFVars(sources TFVarsSources) ([]byte, error) {

masterAvailabilityZones := make([]string, len(sources.MasterConfigs))
for i, c := range sources.MasterConfigs {
masterAvailabilityZones[i] = to.String(c.Zone)
masterAvailabilityZones[i] = c.Zone
}

environment, err := environment(sources.CloudName)
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading