зеркало из https://github.com/Azure/ARO-RP.git
add clusterresourcegroupId to fix nsg regression
This commit is contained in:
Родитель
cdabe38303
Коммит
8bc452f2e7
|
@ -143,14 +143,15 @@ func (o *operator) resources() ([]kruntime.Object, error) {
|
|||
Name: arov1alpha1.SingletonClusterName,
|
||||
},
|
||||
Spec: arov1alpha1.ClusterSpec{
|
||||
ResourceID: o.oc.ID,
|
||||
Domain: domain,
|
||||
ACRDomain: o.env.ACRDomain(),
|
||||
AZEnvironment: o.env.Environment().Name,
|
||||
Location: o.env.Location(),
|
||||
InfraID: o.oc.Properties.InfraID,
|
||||
ArchitectureVersion: int(o.oc.Properties.ArchitectureVersion),
|
||||
VnetID: vnetID,
|
||||
ResourceID: o.oc.ID,
|
||||
ClusterResourceGroupID: o.oc.Properties.ClusterProfile.ResourceGroupID,
|
||||
Domain: domain,
|
||||
ACRDomain: o.env.ACRDomain(),
|
||||
AZEnvironment: o.env.Environment().Name,
|
||||
Location: o.env.Location(),
|
||||
InfraID: o.oc.Properties.InfraID,
|
||||
ArchitectureVersion: int(o.oc.Properties.ArchitectureVersion),
|
||||
VnetID: vnetID,
|
||||
GenevaLogging: arov1alpha1.GenevaLoggingSpec{
|
||||
ConfigVersion: o.env.ClusterGenevaLoggingConfigVersion(),
|
||||
MonitoringGCSAccount: o.env.ClusterGenevaLoggingAccount(),
|
||||
|
|
Загрузка…
Ссылка в новой задаче