Skip to content

[WIP] OCPBUGS-76945: Add Azure Resource Group in OCP console for ODF STS installation #16030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cajieh wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −1
Open

[WIP] OCPBUGS-76945: Add Azure Resource Group in OCP console for ODF STS installation #16030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions frontend/packages/operator-lifecycle-manager/locales/en/olm.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,8 @@
"The Azure Tenant ID required for the operator to access the cloud API.": "The Azure Tenant ID required for the operator to access the cloud API.",
"Azure Subscription ID": "Azure Subscription ID",
"The Azure Subscription ID required for the operator to access the cloud API.": "The Azure Subscription ID required for the operator to access the cloud API.",
"Azure Resource Group": "Azure Resource Group",
"The Azure Resource Group required for the operator to access cloud resources.": "The Azure Resource Group required for the operator to access cloud resources.",
"GCP Project Number": "GCP Project Number",
"The GCP Project Number required for the operator to access the cloud API.": "The GCP Project Number required for the operator to access the cloud API.",
"GCP Pool ID": "GCP Pool ID",
Expand Down
19 changes: 18 additions & 1 deletion ...ackages/operator-lifecycle-manager/src/components/operator-hub/operator-hub-subscribe.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ export const OperatorHubSubscribeForm: FC<OperatorHubSubscribeFormProps> = (prop
const [azureTenantId, setAzureTenantId] = useState('');
const [azureClientId, setAzureClientId] = useState('');
const [azureSubscriptionId, setAzureSubscriptionId] = useState('');
const [azureResourceGroup, setAzureResourceGroup] = useState('');
const [gcpProjectNumber, setGcpProjectNumber] = useState('');
const [gcpPoolId, setGcpPoolId] = useState('');
const [gcpProviderId, setGcpProviderId] = useState('');
Expand Down Expand Up @@ -512,6 +513,10 @@ export const OperatorHubSubscribeForm: FC<OperatorHubSubscribeFormProps> = (prop
name: 'SUBSCRIPTIONID',
value: azureSubscriptionId,
},
{
name: 'RESOURCEGROUP',
value: azureResourceGroup,
},
],
};
break;
Expand Down Expand Up @@ -590,7 +595,9 @@ export const OperatorHubSubscribeForm: FC<OperatorHubSubscribeFormProps> = (prop
!_.isEmpty(conflictingProvidedAPIs(selectedTargetNamespace)) ||
(tokenizedAuth === 'AWS' && _.isEmpty(roleARNText)) ||
(tokenizedAuth === 'Azure' &&
[azureClientId, azureTenantId, azureSubscriptionId].some((v) => _.isEmpty(v))) ||
[azureClientId, azureTenantId, azureSubscriptionId, azureResourceGroup].some((v) =>
_.isEmpty(v),
)) ||
(tokenizedAuth === 'GCP' &&
[gcpProjectNumber, gcpPoolId, gcpProviderId, gcpServiceAcctEmail].some((v) => _.isEmpty(v)));

Expand Down Expand Up @@ -948,6 +955,16 @@ export const OperatorHubSubscribeForm: FC<OperatorHubSubscribeFormProps> = (prop
value={azureSubscriptionId}
setValue={setAzureSubscriptionId}
/>
<InputField
label={t('olm~Azure Resource Group')}
helpText={t(
'olm~The Azure Resource Group required for the operator to access cloud resources.',
)}
placeholder={t('olm~Azure Resource Group')}
ariaLabel={t('olm~Azure Resource Group')}
value={azureResourceGroup}
setValue={setAzureResourceGroup}
/>
</div>
)}
{tokenizedAuth === 'GCP' && (
Expand Down