зеркало из https://github.com/Azure/ARO-RP.git
Update manifests creation to skip aro-operator
This commit is contained in:
Родитель
5a4e719d87
Коммит
97cfcef326
|
@ -15,8 +15,8 @@ func ExamplePlatformWorkloadIdentityRoleSetDocument() *PlatformWorkloadIdentityR
|
|||
OpenShiftVersion: "4.14",
|
||||
PlatformWorkloadIdentityRoles: []PlatformWorkloadIdentityRole{
|
||||
{
|
||||
OperatorName: "ServiceOperator",
|
||||
RoleDefinitionName: "AzureRedHatOpenShiftServiceOperator",
|
||||
OperatorName: "aro-operator",
|
||||
RoleDefinitionName: "Azure Red Hat OpenShift Service Operator",
|
||||
RoleDefinitionID: "/providers/Microsoft.Authorization/roleDefinitions/00000000-0000-0000-0000-000000000000",
|
||||
ServiceAccounts: []string{
|
||||
"aro-operator-master",
|
||||
|
|
|
@ -289,7 +289,7 @@ func TestGeneratePlatformWorkloadIdentitySecrets(t *testing.T) {
|
|||
ClientID: "00f00f00-0f00-0f00-0f00-f00f00f00f00",
|
||||
},
|
||||
{
|
||||
OperatorName: "ServiceOperator",
|
||||
OperatorName: "aro-operator",
|
||||
ClientID: "00ba4ba4-0ba4-0ba4-0ba4-ba4ba4ba4ba4",
|
||||
},
|
||||
},
|
||||
|
@ -302,7 +302,7 @@ func TestGeneratePlatformWorkloadIdentitySecrets(t *testing.T) {
|
|||
},
|
||||
},
|
||||
{
|
||||
OperatorName: "ServiceOperator",
|
||||
OperatorName: "aro-operator",
|
||||
SecretLocation: api.SecretLocation{
|
||||
Namespace: "openshift-bar",
|
||||
Name: "azure-cloud-credentials",
|
||||
|
|
|
@ -10,7 +10,7 @@ const (
|
|||
Namespace = "openshift-azure-operator"
|
||||
SecretName = "cluster"
|
||||
|
||||
OperatorIdentityName = "ServiceOperator"
|
||||
OperatorIdentityName = "aro-operator"
|
||||
OperatorIdentitySecretName = "azure-cloud-credentials"
|
||||
OperatorTokenFile = "/var/run/secrets/openshift/serviceaccount/token"
|
||||
)
|
||||
|
|
Загрузка…
Ссылка в новой задаче