@drunk-pulumi/azure 1.0.4 → 1.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Aks/Helper.d.ts +3 -5
- package/Aks/Helper.js +1 -1
- package/Aks/Identity.d.ts +2 -5
- package/Aks/Identity.js +1 -1
- package/Aks/VmSetAutoScale/index.d.ts +0 -2
- package/Aks/VmSetAutoScale/index.js +1 -1
- package/Aks/VmSetMonitor/index.d.ts +0 -2
- package/Aks/VmSetMonitor/index.js +6 -6
- package/Aks/index.d.ts +6 -14
- package/Aks/index.js +29 -38
- package/Automation/index.d.ts +2 -3
- package/Automation/index.js +6 -14
- package/AzAd/EnvRoles.Consts.d.ts +4 -3
- package/AzAd/EnvRoles.Consts.js +28 -46
- package/AzAd/EnvRoles.d.ts +5 -4
- package/AzAd/EnvRoles.js +32 -25
- package/AzAd/Group.d.ts +5 -7
- package/AzAd/Group.js +5 -14
- package/AzAd/Helper.d.ts +6 -6
- package/AzAd/Helper.js +39 -54
- package/AzAd/Identities/AzDevOpsIdentity.d.ts +2 -2
- package/AzAd/Identities/AzDevOpsIdentity.js +13 -7
- package/AzAd/Identities/AzDevOpsManagedIdentity.js +2 -7
- package/AzAd/Identities/AzUserAdRevertSync.d.ts +2 -3
- package/AzAd/Identities/AzUserAdRevertSync.js +3 -4
- package/AzAd/Identities/GlobalUserAssignedIdentity.d.ts +4 -0
- package/AzAd/Identities/GlobalUserAssignedIdentity.js +19 -0
- package/AzAd/Identities/index.d.ts +4 -3
- package/AzAd/Identities/index.js +26 -2
- package/AzAd/Identity.d.ts +4 -7
- package/AzAd/Identity.js +19 -27
- package/AzAd/RoleAssignment.d.ts +2 -2
- package/AzAd/RoleAssignment.js +3 -3
- package/AzAd/UserAssignedIdentity.d.ts +3 -3
- package/AzAd/UserAssignedIdentity.js +24 -6
- package/Builder/AksBuilder.js +3 -3
- package/Builder/ApimApiBuilder.js +3 -3
- package/Builder/ApimPolicyBuilder.js +3 -3
- package/Builder/ApimProductBuilder.js +6 -12
- package/Builder/EnvRoleBuilder.d.ts +36 -0
- package/Builder/EnvRoleBuilder.js +57 -0
- package/Builder/ResourceBuilder.js +26 -16
- package/Builder/SqlBuilder.js +7 -1
- package/Builder/VmBuilder.js +2 -5
- package/Builder/index.d.ts +15 -14
- package/Builder/index.js +4 -2
- package/Builder/types/apimPolicyBuilder.d.ts +4 -5
- package/Builder/types/apimPolicyBuilder.js +1 -1
- package/Builder/types/apimProductBuilder.d.ts +8 -10
- package/Builder/types/envRoleBuilder.d.ts +14 -0
- package/Builder/types/envRoleBuilder.js +3 -0
- package/Builder/types/genericBuilder.d.ts +15 -13
- package/Builder/types/genericBuilder.js +1 -1
- package/Builder/types/index.d.ts +15 -14
- package/Builder/types/index.js +2 -1
- package/Builder/types/resourceBuilder.d.ts +7 -6
- package/Builder/types/sqlBuilder.d.ts +2 -3
- package/Builder/types/storageBuilder.d.ts +1 -1
- package/Builder/types/vaultBuilder.d.ts +2 -2
- package/Builder/types/vmBuilder.d.ts +11 -11
- package/Builder/types/vnetBuilder.d.ts +19 -19
- package/Cdn/CdnEndpoint.d.ts +2 -2
- package/Cdn/index.d.ts +2 -2
- package/Cdn/index.js +3 -11
- package/Certificate/index.js +12 -25
- package/Common/AzureEnv.d.ts +1 -2
- package/Common/AzureEnv.js +2 -10
- package/Common/Naming/index.d.ts +1 -0
- package/Common/Naming/index.js +5 -3
- package/ContainerRegistry/Helper.d.ts +2 -3
- package/ContainerRegistry/Helper.js +2 -3
- package/ContainerRegistry/index.d.ts +2 -4
- package/ContainerRegistry/index.js +1 -50
- package/Core/Helper.d.ts +4 -2
- package/Core/Helper.js +7 -2
- package/Core/KeyGenerators.d.ts +2 -4
- package/Core/KeyGenerators.js +7 -12
- package/Core/Random.d.ts +6 -9
- package/Core/Random.js +17 -21
- package/Core/ResourceCreator.d.ts +2 -2
- package/Core/ResourceGroup.d.ts +2 -2
- package/Core/ResourceGroup.js +4 -3
- package/CosmosDb/index.d.ts +4 -9
- package/CosmosDb/index.js +4 -4
- package/IOT/Hub/index.d.ts +4 -5
- package/IOT/Hub/index.js +25 -26
- package/KeyVault/CustomHelper.d.ts +4 -9
- package/KeyVault/CustomHelper.js +3 -4
- package/KeyVault/Helper.d.ts +10 -13
- package/KeyVault/Helper.js +46 -26
- package/KeyVault/index.js +2 -1
- package/Logs/AppInsight.d.ts +2 -3
- package/Logs/AppInsight.js +1 -1
- package/Logs/Helpers.d.ts +3 -8
- package/Logs/Helpers.js +7 -9
- package/Logs/LogAnalytics.d.ts +2 -5
- package/Logs/LogAnalytics.js +13 -17
- package/Logs/index.d.ts +3 -5
- package/Logs/index.js +7 -4
- package/MySql/index.d.ts +3 -10
- package/MySql/index.js +15 -20
- package/Postgresql/index.d.ts +3 -4
- package/Postgresql/index.js +30 -24
- package/RedisCache/index.d.ts +5 -3
- package/RedisCache/index.js +18 -24
- package/ServiceBus/index.d.ts +6 -8
- package/ServiceBus/index.js +9 -15
- package/SignalR/index.d.ts +5 -3
- package/SignalR/index.js +19 -28
- package/Sql/SqlDb.d.ts +3 -3
- package/Sql/SqlDb.js +11 -2
- package/Sql/index.d.ts +5 -9
- package/Sql/index.js +41 -30
- package/Storage/ManagementRules.d.ts +6 -8
- package/Storage/ManagementRules.js +3 -3
- package/Storage/index.d.ts +3 -6
- package/Storage/index.js +24 -27
- package/VM/DiskEncryptionSet.d.ts +8 -0
- package/VM/DiskEncryptionSet.js +43 -0
- package/VM/index.d.ts +5 -11
- package/VM/index.js +24 -12
- package/VNet/Firewall.js +3 -5
- package/VNet/FirewallPolicies/AksFirewallPolicy.d.ts +2 -1
- package/VNet/FirewallPolicies/AksFirewallPolicy.js +22 -19
- package/VNet/Helper.d.ts +2 -2
- package/VNet/Helper.js +6 -3
- package/VNet/IpAddressPrefix.d.ts +5 -7
- package/VNet/IpAddressPrefix.js +5 -5
- package/VNet/PrivateEndpoint.d.ts +2 -2
- package/VNet/PrivateEndpoint.js +2 -3
- package/VNet/RouteTable.d.ts +4 -4
- package/VNet/RouteTable.js +4 -4
- package/VNet/Vnet.js +5 -1
- package/VNet/index.d.ts +3 -5
- package/VNet/index.js +1 -1
- package/VNet/types.d.ts +3 -4
- package/Web/AppCertOrder.d.ts +2 -3
- package/Web/AppCertOrder.js +1 -1
- package/Web/AppConfig.d.ts +2 -5
- package/Web/AppConfig.js +3 -4
- package/package.json +5 -5
- package/types.d.ts +42 -28
package/Aks/Helper.d.ts
CHANGED
|
@@ -1,15 +1,13 @@
|
|
|
1
|
-
import { KeyVaultInfo, ResourceInfo } from '../types';
|
|
1
|
+
import { KeyVaultInfo, ResourceInfo, NamedType } from '../types';
|
|
2
2
|
import { Output } from '@pulumi/pulumi';
|
|
3
3
|
/** Get AKS Config from Managed Cluster*/
|
|
4
|
-
export declare const getAksConfig: ({ name, groupName, formattedName, disableLocalAccounts, }: {
|
|
5
|
-
name: string;
|
|
4
|
+
export declare const getAksConfig: ({ name, groupName, formattedName, disableLocalAccounts, }: NamedType & {
|
|
6
5
|
groupName: string;
|
|
7
6
|
formattedName?: boolean;
|
|
8
7
|
disableLocalAccounts?: boolean;
|
|
9
8
|
}) => Promise<string>;
|
|
10
9
|
/** Get AKS Config from Key Vault*/
|
|
11
|
-
export declare const getAksVaultConfig: ({ name, version, vaultInfo, formattedName, }: {
|
|
12
|
-
name: string;
|
|
10
|
+
export declare const getAksVaultConfig: ({ name, version, vaultInfo, formattedName, }: NamedType & {
|
|
13
11
|
version?: string;
|
|
14
12
|
vaultInfo: KeyVaultInfo;
|
|
15
13
|
formattedName?: boolean;
|
package/Aks/Helper.js
CHANGED
|
@@ -76,4 +76,4 @@ const getAksPrivateDnz = (aksInfo) => {
|
|
|
76
76
|
});
|
|
77
77
|
};
|
|
78
78
|
exports.getAksPrivateDnz = getAksPrivateDnz;
|
|
79
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
79
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL0Frcy9IZWxwZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSwwRUFBNEQ7QUFDNUQsc0NBQTZEO0FBQzdELG1EQUFvRDtBQUVwRCwrQ0FBK0M7QUFDL0MsMkNBQXFEO0FBQ3JELGlEQUFvRDtBQUVwRCx5Q0FBeUM7QUFDbEMsTUFBTSxZQUFZLEdBQUcsS0FBSyxFQUFFLEVBQ2pDLElBQUksRUFDSixTQUFTLEVBQ1QsYUFBYSxFQUNiLG9CQUFvQixHQUtyQixFQUFtQixFQUFFO0lBQ3BCLE1BQU0sT0FBTyxHQUFHLGFBQWEsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFBLG1CQUFVLEVBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEQsTUFBTSxLQUFLLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLElBQUEsNkJBQW9CLEVBQUMsU0FBUyxDQUFDLENBQUM7SUFFMUUsTUFBTSxHQUFHLEdBQUcsb0JBQW9CO1FBQzlCLENBQUMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxpQ0FBaUMsQ0FBQztZQUN6QyxZQUFZLEVBQUUsT0FBTztZQUNyQixpQkFBaUIsRUFBRSxLQUFLO1NBQ3pCLENBQUM7UUFDSixDQUFDLENBQUMsTUFBTSxFQUFFLENBQUMsa0NBQWtDLENBQUM7WUFDMUMsWUFBWSxFQUFFLE9BQU87WUFDckIsaUJBQWlCLEVBQUUsS0FBSztTQUN6QixDQUFDLENBQUM7SUFFUCxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDO0FBQzFFLENBQUMsQ0FBQztBQXhCVyxRQUFBLFlBQVksZ0JBd0J2QjtBQUVGLG1DQUFtQztBQUM1QixNQUFNLGlCQUFpQixHQUFHLEtBQUssRUFBRSxFQUN0QyxJQUFJLEVBQ0osT0FBTyxFQUNQLFNBQVMsRUFDVCxhQUFhLEdBS2QsRUFBbUIsRUFBRTtJQUNwQixNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsSUFBQSxtQkFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hELE1BQU0sRUFBRSxHQUFHLE1BQU0sSUFBQSxrQkFBUyxFQUFDO1FBQ3pCLElBQUksRUFBRSxHQUFHLE9BQU8sU0FBUztRQUN6QixPQUFPO1FBQ1AsU0FBUztRQUNULGFBQWEsRUFBRSxLQUFLO0tBQ3JCLENBQUMsQ0FBQztJQUNILE9BQU8sRUFBRSxFQUFFLEtBQUssSUFBSSxFQUFFLENBQUM7QUFDekIsQ0FBQyxDQUFDO0FBbEJXLFFBQUEsaUJBQWlCLHFCQWtCNUI7QUFFSyxNQUFNLGdCQUFnQixHQUFHLENBQzlCLE9BQXFCLEVBQ2EsRUFBRTtJQUNwQyxNQUFNLEdBQUcsR0FBRyxFQUFFLENBQUMsdUJBQXVCLENBQUM7UUFDckMsWUFBWSxFQUFFLE9BQU8sQ0FBQyxJQUFJO1FBQzFCLGlCQUFpQixFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUMsaUJBQWlCO0tBQ25ELENBQUMsQ0FBQztJQUVILE9BQU8sR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFO1FBQ3JCLElBQUksQ0FBQyxDQUFDLENBQUMsV0FBVztZQUFFLE9BQU8sU0FBUyxDQUFDO1FBQ3JDLE1BQU0sT0FBTyxHQUFHLENBQUMsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDNUQsTUFBTSxPQUFPLEdBQUcsQ0FBQyxDQUFDLGlCQUFrQixDQUFDO1FBRXJDLE9BQU87WUFDTCxJQUFJLEVBQUUsT0FBTztZQUNiLEtBQUssRUFBRSxFQUFFLGlCQUFpQixFQUFFLE9BQU8sRUFBRSxRQUFRLEVBQUUseUJBQWEsRUFBRTtZQUM5RCxFQUFFLEVBQUUsSUFBQSxvQkFBVyxFQUFBLGtCQUFrQix5QkFBYyxtQkFBbUIsT0FBTyxnREFBZ0QsT0FBTyxFQUFFO1NBQ25ILENBQUM7SUFDcEIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUM7QUFuQlcsUUFBQSxnQkFBZ0Isb0JBbUIzQiJ9
|
package/Aks/Identity.d.ts
CHANGED
|
@@ -1,7 +1,4 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
3
|
-
name: string;
|
|
4
|
-
vaultInfo?: KeyVaultInfo;
|
|
5
|
-
}
|
|
1
|
+
import { NamedWithVaultBasicArgs } from '../types';
|
|
2
|
+
type Props = NamedWithVaultBasicArgs;
|
|
6
3
|
declare const _default: ({ name, vaultInfo, dependsOn }: Props) => import("../AzAd/Identity").IdentityResult;
|
|
7
4
|
export default _default;
|
package/Aks/Identity.js
CHANGED
|
@@ -33,4 +33,4 @@ exports.default = ({ name, vaultInfo, dependsOn }) => {
|
|
|
33
33
|
});
|
|
34
34
|
return serverIdentity;
|
|
35
35
|
};
|
|
36
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
36
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiSWRlbnRpdHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQWtzL0lkZW50aXR5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsNkRBQThEO0FBQzlELGdFQUErQztBQUUvQywyREFBd0Q7QUFDeEQsc0NBQTRDO0FBSTVDLDJEQUEyRDtBQUMzRCxrQkFBZSxDQUFDLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQVMsRUFBRSxFQUFFO0lBQ3ZELDhDQUE4QztJQUM5QyxNQUFNLFdBQVcsR0FBRyxJQUFBLHFDQUFtQixFQUNyQyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUNwQyxFQUFFLElBQUksRUFBRSxnQkFBZ0IsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFO0lBQ3pDLGdEQUFnRDtJQUNoRCxFQUFFLElBQUksRUFBRSxvQkFBb0IsRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFFLENBQzdDLENBQUM7SUFFRixNQUFNLGNBQWMsR0FBRyxJQUFBLGtCQUFlLEVBQUM7UUFDckMsSUFBSTtRQUNKLGtCQUFrQixFQUFFLElBQUk7UUFDeEIsZUFBZSxFQUFFLElBQUk7UUFDckIsd0JBQXdCLEVBQUUsQ0FBQyxXQUFXLENBQUM7UUFDdkMsWUFBWSxFQUFFLEtBQUs7UUFDbkIsT0FBTyxFQUFFLEtBQUs7UUFDZCxTQUFTO1FBQ1QsU0FBUztLQUNWLENBQUMsQ0FBQztJQUVILElBQUEsK0JBQWMsRUFBQztRQUNiLElBQUksRUFBRSxHQUFHLElBQUksd0JBQXdCO1FBQ3JDLFdBQVcsRUFBRSxjQUFjLENBQUMsV0FBWTtRQUN4QyxhQUFhLEVBQUUsa0JBQWtCO1FBQ2pDLFFBQVEsRUFBRSxTQUFTO1FBQ25CLEtBQUssRUFBRSx3QkFBZTtRQUN0QixTQUFTLEVBQUUsY0FBYyxDQUFDLFFBQVE7S0FDbkMsQ0FBQyxDQUFDO0lBRUgsT0FBTyxjQUFjLENBQUM7QUFDeEIsQ0FBQyxDQUFDIn0=
|
|
@@ -1,10 +1,8 @@
|
|
|
1
1
|
import { AzureResourceItem } from '../../Core/Helper';
|
|
2
2
|
import { BasicMonitorArgs, ResourceGroupInfo } from '../../types';
|
|
3
|
-
import { Input, Resource } from '@pulumi/pulumi';
|
|
4
3
|
interface Props extends BasicMonitorArgs {
|
|
5
4
|
group: ResourceGroupInfo;
|
|
6
5
|
getCapacity?: typeof defaultGetCapacity;
|
|
7
|
-
dependsOn?: Input<Input<Resource>[]> | Input<Resource>;
|
|
8
6
|
}
|
|
9
7
|
declare const defaultGetCapacity: (vmScaleSet: AzureResourceItem) => {
|
|
10
8
|
nightCapacity?: 0 | 1 | number;
|
|
@@ -152,4 +152,4 @@ exports.default = async ({ group, getCapacity = defaultGetCapacity, dependsOn, }
|
|
|
152
152
|
return autoScale;
|
|
153
153
|
});
|
|
154
154
|
};
|
|
155
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
155
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQWtzL1ZtU2V0QXV0b1NjYWxlL2luZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3RUFBMEQ7QUFFMUQsOENBQXNFO0FBU3RFLE1BQU0sa0JBQWtCLEdBQUcsQ0FDekIsVUFBNkIsRUFNN0IsRUFBRTtJQUNGLE1BQU0sSUFBSSxHQUFHLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQztJQUNsRSxJQUFJLElBQUksS0FBSyxRQUFRO1FBQ25CLE9BQU8sRUFBRSxhQUFhLEVBQUUsQ0FBQyxFQUFFLE9BQU8sRUFBRSxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxFQUFFLENBQUM7SUFDbEUsT0FBTyxFQUFFLGFBQWEsRUFBRSxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsRUFBRSxPQUFPLEVBQUUsQ0FBQyxFQUFFLE9BQU8sRUFBRSxDQUFDLEVBQUUsQ0FBQztBQUNsRSxDQUFDLENBQUM7QUFFRixrQkFBZSxLQUFLLEVBQUUsRUFDcEIsS0FBSyxFQUNMLFdBQVcsR0FBRyxrQkFBa0IsRUFDaEMsU0FBUyxHQUNILEVBQUUsRUFBRTtJQUNWLE1BQU0sV0FBVyxHQUFHLE1BQU0sSUFBQSx1QkFBYyxFQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQ2xFLElBQUksQ0FBQyxXQUFXO1FBQUUsT0FBTztJQUV6QixPQUFPLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRTtRQUM1QixNQUFNLEdBQUcsR0FBRyxXQUFXLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDNUIsTUFBTSxRQUFRLEdBQUcsSUFBSSxLQUFLLEVBQXdDLENBQUM7UUFDbkUsTUFBTSxR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
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { BasicMonitorArgs, KeyVaultInfo, ResourceGroupInfo } from '../../types';
|
|
2
|
-
import { Input, Resource } from '@pulumi/pulumi';
|
|
3
2
|
interface Props extends BasicMonitorArgs {
|
|
4
3
|
group: ResourceGroupInfo;
|
|
5
4
|
vaultInfo: KeyVaultInfo;
|
|
6
|
-
dependsOn?: Input<Input<Resource>[]> | Input<Resource>;
|
|
7
5
|
}
|
|
8
6
|
declare const _default: ({ group, logWpId, logStorageId, vaultInfo, dependsOn, }: Props) => import("@pulumi/pulumi").Output<{
|
|
9
7
|
diag: import("@pulumi/azure-native/compute/virtualMachineScaleSetExtension").VirtualMachineScaleSetExtension;
|
|
@@ -27,15 +27,15 @@ const native = __importStar(require("@pulumi/azure-native"));
|
|
|
27
27
|
const Helper_1 = require("../../Core/Helper");
|
|
28
28
|
const fs = __importStar(require("fs"));
|
|
29
29
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
30
|
-
const
|
|
31
|
-
const
|
|
30
|
+
const Common_1 = require("../../Common");
|
|
31
|
+
const Helpers_1 = require("../../Logs/Helpers");
|
|
32
32
|
const Helper_2 = require("../../Storage/Helper");
|
|
33
33
|
exports.default = ({ group, logWpId, logStorageId, vaultInfo, dependsOn, }) => (0, pulumi_1.all)([logWpId, logStorageId]).apply(async ([lId, sId]) => {
|
|
34
34
|
const vmScaleSets = await (0, Helper_1.findVMScaleSet)(group.resourceGroupName);
|
|
35
35
|
if (!vmScaleSets)
|
|
36
36
|
return;
|
|
37
37
|
const logWp = lId
|
|
38
|
-
? await (0,
|
|
38
|
+
? await (0, Helpers_1.getLogWpSecretsById)({ logWpId: lId, vaultInfo })
|
|
39
39
|
: undefined;
|
|
40
40
|
const logStorage = sId
|
|
41
41
|
? await (0, Helper_2.getStorageSecretsById)({
|
|
@@ -50,8 +50,8 @@ exports.default = ({ group, logWpId, logStorageId, vaultInfo, dependsOn, }) => (
|
|
|
50
50
|
const originalSetting = fs.readFileSync(__dirname + '/config.json', 'utf8');
|
|
51
51
|
return vmScaleSets.map((vm) => {
|
|
52
52
|
let settings = originalSetting;
|
|
53
|
-
settings = (0,
|
|
54
|
-
settings = (0,
|
|
53
|
+
settings = (0, Common_1.replaceAll)(settings, '__DIAGNOSTIC_STORAGE_ACCOUNT__', logStorage.info.name);
|
|
54
|
+
settings = (0, Common_1.replaceAll)(settings, '__VM_OR_VMSS_RESOURCE_ID__', vm.id);
|
|
55
55
|
//LinuxDiagnostic
|
|
56
56
|
const diag = new native.compute.VirtualMachineScaleSetExtension(`${vm.name}-LinuxDiagnostic`, {
|
|
57
57
|
resourceGroupName: vm.resourceGroupName,
|
|
@@ -87,4 +87,4 @@ exports.default = ({ group, logWpId, logStorageId, vaultInfo, dependsOn, }) => (
|
|
|
87
87
|
return { diag, oms };
|
|
88
88
|
});
|
|
89
89
|
});
|
|
90
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
90
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvQWtzL1ZtU2V0TW9uaXRvci9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNkRBQStDO0FBQy9DLDhDQUFtRDtBQUNuRCx1Q0FBeUI7QUFFekIsMkNBQXNEO0FBQ3RELHlDQUEwQztBQUMxQyxnREFBeUQ7QUFDekQsaURBQTRFO0FBTzVFLGtCQUFlLENBQUMsRUFDZCxLQUFLLEVBQ0wsT0FBTyxFQUNQLFlBQVksRUFDWixTQUFTLEVBQ1QsU0FBUyxHQUNILEVBQUUsRUFBRSxDQUNWLElBQUEsWUFBRyxFQUFDLENBQUMsT0FBTyxFQUFFLFlBQVksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxDQUFDLEdBQUcsRUFBRSxHQUFHLENBQUMsRUFBRSxFQUFFO0lBQ3RELE1BQU0sV0FBVyxHQUFHLE1BQU0sSUFBQSx1QkFBYyxFQUFDLEtBQUssQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO0lBQ2xFLElBQUksQ0FBQyxXQUFXO1FBQUUsT0FBTztJQUV6QixNQUFNLEtBQUssR0FBRyxHQUFHO1FBQ2YsQ0FBQyxDQUFDLE1BQU0sSUFBQSw2QkFBbUIsRUFBQyxFQUFFLE9BQU8sRUFBRSxHQUFHLEVBQUUsU0FBUyxFQUFFLENBQUM7UUFDeEQsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUNkLE1BQU0sVUFBVSxHQUFHLEdBQUc7UUFDcEIsQ0FBQyxDQUFDLE1BQU0sSUFBQSw4QkFBcUIsRUFBQztZQUMxQixTQUFTLEVBQUUsR0FBRztZQUNkLFNBQVM7WUFDVCx1QkFBdUI7U0FDeEIsQ0FBQztRQUNKLENBQUMsQ0FBQyxTQUFTLENBQUM7SUFFZCxJQUFJLENBQUMsS0FBSyxJQUFJLENBQUMsVUFBVTtRQUFFLE9BQU87SUFFbEMsTUFBTSxNQUFNLEdBQUcsTUFBTSxJQUFBLHNCQUFhLEVBQUMsVUFBVSxDQUFDLElBQUssQ0FBQyxDQUFDO0lBRXJELE1BQU0sZUFBZSxHQUFHLEVBQUUsQ0FBQyxZQUFZLENBQUMsU0FBUyxHQUFHLGNBQWMsRUFBRSxNQUFNLENBQUMsQ0FBQztJQUU1RSxPQUFPLFdBQVcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRTtRQUM1QixJQUFJLFFBQVEsR0FBRyxlQUFlLENBQUM7UUFDL0IsUUFBUSxHQUFHLElBQUEsbUJBQVUsRUFDbkIsUUFBUSxFQUNSLGdDQUFnQyxFQUNoQyxVQUFVLENBQUMsSUFBSyxDQUFDLElBQUksQ0FDdEIsQ0FBQztRQUNGLFFBQVEsR0FBRyxJQUFBLG1CQUFVLEVBQUMsUUFBUSxFQUFFLDRCQUE0QixFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUVyRSxpQkFBaUI7UUFDakIsTUFBTSxJQUFJLEdBQUcsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLCtCQUErQixDQUM3RCxHQUFHLEVBQUUsQ0FBQyxJQUFJLGtCQUFrQixFQUM1QjtZQUNFLGlCQUFpQixFQUFFLEVBQUUsQ0FBQyxpQkFBaUI7WUFDdkMsY0FBYyxFQUFFLEVBQUUsQ0FBQyxJQUFJO1lBQ3ZCLElBQUksRUFBRSxpQkFBaUI7WUFDdkIsSUFBSSxFQUFFLGlCQUFpQjtZQUN2QixrQkFBa0IsRUFBRSxLQUFLO1lBQ3pCLFNBQVMsRUFBRSw2QkFBNkI7WUFFeEMsdUJBQXVCLEVBQUUsSUFBSTtZQUU3QixpQkFBaUIsRUFBRTttQ0FDTSxVQUFVLENBQUMsSUFBSyxDQUFDLElBQUk7dUNBQ2pCLE1BQU0sQ0FBQyxlQUFlLENBQUMsU0FBUyxDQUMzRCxNQUFNLENBQUMsZUFBZSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQ3hDO1VBQ0Q7WUFDQSxRQUFRO1NBQ1Q7UUFDRCwyREFBMkQ7UUFDM0QsRUFBRSxhQUFhLEVBQUUsQ0FBQyxtQkFBbUIsQ0FBQyxFQUFFLFNBQVMsRUFBRSxDQUNwRCxDQUFDO1FBRUYsTUFBTSxHQUFHLEdBQUcsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLCtCQUErQixDQUM1RCxHQUFHLEVBQUUsQ0FBQyxJQUFJLG1CQUFtQixFQUM3QjtZQUNFLElBQUksRUFBRSxrQkFBa0I7WUFDeEIsaUJBQWlCLEVBQUUsRUFBRSxDQUFDLGlCQUFpQjtZQUN2QyxjQUFjLEVBQUUsRUFBRSxDQUFDLElBQUk7WUFFdkIsSUFBSSxFQUFFLGtCQUFrQjtZQUN4QixrQkFBa0IsRUFBRSxLQUFLO1lBQ3pCLFNBQVMsRUFBRSxzQ0FBc0M7WUFFakQsdUJBQXVCLEVBQUUsSUFBSTtZQUM3QiwrQkFBK0I7WUFFL0IsMkRBQTJEO1lBQzNELGlCQUFpQixFQUFFLG9CQUFvQixLQUFLLENBQUMsT0FBTyxDQUFDLFVBQVcsSUFBSTtZQUNwRSxRQUFRLEVBQUUsb0JBQW9CLEtBQUssQ0FBQyxJQUFLLENBQUMsRUFBRSxJQUFJO1NBQ2pEO1FBQ0QsMkRBQTJEO1FBQzNELEVBQUUsYUFBYSxFQUFFLENBQUMsbUJBQW1CLENBQUMsRUFBRSxTQUFTLEVBQUUsQ0FDcEQsQ0FBQztRQUVGLE9BQU8sRUFBRSxJQUFJLEVBQUUsR0FBRyxFQUFFLENBQUM7SUFDdkIsQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDLENBQUMsQ0FBQyJ9
|
package/Aks/index.d.ts
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import * as ccs from '@pulumi/azure-native/containerservice';
|
|
2
2
|
import * as pulumi from '@pulumi/pulumi';
|
|
3
|
+
import { containerservice } from '@pulumi/azure-native/types/input';
|
|
3
4
|
import { Input, Output } from '@pulumi/pulumi';
|
|
4
|
-
import {
|
|
5
|
-
import { EnvRolesResults } from '../AzAd/EnvRoles';
|
|
6
|
-
import * as inputs from '@pulumi/azure-native/types/input';
|
|
5
|
+
import { BasicEncryptResourceArgs, LockableType, ResourceInfoWithInstance } from '../types';
|
|
7
6
|
import { IdentityResult } from '../AzAd/Identity';
|
|
8
|
-
import { ManagedCluster } from '@pulumi/azure-native/containerservice';
|
|
9
7
|
export declare enum VmSizes {
|
|
10
8
|
/** 32G RAM - 4CPU - $221.92 */
|
|
11
9
|
Standard_E4as_v4 = "Standard_E4as_v4",
|
|
@@ -28,13 +26,11 @@ export declare enum VmSizes {
|
|
|
28
26
|
/** 32G RAM - 4CPU - $205.13 */
|
|
29
27
|
Standard_A4m_v2 = "Standard_A4m_v2"
|
|
30
28
|
}
|
|
31
|
-
export interface NodePoolProps extends
|
|
32
|
-
name: string;
|
|
29
|
+
export interface NodePoolProps extends containerservice.ManagedClusterAgentPoolProfileArgs {
|
|
33
30
|
mode: ccs.AgentPoolMode;
|
|
34
31
|
vmSize: VmSizes | string;
|
|
35
32
|
osDiskSizeGB: number;
|
|
36
33
|
maxPods: number;
|
|
37
|
-
enableEncryptionAtHost?: boolean;
|
|
38
34
|
}
|
|
39
35
|
export type AskAddonProps = {
|
|
40
36
|
enableAzureKeyVault?: boolean;
|
|
@@ -51,7 +47,6 @@ export type AskFeatureProps = {
|
|
|
51
47
|
enableMaintenance?: boolean;
|
|
52
48
|
};
|
|
53
49
|
export type AksAccessProps = {
|
|
54
|
-
envRoles?: EnvRolesResults;
|
|
55
50
|
authorizedIPRanges?: Input<string>[];
|
|
56
51
|
disableLocalAccounts?: boolean;
|
|
57
52
|
};
|
|
@@ -67,7 +62,7 @@ export type AksNetworkProps = {
|
|
|
67
62
|
};
|
|
68
63
|
export type AksNodePoolProps = Omit<NodePoolProps, 'subnetId' | 'aksId'>;
|
|
69
64
|
export type DefaultAksNodePoolProps = Omit<AksNodePoolProps, 'name' | 'mode'>;
|
|
70
|
-
export interface AksProps extends
|
|
65
|
+
export interface AksProps extends BasicEncryptResourceArgs, LockableType {
|
|
71
66
|
tier?: ccs.ManagedClusterSKUTier;
|
|
72
67
|
addon?: AskAddonProps;
|
|
73
68
|
features?: AskFeatureProps;
|
|
@@ -97,15 +92,12 @@ export interface AksProps extends BasicResourceArgs {
|
|
|
97
92
|
sshKeys: Array<pulumi.Input<string>>;
|
|
98
93
|
};
|
|
99
94
|
nodePools?: Array<AksNodePoolProps>;
|
|
100
|
-
vaultInfo?: KeyVaultInfo;
|
|
101
95
|
logWpId?: Input<string>;
|
|
102
|
-
/**Lock resource from delete*/
|
|
103
|
-
lock?: boolean;
|
|
104
96
|
}
|
|
105
|
-
export type AksResults = ResourceInfoWithInstance<ManagedCluster> & {
|
|
97
|
+
export type AksResults = ResourceInfoWithInstance<ccs.ManagedCluster> & {
|
|
106
98
|
serviceIdentity: IdentityResult;
|
|
107
99
|
disableLocalAccounts?: boolean;
|
|
108
100
|
getKubeConfig: () => Output<string> | undefined;
|
|
109
101
|
};
|
|
110
|
-
declare const _default: ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, features, storageProfile, addon, tier, lock, dependsOn, importUri, ignoreChanges, }: AksProps) => Promise<AksResults>;
|
|
102
|
+
declare const _default: ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, enableEncryption, envRoles, features, storageProfile, addon, tier, lock, dependsOn, importUri, ignoreChanges, }: AksProps) => Promise<AksResults>;
|
|
111
103
|
export default _default;
|
package/Aks/index.js
CHANGED
|
@@ -31,13 +31,14 @@ const ccs = __importStar(require("@pulumi/azure-native/containerservice"));
|
|
|
31
31
|
const pulumi = __importStar(require("@pulumi/pulumi"));
|
|
32
32
|
const pulumi_1 = require("@pulumi/pulumi");
|
|
33
33
|
const dnsBuilder = __importStar(require("../Builder/PrivateDnsZoneBuilder"));
|
|
34
|
+
const Helper_1 = require("../Core/Helper");
|
|
34
35
|
const VmSetMonitor_1 = __importDefault(require("./VmSetMonitor"));
|
|
35
36
|
const Common_1 = require("../Common");
|
|
36
37
|
const Locker_1 = __importDefault(require("../Core/Locker"));
|
|
37
38
|
const Identity_1 = __importDefault(require("./Identity"));
|
|
38
39
|
const Helpers_1 = require("../Logs/Helpers");
|
|
39
40
|
const RoleAssignment_1 = require("../AzAd/RoleAssignment");
|
|
40
|
-
const
|
|
41
|
+
const Helper_2 = require("./Helper");
|
|
41
42
|
const CustomHelper_1 = require("../KeyVault/CustomHelper");
|
|
42
43
|
const KeyVaultBase_1 = __importDefault(require("@drunk-pulumi/azure-providers/AzBase/KeyVaultBase"));
|
|
43
44
|
const autoScaleFor = ({ enableAutoScaling, nodeType, env, }) => {
|
|
@@ -103,7 +104,7 @@ var VmSizes;
|
|
|
103
104
|
VmSizes["Standard_A4m_v2"] = "Standard_A4m_v2";
|
|
104
105
|
})(VmSizes || (exports.VmSizes = VmSizes = {}));
|
|
105
106
|
//Using this to enable the preview feature https://azurecloudai.blog/2019/10/16/aks-enabling-and-using-preview-features-such-as-nodepools-using-cli/
|
|
106
|
-
exports.default = async ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, features = { enableMaintenance: true }, storageProfile, addon = {
|
|
107
|
+
exports.default = async ({ group, name, linux, defaultNodePool, nodePools, network, logWpId, acr, aksAccess, vaultInfo, enableEncryption, envRoles, features = { enableMaintenance: true }, storageProfile, addon = {
|
|
107
108
|
enableAzureKeyVault: false,
|
|
108
109
|
}, tier = ccs.ManagedClusterSKUTier.Free, lock = true, dependsOn = [], importUri, ignoreChanges = [], }) => {
|
|
109
110
|
const aksName = (0, Common_1.getAksName)(name);
|
|
@@ -116,18 +117,14 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
116
117
|
.catch(() => false);
|
|
117
118
|
}
|
|
118
119
|
//Add Default Ignoring properties
|
|
119
|
-
ignoreChanges.push('privateLinkResources', 'networkProfile', 'nodeResourceGroup', 'linuxProfile', 'windowsProfile');
|
|
120
|
+
ignoreChanges.push('privateLinkResources', 'networkProfile', 'nodeResourceGroup', 'linuxProfile', 'windowsProfile', 'diskEncryptionSetID');
|
|
120
121
|
const serviceIdentity = (0, Identity_1.default)({
|
|
121
122
|
name: aksName,
|
|
122
123
|
vaultInfo,
|
|
123
124
|
dependsOn,
|
|
124
125
|
});
|
|
125
|
-
//
|
|
126
|
-
//
|
|
127
|
-
// name: `${aksName}.privatelink.${currentRegionCode}.azmk8s.io`,
|
|
128
|
-
// group,
|
|
129
|
-
// }).build()
|
|
130
|
-
// : undefined;
|
|
126
|
+
//TODO: Implement Disk Encryption
|
|
127
|
+
// const diskEncryptionSet =enableEncryption? compute.
|
|
131
128
|
//Create AKS Cluster
|
|
132
129
|
const aks = new ccs.ManagedCluster(aksName, {
|
|
133
130
|
resourceName: aksName,
|
|
@@ -194,6 +191,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
194
191
|
nodeType: 'System',
|
|
195
192
|
enableAutoScaling: features?.enableAutoScale,
|
|
196
193
|
}),
|
|
194
|
+
enableEncryptionAtHost: true,
|
|
197
195
|
name: 'defaultnodes',
|
|
198
196
|
mode: 'System',
|
|
199
197
|
count: 1,
|
|
@@ -241,6 +239,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
241
239
|
//azureMonitorProfile: { metrics: { enabled } },
|
|
242
240
|
//Refer here for details https://learn.microsoft.com/en-us/azure/aks/use-managed-identity
|
|
243
241
|
//enablePodSecurityPolicy: true,
|
|
242
|
+
diskEncryptionSetID: '',
|
|
244
243
|
servicePrincipalProfile: {
|
|
245
244
|
clientId: serviceIdentity.clientId,
|
|
246
245
|
secret: serviceIdentity.clientSecret,
|
|
@@ -269,16 +268,16 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
269
268
|
type: ccs.ResourceIdentityType.SystemAssigned,
|
|
270
269
|
},
|
|
271
270
|
autoUpgradeProfile: {
|
|
272
|
-
upgradeChannel: ccs.UpgradeChannel.
|
|
271
|
+
upgradeChannel: ccs.UpgradeChannel.Stable,
|
|
273
272
|
//nodeOSUpgradeChannel: "NodeImage",
|
|
274
273
|
},
|
|
275
274
|
disableLocalAccounts: Boolean(aksAccess.disableLocalAccounts),
|
|
276
275
|
enableRBAC: true,
|
|
277
|
-
aadProfile:
|
|
276
|
+
aadProfile: envRoles
|
|
278
277
|
? {
|
|
279
278
|
enableAzureRBAC: true,
|
|
280
279
|
managed: true,
|
|
281
|
-
adminGroupObjectIDs: [
|
|
280
|
+
adminGroupObjectIDs: [envRoles.admin.objectId],
|
|
282
281
|
tenantID: Common_1.tenantId,
|
|
283
282
|
}
|
|
284
283
|
: undefined,
|
|
@@ -287,9 +286,6 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
287
286
|
networkMode: ccs.NetworkMode.Transparent,
|
|
288
287
|
networkPolicy: ccs.NetworkPolicy.Azure,
|
|
289
288
|
networkPlugin: ccs.NetworkPlugin.Azure,
|
|
290
|
-
//dnsServiceIP: '10.0.0.10',
|
|
291
|
-
//dockerBridgeCidr: '172.17.0.1/16',
|
|
292
|
-
//serviceCidr: '10.0.0.0/16',
|
|
293
289
|
outboundType: features?.enablePrivateCluster || !network.outboundIpAddress
|
|
294
290
|
? ccs.OutboundType.UserDefinedRouting
|
|
295
291
|
: ccs.OutboundType.LoadBalancer,
|
|
@@ -316,7 +312,9 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
316
312
|
import: importUri,
|
|
317
313
|
deleteBeforeReplace: true,
|
|
318
314
|
ignoreChanges,
|
|
315
|
+
protect: lock,
|
|
319
316
|
});
|
|
317
|
+
//Lock from delete
|
|
320
318
|
if (lock) {
|
|
321
319
|
(0, Locker_1.default)({ name: aksName, resource: aks });
|
|
322
320
|
}
|
|
@@ -346,8 +344,8 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
346
344
|
nodeType: p.mode,
|
|
347
345
|
enableAutoScaling: features.enableAutoScale,
|
|
348
346
|
}),
|
|
347
|
+
enableEncryptionAtHost: true,
|
|
349
348
|
count: p.mode === 'System' ? 1 : 0,
|
|
350
|
-
//orchestratorVersion: kubernetesVersion,
|
|
351
349
|
vnetSubnetID: network.subnetId,
|
|
352
350
|
kubeletDiskType: 'OS',
|
|
353
351
|
osSKU: 'Ubuntu',
|
|
@@ -364,22 +362,15 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
364
362
|
.apply(([identity, identityProfile, sId]) => {
|
|
365
363
|
const acrScope = acr?.id ?? Common_1.defaultSubScope;
|
|
366
364
|
if (identityProfile && identityProfile['kubeletidentity']) {
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
});
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
name: `${name}-identity-clientId`,
|
|
377
|
-
value: identityProfile['kubeletidentity'].clientId,
|
|
378
|
-
dependsOn: aks,
|
|
379
|
-
contentType: name,
|
|
380
|
-
vaultInfo,
|
|
381
|
-
});
|
|
382
|
-
}
|
|
365
|
+
// roleAssignment({
|
|
366
|
+
// name: `${name}-aks-identity-profile-pull`,
|
|
367
|
+
// principalId: identityProfile['kubeletidentity'].objectId!,
|
|
368
|
+
// principalType: 'ServicePrincipal',
|
|
369
|
+
// roleName: 'AcrPull',
|
|
370
|
+
// scope: acrScope,
|
|
371
|
+
// });
|
|
372
|
+
//Add into EnvRoles
|
|
373
|
+
envRoles?.addMember('contributor', identityProfile['kubeletidentity'].objectId);
|
|
383
374
|
}
|
|
384
375
|
//Link service principal to Vnet Resources group
|
|
385
376
|
if (network.subnetId && identity) {
|
|
@@ -388,14 +379,14 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
388
379
|
principalId: identity.principalId,
|
|
389
380
|
roleName: 'Contributor',
|
|
390
381
|
principalType: 'ServicePrincipal',
|
|
391
|
-
scope: (0, Common_1.
|
|
392
|
-
group: (0, Common_1.parseResourceInfoFromId)(sId).group,
|
|
393
|
-
}),
|
|
382
|
+
scope: (0, Helper_1.getRGId)((0, Common_1.parseResourceInfoFromId)(sId).group),
|
|
394
383
|
});
|
|
384
|
+
//Add into EnvRoles
|
|
385
|
+
envRoles?.addMember('contributor', identity.principalId);
|
|
395
386
|
}
|
|
396
387
|
//Link Private Dns to extra Vnet
|
|
397
388
|
if (features?.enablePrivateCluster && network.extraVnetIds) {
|
|
398
|
-
const dns = (0,
|
|
389
|
+
const dns = (0, Helper_2.getAksPrivateDnz)({
|
|
399
390
|
name: aksName,
|
|
400
391
|
group,
|
|
401
392
|
id: aks.id,
|
|
@@ -407,7 +398,7 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
407
398
|
}
|
|
408
399
|
});
|
|
409
400
|
//Update Vault
|
|
410
|
-
const config = await (0,
|
|
401
|
+
const config = await (0, Helper_2.getAksConfig)({
|
|
411
402
|
name: aksName,
|
|
412
403
|
groupName: group.resourceGroupName,
|
|
413
404
|
formattedName: true,
|
|
@@ -465,4 +456,4 @@ exports.default = async ({ group, name, linux, defaultNodePool, nodePools, netwo
|
|
|
465
456
|
: undefined,
|
|
466
457
|
};
|
|
467
458
|
};
|
|
468
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Aks/index.ts"],"names":[],"mappings":"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"}
|
|
459
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Aks/index.ts"],"names":[],"mappings":"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"}
|
package/Automation/index.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
interface Props extends
|
|
1
|
+
import { BasicResourceWithVaultArgs } from '../types';
|
|
2
|
+
interface Props extends BasicResourceWithVaultArgs {
|
|
3
3
|
enableEncryption?: boolean;
|
|
4
|
-
vaultInfo?: KeyVaultInfo;
|
|
5
4
|
}
|
|
6
5
|
declare const _default: ({ name, group, enableEncryption, vaultInfo, dependsOn, ignoreChanges, }: Props) => import("@pulumi/azure-native/automation/automationAccount").AutomationAccount;
|
|
7
6
|
export default _default;
|
package/Automation/index.js
CHANGED
|
@@ -30,18 +30,15 @@ const automation = __importStar(require("@pulumi/azure-native/automation"));
|
|
|
30
30
|
const Common_1 = require("../Common");
|
|
31
31
|
const Helper_1 = require("../KeyVault/Helper");
|
|
32
32
|
const UserAssignedIdentity_1 = __importDefault(require("../AzAd/UserAssignedIdentity"));
|
|
33
|
-
const Common_2 = require("../Common");
|
|
34
|
-
const Helper_2 = require("../AzAd/Helper");
|
|
35
33
|
exports.default = ({ name, group, enableEncryption, vaultInfo, dependsOn, ignoreChanges, }) => {
|
|
36
34
|
name = (0, Common_1.getAutomationAccountName)(name);
|
|
37
35
|
const encryption = enableEncryption && vaultInfo
|
|
38
|
-
? (0, Helper_1.
|
|
36
|
+
? (0, Helper_1.addEncryptKey)({ name, vaultInfo })
|
|
39
37
|
: undefined;
|
|
40
|
-
const roles = [{ name: 'Contributor', scope: Common_2.defaultSubScope }];
|
|
41
38
|
const identity = (0, UserAssignedIdentity_1.default)({
|
|
42
39
|
name,
|
|
43
40
|
group,
|
|
44
|
-
|
|
41
|
+
role: 'contributor',
|
|
45
42
|
dependsOn,
|
|
46
43
|
});
|
|
47
44
|
//TODO: Add this identity into a vault reader role.
|
|
@@ -61,9 +58,9 @@ exports.default = ({ name, group, enableEncryption, vaultInfo, dependsOn, ignore
|
|
|
61
58
|
: undefined,
|
|
62
59
|
keyVaultProperties: encryption
|
|
63
60
|
? {
|
|
64
|
-
keyName: encryption.
|
|
65
|
-
keyvaultUri: encryption.
|
|
66
|
-
keyVersion: encryption.
|
|
61
|
+
keyName: encryption.keyName,
|
|
62
|
+
keyvaultUri: encryption.keyVaultUri,
|
|
63
|
+
keyVersion: encryption.keyVersion,
|
|
67
64
|
}
|
|
68
65
|
: undefined,
|
|
69
66
|
},
|
|
@@ -71,11 +68,6 @@ exports.default = ({ name, group, enableEncryption, vaultInfo, dependsOn, ignore
|
|
|
71
68
|
name: 'Basic',
|
|
72
69
|
},
|
|
73
70
|
}, { dependsOn: identity, ignoreChanges });
|
|
74
|
-
auto.identity.apply((i) => (0, Helper_2.grantIdentityPermissions)({
|
|
75
|
-
name,
|
|
76
|
-
roles,
|
|
77
|
-
principalId: i.principalId,
|
|
78
|
-
}));
|
|
79
71
|
return auto;
|
|
80
72
|
};
|
|
81
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
73
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvQXV0b21hdGlvbi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQ0EsNEVBQThEO0FBQzlELHNDQUFxRDtBQUNyRCwrQ0FBbUQ7QUFDbkQsd0ZBQWdFO0FBTWhFLGtCQUFlLENBQUMsRUFDZCxJQUFJLEVBQ0osS0FBSyxFQUNMLGdCQUFnQixFQUNoQixTQUFTLEVBQ1QsU0FBUyxFQUNULGFBQWEsR0FDUCxFQUFFLEVBQUU7SUFDVixJQUFJLEdBQUcsSUFBQSxpQ0FBd0IsRUFBQyxJQUFJLENBQUMsQ0FBQztJQUV0QyxNQUFNLFVBQVUsR0FDZCxnQkFBZ0IsSUFBSSxTQUFTO1FBQzNCLENBQUMsQ0FBQyxJQUFBLHNCQUFhLEVBQUMsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLENBQUM7UUFDcEMsQ0FBQyxDQUFDLFNBQVMsQ0FBQztJQUVoQixNQUFNLFFBQVEsR0FBRyxJQUFBLDhCQUFvQixFQUFDO1FBQ3BDLElBQUk7UUFDSixLQUFLO1FBQ0wsSUFBSSxFQUFFLGFBQWE7UUFDbkIsU0FBUztLQUNWLENBQUMsQ0FBQztJQUNILG1EQUFtRDtJQUVuRCxNQUFNLElBQUksR0FBRyxJQUFJLFVBQVUsQ0FBQyxpQkFBaUIsQ0FDM0MsSUFBSSxFQUNKO1FBQ0UscUJBQXFCLEVBQUUsSUFBSTtRQUMzQixHQUFHLEtBQUs7UUFFUixtQkFBbUIsRUFBRSxLQUFLO1FBQzFCLFFBQVEsRUFBRTtZQUNSLElBQUksRUFBRSxVQUFVLENBQUMsb0JBQW9CLENBQUMsMkJBQTJCO1lBQ2pFLHNCQUFzQixFQUFFLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztTQUN0QztRQUNELGdCQUFnQixFQUFFLElBQUk7UUFFdEIsVUFBVSxFQUFFO1lBQ1YsU0FBUyxFQUFFLFVBQVUsQ0FBQyxDQUFDLENBQUMsb0JBQW9CLENBQUMsQ0FBQyxDQUFDLHNCQUFzQjtZQUNyRSxRQUFRLEVBQUUsVUFBVTtnQkFDbEIsQ0FBQyxDQUFDLEVBQUUsb0JBQW9CLEVBQUUsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDLEVBQUU7Z0JBQ3pDLENBQUMsQ0FBQyxTQUFTO1lBQ2Isa0JBQWtCLEVBQUUsVUFBVTtnQkFDNUIsQ0FBQyxDQUFDO29CQUNFLE9BQU8sRUFBRSxVQUFVLENBQUMsT0FBTztvQkFDM0IsV0FBVyxFQUFFLFVBQVUsQ0FBQyxXQUFXO29CQUNuQyxVQUFVLEVBQUUsVUFBVSxDQUFDLFVBQVU7aUJBQ2xDO2dCQUNILENBQUMsQ0FBQyxTQUFTO1NBQ2Q7UUFDRCxHQUFHLEVBQUU7WUFDSCxJQUFJLEVBQUUsT0FBTztTQUNkO0tBQ0YsRUFDRCxFQUFFLFNBQVMsRUFBRSxRQUFRLEVBQUUsYUFBYSxFQUFFLENBQ3ZDLENBQUM7SUFFRixPQUFPLElBQUksQ0FBQztBQUNkLENBQUMsQ0FBQyJ9
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { EnvRoleKeyTypes,
|
|
1
|
+
import { EnvRoleKeyTypes, EnvRolesInfo } from './EnvRoles';
|
|
2
2
|
import { RoleAssignmentProps } from './RoleAssignment';
|
|
3
3
|
export type RoleEnableItem = boolean | {
|
|
4
4
|
[k in EnvRoleKeyTypes]?: boolean;
|
|
@@ -11,9 +11,10 @@ export type RoleEnableTypes = {
|
|
|
11
11
|
enableVaultRoles?: RoleEnableItem;
|
|
12
12
|
/** Container Registry Roles */
|
|
13
13
|
enableACRRoles?: RoleEnableItem;
|
|
14
|
+
enableAppConfig?: RoleEnableItem;
|
|
14
15
|
};
|
|
15
16
|
export type ListRoleType = Record<EnvRoleKeyTypes, Set<string>>;
|
|
16
|
-
export declare const getRoleNames: ({ enableRGRoles, enableIotRoles, enableVaultRoles, enableAksRoles, enableStorageRoles, enableACRRoles, }: RoleEnableTypes) => Record<EnvRoleKeyTypes, string[]>;
|
|
17
|
+
export declare const getRoleNames: ({ enableRGRoles, enableIotRoles, enableVaultRoles, enableAksRoles, enableStorageRoles, enableACRRoles, enableAppConfig, }: RoleEnableTypes) => Record<EnvRoleKeyTypes, string[]>;
|
|
17
18
|
export declare const grantEnvRolesAccess: ({ name, envRoles, scope, dependsOn, ...others }: RoleEnableTypes & Omit<RoleAssignmentProps, "roleName" | "principalType" | "principalId"> & {
|
|
18
|
-
envRoles:
|
|
19
|
+
envRoles: EnvRolesInfo;
|
|
19
20
|
}) => void;
|