зеркало из https://github.com/Azure/ARO-RP.git
precreate image registry storage account
This commit is contained in:
Родитель
ed319c139b
Коммит
f5e49f2d46
|
@ -134,6 +134,8 @@ func (m *manager) deployStorageTemplate(ctx context.Context, installConfig *inst
|
|||
m.storageAccount(clusterStorageAccountName, installConfig.Config.Azure.Region),
|
||||
m.storageAccountBlobContainer(clusterStorageAccountName, "ignition"),
|
||||
m.storageAccountBlobContainer(clusterStorageAccountName, "aro"),
|
||||
m.storageAccount(m.doc.OpenShiftCluster.Properties.ImageRegistryStorageAccountName, installConfig.Config.Azure.Region),
|
||||
m.storageAccountBlobContainer(m.doc.OpenShiftCluster.Properties.ImageRegistryStorageAccountName, "image-registry"),
|
||||
m.clusterNSG(infraID, installConfig.Config.Azure.Region),
|
||||
m.clusterServicePrincipalRBAC(),
|
||||
m.networkPrivateLinkService(installConfig),
|
||||
|
@ -206,7 +208,7 @@ func (m *manager) ensureGraph(ctx context.Context, installConfig *installconfig.
|
|||
|
||||
if m.doc.OpenShiftCluster.Properties.NetworkProfile.GatewayPrivateEndpointIP != "" {
|
||||
dnsConfig.GatewayPrivateEndpointIP = m.doc.OpenShiftCluster.Properties.NetworkProfile.GatewayPrivateEndpointIP
|
||||
dnsConfig.GatewayDomains = m.env.GatewayDomains()
|
||||
dnsConfig.GatewayDomains = append(m.env.GatewayDomains(), m.doc.OpenShiftCluster.Properties.ImageRegistryStorageAccountName+".blob."+m.env.Environment().StorageEndpointSuffix)
|
||||
}
|
||||
|
||||
g := graph.Graph{}
|
||||
|
|
|
@ -30,6 +30,8 @@ func (m *manager) generateSSHKey(ctx context.Context) error {
|
|||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
doc.OpenShiftCluster.Properties.ImageRegistryStorageAccountName = "imageregistry" + doc.OpenShiftCluster.Properties.StorageSuffix
|
||||
}
|
||||
|
||||
doc.OpenShiftCluster.Properties.ImageRegistryStorageAccountName = "imageregistry" + doc.OpenShiftCluster.Properties.StorageSuffix
|
||||
|
|
|
@ -183,7 +183,7 @@ func (o *operator) resources() ([]runtime.Object, error) {
|
|||
}
|
||||
|
||||
if o.oc.Properties.NetworkProfile.GatewayPrivateEndpointIP != "" {
|
||||
cluster.Spec.GatewayDomains = o.env.GatewayDomains()
|
||||
cluster.Spec.GatewayDomains = append(o.env.GatewayDomains(), o.oc.Properties.ImageRegistryStorageAccountName+".blob."+o.env.Environment().StorageEndpointSuffix)
|
||||
} else {
|
||||
cluster.Spec.InternetChecker = arov1alpha1.InternetCheckerSpec{
|
||||
URLs: []string{
|
||||
|
|
Загрузка…
Ссылка в новой задаче