@drunk-pulumi/azure-components 1.1.5 → 1.1.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.
Files changed (62) hide show
  1. package/AppResources.d.ts +119 -0
  2. package/AppResources.js +78 -0
  3. package/aks/AzKubernetes.d.ts +2 -1
  4. package/aks/AzKubernetes.js +46 -11
  5. package/aks/ContainerRegistry.js +14 -12
  6. package/aks/helpers.d.ts +7 -3
  7. package/aks/helpers.js +19 -6
  8. package/apim/Apim.d.ts +1 -1
  9. package/apim/Apim.js +12 -10
  10. package/app/AppConfig.d.ts +1 -1
  11. package/app/AppConfig.js +12 -10
  12. package/app/AppContainer.d.ts +1 -2
  13. package/app/AppContainer.js +10 -8
  14. package/app/AppContainerEnv.d.ts +1 -1
  15. package/app/AppContainerEnv.js +10 -8
  16. package/app/IoTHub.d.ts +1 -2
  17. package/app/IoTHub.js +10 -8
  18. package/app/LogicApp.d.ts +1 -2
  19. package/app/LogicApp.js +10 -8
  20. package/app/SignalR.d.ts +1 -1
  21. package/app/SignalR.js +3 -3
  22. package/azAd/AppRegistration.d.ts +8 -0
  23. package/azAd/AppRegistration.js +19 -2
  24. package/azAd/UserAssignedIdentity.d.ts +4 -6
  25. package/azAd/UserAssignedIdentity.js +7 -1
  26. package/base/BaseResourceComponent.d.ts +12 -12
  27. package/base/BaseResourceComponent.js +19 -19
  28. package/database/AzSql.d.ts +2 -2
  29. package/database/AzSql.js +10 -8
  30. package/database/MySql.d.ts +2 -2
  31. package/database/MySql.js +14 -12
  32. package/database/Postgres.d.ts +2 -2
  33. package/database/Postgres.js +12 -10
  34. package/database/Redis.d.ts +3 -4
  35. package/database/Redis.js +10 -8
  36. package/package.json +2 -2
  37. package/services/Automation.js +8 -6
  38. package/services/AzSearch.d.ts +1 -1
  39. package/services/AzSearch.js +9 -7
  40. package/services/ServiceBus.d.ts +1 -1
  41. package/services/ServiceBus.js +11 -9
  42. package/storage/StorageAccount.d.ts +1 -1
  43. package/storage/StorageAccount.js +10 -8
  44. package/types.d.ts +5 -0
  45. package/vault/KeyVault.d.ts +2 -2
  46. package/vault/KeyVault.js +1 -1
  47. package/vm/DiskEncryptionSet.d.ts +1 -2
  48. package/vm/DiskEncryptionSet.js +10 -8
  49. package/vm/VirtualMachine.d.ts +1 -1
  50. package/vm/VirtualMachine.js +10 -8
  51. package/vnet/AzCdn.d.ts +1 -1
  52. package/vnet/AzCdn.js +7 -6
  53. package/vnet/Basion.d.ts +1 -1
  54. package/vnet/Basion.js +3 -3
  55. package/vnet/DnsZone.d.ts +3 -3
  56. package/vnet/DnsZone.js +26 -26
  57. package/vnet/PrivateEndpoint.d.ts +1 -1
  58. package/vnet/PrivateEndpoint.js +3 -3
  59. package/vnet/RouteTable.d.ts +2 -2
  60. package/vnet/RouteTable.js +3 -3
  61. package/vnet/VpnGateway.d.ts +1 -1
  62. package/vnet/VpnGateway.js +3 -3
@@ -0,0 +1,119 @@
1
+ import * as pulumi from '@pulumi/pulumi';
2
+ import * as types from './types';
3
+ import { BaseComponent, CommonBaseArgs } from './base';
4
+ import { StorageAccount, StorageAccountArgs } from './storage';
5
+ import { Automation, AutomationArgs, AzSearch, AzSearchArgs, ServiceBusArgs } from './services';
6
+ import { ApimArgs } from './apim';
7
+ import { AppCert, AppCertArgs, AppConfig, AppConfigArgs, AppContainer, AppContainerEnv, AppContainerEnvArgs, IoTHub, IoTHubArgs, LogicApp, LogicAppArgs, SignalR, SignalRArgs } from './app';
8
+ import { AzSql, AzSqlArgs, MySql, MySqlArgs, Postgres, PostgresArgs, Redis, RedisArgs } from './database';
9
+ export interface AppResourcesArgs extends CommonBaseArgs, types.WithNetworkArgs {
10
+ storageAccount?: Partial<StorageAccountArgs>;
11
+ serviceBus?: Partial<ServiceBusArgs> & Pick<ServiceBusArgs, 'sku'>;
12
+ automation?: Partial<AutomationArgs>;
13
+ azSearch?: Partial<AzSearchArgs> & Pick<AzSearchArgs, 'sku'>;
14
+ apim?: Partial<ApimArgs> & Pick<ApimArgs, 'sku'>;
15
+ appCert?: Partial<AppCertArgs> & Pick<AppCertArgs, 'domain' | 'productType'>;
16
+ appConfig?: Partial<AppConfigArgs>;
17
+ appContainerEnv?: Partial<AppContainerEnvArgs>;
18
+ iotHub?: Partial<IoTHubArgs> & Pick<IoTHubArgs, 'sku'>;
19
+ logicApp?: Partial<LogicAppArgs> & Pick<LogicAppArgs, 'integrationAccount' | 'workflow'>;
20
+ signalR?: Partial<SignalRArgs> & Pick<SignalRArgs, 'sku'>;
21
+ azSql?: Partial<AzSqlArgs>;
22
+ mySql?: Partial<MySqlArgs> & Pick<MySqlArgs, 'sku' | 'administratorLogin'>;
23
+ postgres?: Partial<PostgresArgs> & Pick<PostgresArgs, 'sku' | 'administratorLogin'>;
24
+ redis?: Partial<RedisArgs>;
25
+ }
26
+ export declare class AppResources extends BaseComponent<AppResourcesArgs> {
27
+ readonly storage?: StorageAccount;
28
+ readonly automation?: Automation;
29
+ readonly azSearch?: AzSearch;
30
+ readonly appCert?: AppCert;
31
+ readonly appConfig?: AppConfig;
32
+ readonly appContainer?: AppContainer;
33
+ readonly appContainerEnv?: AppContainerEnv;
34
+ readonly iotHub?: IoTHub;
35
+ readonly logicApp?: LogicApp;
36
+ readonly signalR?: SignalR;
37
+ readonly azSql?: AzSql;
38
+ readonly mySql?: MySql;
39
+ readonly postgres?: Postgres;
40
+ readonly redis?: Redis;
41
+ private serviceBus?;
42
+ private apim?;
43
+ constructor(name: string, args: AppResourcesArgs, opts?: pulumi.ComponentResourceOptions);
44
+ getOutputs(): {
45
+ apim: {
46
+ id: pulumi.Output<string>;
47
+ resourceName: pulumi.Output<string>;
48
+ } | undefined;
49
+ storage: {
50
+ resourceName: pulumi.Output<string>;
51
+ id: pulumi.Output<string>;
52
+ rsGroup: types.AsInput<types.ResourceGroupType>;
53
+ } | undefined;
54
+ serviceBus: {
55
+ id: pulumi.Output<string>;
56
+ resourceName: pulumi.Output<string>;
57
+ } | undefined;
58
+ automation: {
59
+ id: pulumi.Output<string>;
60
+ resourceName: pulumi.Output<string>;
61
+ } | undefined;
62
+ azSearch: {
63
+ id: pulumi.Output<string>;
64
+ resourceName: pulumi.Output<string>;
65
+ } | undefined;
66
+ appCert: {
67
+ id: pulumi.Output<string>;
68
+ resourceName: pulumi.Output<string>;
69
+ } | undefined;
70
+ appConfig: {
71
+ id: pulumi.Output<string>;
72
+ resourceName: pulumi.Output<string>;
73
+ } | undefined;
74
+ appContainerEnv: {
75
+ resourceName: pulumi.Output<string>;
76
+ id: pulumi.Output<string>;
77
+ defaultDomain: pulumi.Output<string>;
78
+ staticIp: pulumi.Output<string>;
79
+ vaultSecrets: {
80
+ [key: string]: import("./vault").VaultSecretResult;
81
+ } | undefined;
82
+ } | undefined;
83
+ iotHub: {
84
+ id: pulumi.Output<string>;
85
+ resourceName: pulumi.Output<string>;
86
+ } | undefined;
87
+ logicApp: {
88
+ id: pulumi.Output<string>;
89
+ resourceName: pulumi.Output<string>;
90
+ } | undefined;
91
+ signalR: {
92
+ id: pulumi.Output<string>;
93
+ resourceName: pulumi.Output<string>;
94
+ } | undefined;
95
+ azSql: {
96
+ id: pulumi.Output<string>;
97
+ resourceName: pulumi.Output<string>;
98
+ } | undefined;
99
+ mySql: {
100
+ id: pulumi.Output<string>;
101
+ resourceName: pulumi.Output<string>;
102
+ } | undefined;
103
+ postgres: {
104
+ id: pulumi.Output<string>;
105
+ resourceName: pulumi.Output<string>;
106
+ } | undefined;
107
+ redis: {
108
+ id: pulumi.Output<string>;
109
+ resourceName: pulumi.Output<string>;
110
+ privateLink: {
111
+ privateEndpoint: pulumi.Output<{
112
+ privateIpAddresses: string[];
113
+ id: string;
114
+ }>;
115
+ privateDnsZone: types.AsOutput<types.ResourceType>;
116
+ } | undefined;
117
+ } | undefined;
118
+ };
119
+ }
@@ -0,0 +1,78 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.AppResources = void 0;
4
+ const base_1 = require("./base");
5
+ const helpers_1 = require("./base/helpers");
6
+ const storage_1 = require("./storage");
7
+ const services_1 = require("./services");
8
+ const apim_1 = require("./apim");
9
+ const app_1 = require("./app");
10
+ const database_1 = require("./database");
11
+ class AppResources extends base_1.BaseComponent {
12
+ storage;
13
+ automation;
14
+ azSearch;
15
+ appCert;
16
+ appConfig;
17
+ appContainer;
18
+ appContainerEnv;
19
+ iotHub;
20
+ logicApp;
21
+ signalR;
22
+ azSql;
23
+ mySql;
24
+ postgres;
25
+ redis;
26
+ serviceBus;
27
+ apim;
28
+ constructor(name, args, opts) {
29
+ super((0, helpers_1.getComponentResourceType)('AppResources'), name, args, opts);
30
+ const { apim, storageAccount, serviceBus, automation, azSearch, appCert, appConfig, appContainerEnv, iotHub, logicApp, signalR, azSql, mySql, postgres, redis, ...others } = args;
31
+ this.apim = apim ? new apim_1.Apim(name, { ...others, ...apim }, { ...opts, parent: this }) : undefined;
32
+ this.storage = storageAccount
33
+ ? new storage_1.StorageAccount(name, { ...others, ...storageAccount }, { ...opts, parent: this })
34
+ : undefined;
35
+ this.serviceBus = serviceBus
36
+ ? new services_1.ServiceBus(name, { ...others, ...serviceBus }, { ...opts, parent: this })
37
+ : undefined;
38
+ this.automation = automation
39
+ ? new services_1.Automation(name, { ...others, ...automation }, { ...opts, parent: this })
40
+ : undefined;
41
+ this.azSearch = azSearch ? new services_1.AzSearch(name, { ...others, ...azSearch }, { ...opts, parent: this }) : undefined;
42
+ this.appCert = appCert ? new app_1.AppCert(name, { ...others, ...appCert }, { ...opts, parent: this }) : undefined;
43
+ this.appConfig = appConfig
44
+ ? new app_1.AppConfig(name, { ...others, ...appConfig }, { ...opts, parent: this })
45
+ : undefined;
46
+ this.appContainerEnv = appContainerEnv
47
+ ? new app_1.AppContainerEnv(name, { ...others, ...appContainerEnv }, { ...opts, parent: this })
48
+ : undefined;
49
+ this.iotHub = iotHub ? new app_1.IoTHub(name, { ...others, ...iotHub }, { ...opts, parent: this }) : undefined;
50
+ this.logicApp = logicApp ? new app_1.LogicApp(name, { ...others, ...logicApp }, { ...opts, parent: this }) : undefined;
51
+ this.signalR = signalR ? new app_1.SignalR(name, { ...others, ...signalR }, { ...opts, parent: this }) : undefined;
52
+ this.azSql = azSql ? new database_1.AzSql(name, { ...others, ...azSql }, { ...opts, parent: this }) : undefined;
53
+ this.mySql = mySql ? new database_1.MySql(name, { ...others, ...mySql }, { ...opts, parent: this }) : undefined;
54
+ this.postgres = postgres ? new database_1.Postgres(name, { ...others, ...postgres }, { ...opts, parent: this }) : undefined;
55
+ this.redis = redis ? new database_1.Redis(name, { ...others, ...redis }, { ...opts, parent: this }) : undefined;
56
+ }
57
+ getOutputs() {
58
+ return {
59
+ apim: this.apim?.getOutputs(),
60
+ storage: this.storage?.getOutputs(),
61
+ serviceBus: this.serviceBus?.getOutputs(),
62
+ automation: this.automation?.getOutputs(),
63
+ azSearch: this.azSearch?.getOutputs(),
64
+ appCert: this.appCert?.getOutputs(),
65
+ appConfig: this.appConfig?.getOutputs(),
66
+ appContainerEnv: this.appContainerEnv?.getOutputs(),
67
+ iotHub: this.iotHub?.getOutputs(),
68
+ logicApp: this.logicApp?.getOutputs(),
69
+ signalR: this.signalR?.getOutputs(),
70
+ azSql: this.azSql?.getOutputs(),
71
+ mySql: this.mySql?.getOutputs(),
72
+ postgres: this.postgres?.getOutputs(),
73
+ redis: this.redis?.getOutputs(),
74
+ };
75
+ }
76
+ }
77
+ exports.AppResources = AppResources;
78
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQXBwUmVzb3VyY2VzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL0FwcFJlc291cmNlcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSxpQ0FBdUQ7QUFDdkQsNENBQTBEO0FBQzFELHVDQUErRDtBQUMvRCx5Q0FBNEc7QUFDNUcsaUNBQXdDO0FBQ3hDLCtCQWNlO0FBQ2YseUNBQTBHO0FBb0IxRyxNQUFhLFlBQWEsU0FBUSxvQkFBK0I7SUFDL0MsT0FBTyxDQUFrQjtJQUN6QixVQUFVLENBQWM7SUFDeEIsUUFBUSxDQUFZO0lBQ3BCLE9BQU8sQ0FBVztJQUNsQixTQUFTLENBQWE7SUFDdEIsWUFBWSxDQUFnQjtJQUM1QixlQUFlLENBQW1CO0lBQ2xDLE1BQU0sQ0FBVTtJQUNoQixRQUFRLENBQVk7SUFDcEIsT0FBTyxDQUFXO0lBQ2xCLEtBQUssQ0FBUztJQUNkLEtBQUssQ0FBUztJQUNkLFFBQVEsQ0FBWTtJQUNwQixLQUFLLENBQVM7SUFDdEIsVUFBVSxDQUFjO0lBQ3hCLElBQUksQ0FBUTtJQUVwQixZQUFZLElBQVksRUFBRSxJQUFzQixFQUFFLElBQXNDO1FBQ3RGLEtBQUssQ0FBQyxJQUFBLGtDQUF3QixFQUFDLGNBQWMsQ0FBQyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDbEUsTUFBTSxFQUNKLElBQUksRUFDSixjQUFjLEVBQ2QsVUFBVSxFQUNWLFVBQVUsRUFDVixRQUFRLEVBQ1IsT0FBTyxFQUNQLFNBQVMsRUFDVCxlQUFlLEVBQ2YsTUFBTSxFQUNOLFFBQVEsRUFDUixPQUFPLEVBQ1AsS0FBSyxFQUNMLEtBQUssRUFDTCxRQUFRLEVBQ1IsS0FBSyxFQUNMLEdBQUcsTUFBTSxFQUNWLEdBQUcsSUFBSSxDQUFDO1FBRVQsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksV0FBSSxDQUFDLElBQUksRUFBRSxFQUFFLEdBQUcsTUFBTSxFQUFFLEdB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
@@ -31,7 +31,7 @@ export interface AzKubernetesArgs extends CommonBaseArgs, types.WithEncryptionEn
31
31
  extraAgentPoolProfiles?: AgentPoolProfile[];
32
32
  attachToAcr?: types.ResourceInputs;
33
33
  extensions?: {
34
- argoCd?: Omit<ArgoCDExtensionArgs, 'aks' | 'groupRoles' | 'identity' | 'rsGroup'>;
34
+ argoCd?: Omit<ArgoCDExtensionArgs, 'aks' | 'identity' | 'rsGroup'>;
35
35
  };
36
36
  features: {
37
37
  enablePrivateCluster: boolean;
@@ -86,6 +86,7 @@ export declare class AzKubernetes extends BaseResourceComponent<AzKubernetesArgs
86
86
  vaultSecrets: {
87
87
  [key: string]: import("..").VaultSecretResult;
88
88
  };
89
+ applicationId: pulumi.Output<string>;
89
90
  };
90
91
  keyVaultSecretProviderIdentity: types.AsOutput<types.IdentityType> | undefined;
91
92
  kubeletIdentity: types.AsOutput<types.IdentityType> | undefined;
@@ -36,6 +36,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
36
36
  exports.AzKubernetes = void 0;
37
37
  const ccs = __importStar(require("@pulumi/azure-native/containerservice"));
38
38
  const pulumi = __importStar(require("@pulumi/pulumi"));
39
+ const mid = __importStar(require("@pulumi/azure-native/managedidentity"));
39
40
  const azAd_1 = require("../azAd");
40
41
  const base_1 = require("../base");
41
42
  const helpers_1 = require("../helpers");
@@ -43,6 +44,7 @@ const vm_1 = require("../vm");
43
44
  const common_1 = require("../common");
44
45
  const helpers_2 = require("./helpers");
45
46
  const helpers_3 = require("../vnet/helpers");
47
+ const azAd = __importStar(require("@pulumi/azuread"));
46
48
  const isLegacyMaintenanceArgs = (maintenance) => {
47
49
  if (!maintenance)
48
50
  return false;
@@ -124,8 +126,12 @@ class AzKubernetes extends base_1.BaseResourceComponent {
124
126
  };
125
127
  }
126
128
  createIdentity() {
127
- const { rsGroup, vaultInfo, groupRoles } = this.args;
129
+ const { rsGroup, vaultInfo, groupRoles, extensions } = this.args;
128
130
  return new azAd_1.AppRegistration(`${this.name}-identity`, {
131
+ redirectUris: extensions?.argoCd
132
+ ? [pulumi.interpolate `https://${extensions?.argoCd.argoCdDomain}/auth/callback`]
133
+ : undefined,
134
+ appType: 'web',
129
135
  vaultInfo,
130
136
  //memberof: groupRoles ? [groupRoles.readOnly] : undefined,
131
137
  servicePrincipal: {
@@ -166,7 +172,7 @@ class AzKubernetes extends base_1.BaseResourceComponent {
166
172
  }, { dependsOn: this.opts?.dependsOn, parent: this }).getOutputs();
167
173
  }
168
174
  createCluster(appID) {
169
- const { rsGroup, vaultInfo, groupRoles, defaultUAssignedId, enableEncryption, nodeResourceGroup, features, network, logWorkspace, sku, autoScalerProfile, extraAgentPoolProfiles, agentPoolProfiles, attachToAcr, maintenance, namespaces, ...props } = this.args;
175
+ const { rsGroup, vaultInfo, groupRoles, defaultUAssignedId, enableEncryption, enableResourceIdentity, nodeResourceGroup, features, network, logWorkspace, sku, autoScalerProfile, extraAgentPoolProfiles, agentPoolProfiles, attachToAcr, maintenance, namespaces, ...props } = this.args;
170
176
  const nodeRg = nodeResourceGroup ?? pulumi.interpolate `${rsGroup.resourceGroupName}-nodes`;
171
177
  const login = this.createUserNameAndSshKeys();
172
178
  const diskEncryptionSet = this.createDiskEncryptionSet();
@@ -257,11 +263,13 @@ class AzKubernetes extends base_1.BaseResourceComponent {
257
263
  diskEncryptionSetID: diskEncryptionSet?.id,
258
264
  dnsPrefix: props.dnsPrefix ?? `${helpers_1.azureEnv.currentEnv}-${this.name}`,
259
265
  enableRBAC: true,
260
- identity: {
261
- type: ccs.ResourceIdentityType.SystemAssigned,
262
- //type: defaultUAssignedId ? ccs.ResourceIdentityType.UserAssigned : ccs.ResourceIdentityType.SystemAssigned,
263
- //userAssignedIdentities: defaultUAssignedId ? [defaultUAssignedId.id] : undefined,
264
- },
266
+ identity: enableResourceIdentity
267
+ ? {
268
+ type: ccs.ResourceIdentityType.SystemAssigned,
269
+ //type: defaultUAssignedId ? ccs.ResourceIdentityType.UserAssigned : ccs.ResourceIdentityType.SystemAssigned,
270
+ //userAssignedIdentities: defaultUAssignedId ? [defaultUAssignedId.id] : undefined,
271
+ }
272
+ : undefined,
265
273
  // identityProfile: defaultUAssignedId
266
274
  // ? pulumi.output(defaultUAssignedId).apply((uID) => ({ [uID.id]: uID }))
267
275
  // : undefined,
@@ -381,13 +389,40 @@ class AzKubernetes extends base_1.BaseResourceComponent {
381
389
  createExtensions(aks, identity) {
382
390
  const { extensions, rsGroup, groupRoles } = this.args;
383
391
  if (extensions?.argoCd && groupRoles) {
384
- (0, helpers_2.createArgoCDExtension)(`${this.name}-argocd`, {
385
- ...extensions.argoCd,
392
+ const { argoCd } = extensions;
393
+ const ext = (0, helpers_2.createArgoCDExtension)(`${this.name}-argocd`, {
394
+ ...argoCd,
386
395
  aks,
387
396
  rsGroup,
388
- groupRoles,
389
397
  identity,
390
398
  }, { parent: this, retainOnDelete: true });
399
+ const issuer = aks.oidcIssuerProfile.apply((i) => i?.issuerURL);
400
+ //ArgoCD Service Accounts Federated Identity Credentials will be created into the AzureAD Identity
401
+ ['argocd-server'].map((f) => new azAd.ApplicationFederatedIdentityCredential(`${this.name}-federated-${f}`, {
402
+ applicationId: identity.applicationId,
403
+ displayName: f,
404
+ description: f,
405
+ issuer: issuer,
406
+ subject: `system:serviceaccount:argocd:${f}`,
407
+ audiences: ['api://AzureADTokenExchange'],
408
+ }, {
409
+ dependsOn: ext,
410
+ deletedWith: ext,
411
+ parent: this,
412
+ }));
413
+ //Other ArgoCD Service Accounts Federated Identity Credentials will be created into the User Assigned Identity
414
+ ['argocd-repo-server', 'argocd-application-controller'].map((f) => new mid.FederatedIdentityCredential(`${this.name}-federated-${f}`, {
415
+ resourceName: argoCd?.defaultUAssignedId.resourceName,
416
+ resourceGroupName: argoCd?.defaultUAssignedId.resourceGroupName,
417
+ federatedIdentityCredentialResourceName: f,
418
+ issuer: issuer,
419
+ subject: `system:serviceaccount:argocd:${f}`,
420
+ audiences: ['api://AzureADTokenExchange'],
421
+ }, {
422
+ dependsOn: ext,
423
+ deletedWith: ext,
424
+ parent: this,
425
+ }));
391
426
  }
392
427
  }
393
428
  getExtraAksOutputs(aks) {
@@ -459,4 +494,4 @@ class AzKubernetes extends base_1.BaseResourceComponent {
459
494
  }
460
495
  }
461
496
  exports.AzKubernetes = AzKubernetes;
462
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AzKubernetes.js","sourceRoot":"","sources":["../../src/aks/AzKubernetes.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2EAA6D;AAE7D,uDAAyC;AAGzC,kCAA0D;AAC1D,kCAAgE;AAChE,wCAA6D;AAE7D,8BAA0C;AAC1C,sCAAyC;AACzC,uCAA4F;AAC5F,6CAA4D;AAmB5D,MAAM,uBAAuB,GAAG,CAAC,WAAwC,EAAwC,EAAE;IACjH,IAAI,CAAC,WAAW;QAAE,OAAO,KAAK,CAAC;IAC/B,OAAO,YAAY,IAAI,WAAW,IAAI,gBAAgB,IAAI,WAAW,CAAC;AACxE,CAAC,CAAC;AAEF,MAAM,yBAAyB,GAAG,CAAC,WAAwC,EAAqC,EAAE;IAChH,IAAI,CAAC,WAAW;QAAE,OAAO,SAAS,CAAC;IACnC,IAAI,uBAAuB,CAAC,WAAW,CAAC;QAAE,OAAO,WAAW,CAAC;IAC7D,OAAO,WAAW,CAAC,OAAO,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,WAAwC,EAAuC,EAAE;IAC7G,IAAI,CAAC,WAAW,IAAI,uBAAuB,CAAC,WAAW,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3E,OAAO,WAAW,CAAC,WAAW,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,WAAwC,EAAuC,EAAE;IACxG,IAAI,CAAC,WAAW,IAAI,uBAAuB,CAAC,WAAW,CAAC;QAAE,OAAO,SAAS,CAAC;IAC3E,OAAO,WAAW,CAAC,MAAM,CAAC;AAC5B,CAAC,CAAC;AA0DF,MAAa,YAAa,SAAQ,4BAAuC;IACvD,EAAE,CAAwB;IAC1B,YAAY,CAAwB;IACpC,UAAU,CAAwC;IAClD,cAAc,CAAyB;IACvC,gBAAgB,CAAqC;IACrD,aAAa,CAA4C;IACzD,8BAA8B,CAAyB;IACvD,eAAe,CAAyB;IACxC,gBAAgB,CAAyB;IACzC,aAAa,CAAyB;IAEtD,YAAY,IAAY,EAAE,IAAsB,EAAE,IAAsC;QACtF,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAExC,MAAM,GAAG,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACxC,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAChC,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAEpC,MAAM,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,CAAC,UAAU,GAAG,mBAAS,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YACtD,EAAE,EAAE,EAAE,CAAC,EAAE;YACT,YAAY,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAAC;SACvC,CAAC,CAAC,CAAC;QAEJ,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACnD,IAAI,CAAC,cAAc,GAAG,UAAU,EAAE,WAAW,CAAC;QAC9C,IAAI,CAAC,gBAAgB,GAAG,UAAU,EAAE,gBAAgB,CAAC;QAErD,IAAI,CAAC,aAAa,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC;QACtC,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;QAEjC,IAAI,CAAC,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAG,CAAC,WAAW,CAAC,CAAC;QACxE,IAAI,CAAC,8BAA8B,GAAG,IAAI,CAAC,QAAQ,CAAC,mBAAmB;YACrE,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;gBACnC,EAAE,EAAE,EAAG,CAAC,4BAA4B,CAAC,QAAQ,CAAC,UAAW;gBACzD,QAAQ,EAAE,EAAG,CAAC,4BAA4B,CAAC,QAAQ,CAAC,QAAS;gBAC7D,QAAQ,EAAE,EAAG,CAAC,4BAA4B,CAAC,QAAQ,CAAC,QAAS;aAC9D,CAAC,CAAC;YACL,CAAC,CAAC,SAAS,CAAC;QACd,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;QACxD,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,QAAQ,EAAE,sBAAsB;YACxD,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,SAAU,CAAC;YACvD,CAAC,CAAC,SAAS,CAAC;QAEd,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC/B,IAAI,CAAC,eAAe,EAAE,CAAC;IACzB,CAAC;IAEM,UAAU;QACf,OAAO;YACL,EAAE,EAAE,IAAI,CAAC,EAAE;YACX,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,8BAA8B,EAAE,IAAI,CAAC,8BAA8B;YACnE,eAAe,EAAE,IAAI,CAAC,eAAe;YACrC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC;IACJ,CAAC;IAEO,cAAc;QACpB,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAErD,OAAO,IAAI,sBAAe,CACxB,GAAG,IAAI,CAAC,IAAI,WAAW,EACvB;YACE,SAAS;YACT,2DAA2D;YAC3D,gBAAgB,EAAE;gBAChB,yBAAyB,EAAE,IAAI;gBAC/B,gBAAgB,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;aAC1E;YACD,eAAe,EAAE;gBACf;oBACE,KAAK,EAAE,mBAAS,CAAC,gBAAgB,CAAC,OAAO,CAAC;oBAC1C,QAAQ,EAAE,QAAQ;oBAClB,WAAW,EAAE,mDAAmD;iBACjE;aACF;SACF,EACD,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAClD,CAAC;IACJ,CAAC;IAEO,wBAAwB;QAC9B,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CACnG,GAAG,IAAI,CAAC,IAAI,UAAU,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,EAAE,CAAC,CAC3C,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;QAE3D,MAAM,GAAG,GAAG,IAAI,qBAAY,CAC1B,GAAG,IAAI,CAAC,IAAI,MAAM,EAClB;YACE,SAAS;YACT,QAAQ;SACT,EACD,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAClD,CAAC;QAEF,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC;IACnD,CAAC;IAEO,uBAAuB;QAC7B,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,UAAU,EAAE,kBAAkB,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC9G,IAAI,CAAC,gBAAgB;YAAE,OAAO,SAAS,CAAC;QACxC,IAAI,iBAAiB;YAAE,OAAO,iBAAiB,CAAC;QAEhD,OAAO,IAAI,sBAAiB,CAC1B,GAAG,IAAI,CAAC,IAAI,sBAAsB,EAClC;YACE,OAAO;YACP,SAAS;YACT,kBAAkB;YAClB,UAAU;YACV,cAAc,EAAE,6CAA6C;SAC9D,EACD,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAClD,CAAC,UAAU,EAAE,CAAC;IACjB,CAAC;IAEO,aAAa,CAAC,KAAsB;QAC1C,MAAM,EACJ,OAAO,EACP,SAAS,EACT,UAAU,EACV,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,GAAG,EACH,iBAAiB,EACjB,sBAAsB,EACtB,iBAAiB,EACjB,WAAW,EACX,WAAW,EACX,UAAU,EACV,GAAG,KAAK,EACT,GAAG,IAAI,CAAC,IAAI,CAAC;QACd,MAAM,MAAM,GAAG,iBAAiB,IAAI,MAAM,CAAC,WAAW,CAAA,GAAG,OAAO,CAAC,iBAAiB,QAAQ,CAAC;QAC3F,MAAM,KAAK,GAAG,IAAI,CAAC,wBAAwB,EAAE,CAAC;QAC9C,MAAM,iBAAiB,GAAG,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAEzD,uDAAuD;QACvD,MAAM,cAAc,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACtD,GAAG,IAAI;YACP,iBAAiB,EAAE,oBAAU,CAAC,eAAe,CAAC,IAAI,CAAC,iBAAiB,CAAC;SACtE,CAAC,CAAC,CAAC;QAEJ,OAAO,IAAI,GAAG,CAAC,cAAc,CAC3B,IAAI,CAAC,IAAI,EACT;YACE,GAAG,KAAK;YACR,GAAG,OAAO;YACV,iBAAiB,EAAE,cAAc;YACjC,UAAU,EAAE,UAAU;gBACpB,CAAC,CAAC;oBACE,eAAe,EAAE,IAAI;oBACrB,OAAO,EAAE,IAAI;oBACb,mBAAmB,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC;oBAChD,QAAQ,EAAE,kBAAQ,CAAC,QAAQ;iBAC5B;gBACH,CAAC,CAAC,SAAS;YAEb,aAAa,EAAE;gBACb,4BAA4B,EAAE;oBAC5B,MAAM,EAAE,QAAQ,EAAE,mBAAmB;wBACnC,CAAC,CAAC;4BACE,oBAAoB,EAAE,MAAM;yBAC7B;wBACH,CAAC,CAAC,SAAS;oBACb,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,mBAAmB,CAAC;iBAChD;gBAED,WAAW,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,iBAAiB,IAAI,KAAK,EAAE;gBAC9D,aAAa,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;gBACjC,sBAAsB,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE;gBAC1C,iBAAiB,EAAE;oBACjB,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,qBAAqB,CAAC;oBAChD,MAAM,EAAE,OAAO,EAAE,qBAAqB,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAAC,CAAC,SAAS;iBACnG;gBACD,+BAA+B;gBAC/B,gDAAgD;gBAChD,qCAAqC;gBACrC,UAAU;gBACV,0CAA0C;gBAC1C,8DAA8D;gBAC9D,UAAU;gBACV,mBAAmB;gBACnB,KAAK;gBACL,QAAQ,EAAE;oBACR,OAAO,EAAE,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC;oBAClC,MAAM,EAAE,YAAY,EAAE,EAAE;wBACtB,CAAC,CAAC;4BACE,+BAA+B,EAAE,YAAY,CAAC,EAAE;yBACjD;wBACH,CAAC,CAAC,SAAS;iBACd;aACF;YAED,sBAAsB,EAAE;gBACtB,kBAAkB,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,kBAAkB,IAAI,EAAE,CAAC;gBACpG,iBAAiB,EAAE,IAAI;gBACvB,oBAAoB,EAAE,QAAQ,EAAE,oBAAoB;gBACpD,2FAA2F;gBAC3F,8BAA8B,EAAE,QAAQ,EAAE,8BAA8B,IAAI,IAAI;gBAChF,cAAc,EAAE,QAAQ,EAAE,oBAAoB,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS;gBACrE,qCAAqC;aACtC;YAED,iBAAiB,EAAE,iBAAiB,IAAI;gBACtC,wBAAwB,EAAE,OAAO;gBACjC,QAAQ,EAAE,QAAQ;gBAClB,kBAAkB,EAAE,IAAI;gBACxB,yBAAyB,EAAE,KAAK;gBAChC,oBAAoB,EAAE,KAAK;gBAC3B,yBAAyB,EAAE,IAAI;gBAC/B,kBAAkB,EAAE,IAAI;gBACxB,mBAAmB,EAAE,GAAG;gBACxB,sBAAsB,EAAE,KAAK;gBAC7B,yBAAyB,EAAE,KAAK;gBAChC,0BAA0B,EAAE,IAAI;gBAChC,qBAAqB,EAAE,KAAK;gBAC5B,oBAAoB,EAAE,KAAK;gBAC3B,6BAA6B,EAAE,KAAK;gBACpC,YAAY,EAAE,KAAK;gBACnB,yBAAyB,EAAE,OAAO;gBAClC,uBAAuB,EAAE,MAAM;aAChC;YAED,kBAAkB,EAAE;gBAClB,oBAAoB,EAAE,GAAG,CAAC,oBAAoB,CAAC,SAAS;gBACxD,cAAc,EAAE,GAAG,CAAC,cAAc,CAAC,MAAM;aAC1C;YAED,oBAAoB,EAAE,IAAI;YAC1B,mBAAmB,EAAE,iBAAiB,EAAE,EAAE;YAC1C,SAAS,EAAE,KAAK,CAAC,SAAS,IAAI,GAAG,kBAAQ,CAAC,UAAU,IAAI,IAAI,CAAC,IAAI,EAAE;YACnE,UAAU,EAAE,IAAI;YAEhB,QAAQ,EAAE;gBACR,IAAI,EAAE,GAAG,CAAC,oBAAoB,CAAC,cAAc;gBAC7C,6GAA6G;gBAC7G,mFAAmF;aACpF;YAED,sCAAsC;YACtC,4EAA4E;YAC5E,iBAAiB;YAEjB,YAAY,EAAE;gBACZ,aAAa,EAAE,KAAK,CAAC,QAAQ;gBAC7B,GAAG,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,EAAE,CAAC,EAAE;aACvD;YAED,cAAc,EAAE;gBACd,GAAG,OAAO;gBACV,2CAA2C;gBAC3C,aAAa,EAAE,GAAG,CAAC,aAAa,CAAC,KAAK;gBACtC,aAAa,EAAE,OAAO,EAAE,aAAa,IAAI,GAAG,CAAC,aAAa,CAAC,MAAM;gBACjE,gBAAgB,EAAE,OAAO,EAAE,aAAa,IAAI,GAAG,CAAC,gBAAgB,CAAC,MAAM;gBACvE,iBAAiB,EAAE,GAAG,CAAC,iBAAiB,CAAC,OAAO;gBAEhD,eAAe,EAAE,UAAU;gBAC3B,YAAY,EAAE,OAAO,EAAE,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,kBAAkB;aAC3E;YAED,iBAAiB,EAAE,MAAM;YACzB,iBAAiB,EAAE,EAAE,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,sBAAsB,CAAC,EAAE;YACzE,kBAAkB,EAAE,QAAQ,EAAE,iBAAiB;gBAC7C,CAAC,CAAC;oBACE,OAAO,EAAE,QAAQ,CAAC,iBAAiB;oBACnC,qCAAqC;oBACrC,yBAAyB,EAAE,KAAK;iBACjC;gBACH,CAAC,CAAC,SAAS;YAEb,eAAe,EAAE;gBACf,QAAQ,EAAE,YAAY,EAAE,eAAe;oBACrC,CAAC,CAAC;wBACE,+BAA+B,EAAE,YAAY,CAAC,EAAE;wBAChD,kBAAkB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE;qBACtC;oBACH,CAAC,CAAC,SAAS;gBACb,YAAY,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,EAAE;gBAClD,gBAAgB,EAAE;oBAChB,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,sBAAsB,CAAC;iBACnD;aACF;YAED,uBAAuB,EAAE;gBACvB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,MAAM,EAAE,KAAK,CAAC,YAAY;aAC3B;YAED,GAAG,EAAE;gBACH,IAAI,EAAE,GAAG,CAAC,qBAAqB,CAAC,IAAI;gBACpC,IAAI,EAAE,GAAG;aACV;YAED,cAAc,EAAE,SAAS;YACzB,yBAAyB,EAAE;gBACzB,qBAAqB,EAAE;oBACrB,OAAO,EAAE,QAAQ,EAAE,2BAA2B,IAAI,KAAK;iBACxD;gBACD,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,UAAU,IAAI,KAAK,EAAE;aACjD;YAED,gDAAgD;YAChD,yFAAyF;YACzF,gCAAgC;SACjC,EACD;YACE,GAAG,IAAI,CAAC,IAAI;YACZ,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,IAAI;SACb,CACF,CAAC;IACJ,CAAC;IAEO,4BAA4B,CAAC,GAAuB;QAC1D,MAAM,EAAE,OAAO,EAAE,sBAAsB,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACtD,IAAI,CAAC,sBAAsB,IAAI,sBAAsB,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAE3E,OAAO,sBAAsB,CAAC,GAAG,CAC/B,CAAC,OAAO,EAAE,EAAE,CACV,IAAI,GAAG,CAAC,SAAS,CACf,GAAG,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,EAC9B;YACE,GAAG,OAAO;YACV,GAAG,OAAO;YACV,iBAAiB,EAAE,oBAAU,CAAC,eAAe,CAAC,OAAO,CAAC,iBAAiB,CAAC;YACxE,YAAY,EAAE,GAAG,CAAC,IAAI;YACtB,aAAa,EAAE,OAAO,CAAC,IAAI;SAC5B,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CACnD,CACJ,CAAC;IACJ,CAAC;IAEO,gBAAgB,CAAC,GAAuB;QAC9C,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1C,IAAI,CAAC,UAAU;YAAE,OAAO,EAAmC,CAAC;QAE5D,OAAO,mBAAS,CAAC,UAAU,CACzB,UAAU,EACV,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CACX,IAAI,GAAG,CAAC,SAAS,CACf,GAAG,IAAI,CAAC,IAAI,OAAO,CAAC,EAAE,EACtB;YACE,GAAG,OAAO;YACV,YAAY,EAAE,GAAG,CAAC,IAAI;YACtB,aAAa,EAAE,CAAC;YAChB,UAAU,EAAE,KAAK;SAClB,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CACvD,CACJ,CAAC;IACJ,CAAC;IAEO,iBAAiB,CAAC,GAAuB;QAC/C,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC3C,MAAM,sBAAsB,GAAG,yBAAyB,CAAC,WAAW,CAAC,CAAC;QACtE,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAClG,MAAM,YAAY,GAAG,eAAe,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAExF,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,wBAAwB,CACzD,GAAG,IAAI,CAAC,IAAI,2BAA2B,EACvC;YACE,GAAG,OAAO;YACV,UAAU,EAAE,SAAS;YACrB,YAAY,EAAE,GAAG,CAAC,IAAI;YACtB,UAAU,EAAE,sBAAsB,EAAE,UAAU,IAAI;gBAChD;oBACE,GAAG,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM;oBACvB,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;iBACnB;aACF;YACD,cAAc,EAAE,sBAAsB,EAAE,cAAc;SACvD,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAC9E,CAAC;QAEF,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC,wBAAwB,CAC7D,GAAG,IAAI,CAAC,IAAI,sBAAsB,EAClC;YACE,GAAG,OAAO;YACV,UAAU,EAAE,iBAAiB,CAAC,UAAU,IAAI,+BAA+B;YAC3E,YAAY,EAAE,GAAG,CAAC,IAAI;YACtB,iBAAiB,EAAE,iBAAiB;SACrC,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAC9E,CAAC;QAEF,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,wBAAwB,CACxD,GAAG,IAAI,CAAC,IAAI,wBAAwB,EACpC;YACE,GAAG,OAAO;YACV,UAAU,EAAE,YAAY,CAAC,UAAU,IAAI,iCAAiC;YACxE,YAAY,EAAE,GAAG,CAAC,IAAI;YACtB,iBAAiB,EAAE,YAAY;SAChC,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,mBAAmB,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAC9E,CAAC;QAEF,OAAO,EAAE,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,sBAAsB,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAC;IACzG,CAAC;IAEO,gBAAgB,CAAC,GAAuB,EAAE,QAAyB;QACzE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QACtD,IAAI,UAAU,EAAE,MAAM,IAAI,UAAU,EAAE,CAAC;YACrC,IAAA,+BAAqB,EACnB,GAAG,IAAI,CAAC,IAAI,SAAS,EACrB;gBACE,GAAG,UAAU,CAAC,MAAM;gBACpB,GAAG;gBACH,OAAO;gBACP,UAAU;gBACV,QAAQ;aACT,EACD,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CACvC,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,kBAAkB,CAAC,GAAuB;QAChD,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC9B,MAAM,OAAO,GAAG,IAAA,6BAAmB,EAAC,EAAE,iBAAiB,EAAE,OAAO,CAAC,iBAAiB,EAAE,YAAY,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9G,OAAO,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACtD,EAAE,EAAE,CAAE,CAAC,eAAe,CAAC,UAAW;YAClC,QAAQ,EAAE,CAAE,CAAC,eAAe,CAAC,QAAS;YACtC,QAAQ,EAAE,CAAE,CAAC,eAAe,CAAC,QAAS;SACvC,CAAC,CAAC,CAAC;IACN,CAAC;IAEO,gBAAgB,CAAC,GAAuB;QAC9C,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAElC,IAAI,WAAW,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC;YACxC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,eAAgB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC/C,IAAI,qBAAc,CAChB,GAAG,IAAI,CAAC,IAAI,eAAe,EAC3B;oBACE,WAAW,EAAE,CAAE,CAAC,QAAS;oBACzB,aAAa,EAAE,kBAAkB;oBACjC,QAAQ,EAAE,SAAS;oBACnB,KAAK,EAAE,WAAW,CAAC,EAAE;iBACtB,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CACnD,CAAC;gBACF,IAAI,qBAAc,CAChB,GAAG,IAAI,CAAC,IAAI,eAAe,EAC3B;oBACE,WAAW,EAAE,CAAE,CAAC,QAAS;oBACzB,aAAa,EAAE,kBAAkB;oBACjC,QAAQ,EAAE,sCAAsC;oBAChD,KAAK,EAAE,WAAW,CAAC,EAAE;iBACtB,EACD,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,CACnD,CAAC;YACJ,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAEO,iBAAiB,CAAC,GAAuB;QAC/C,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;QAC/B,IAAI,CAAC,QAAQ,CAAC,oBAAoB;YAAE,OAAO,SAAS,CAAC;QAErD,MAAM,OAAO,GAAG,GAAG,CAAC,iBAAiB,CAAC;QACtC,MAAM,SAAS,GAAG,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;YAC/C,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC1B,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7E,CAAC,CAAC,CAAC;QAEH,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,CAAA,kBAAkB,kBAAQ,CAAC,cAAc,mBAAmB,OAAO,gDAAgD,SAAS,CAAC,eAAe,EAAE,CAAC;QAC5K,6CAA6C;QAC7C,MAAM,EAAE,GAAG,IAAA,mCAAyB,EAAC;YACnC,eAAe,EAAE,SAAS,CAAC,eAAe;YAC1C,iBAAiB,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAE,CAAC;YAC3C,qBAAqB,EAAE,SAAS,CAAC,kBAAkB;YACnD,UAAU,EAAE,GAAG;SAChB,CAAC,CAAC;QAEH,OAAO;YACL,WAAW,EAAE,EAAE,EAAE,EAAE,YAAY,EAAE,SAAS,CAAC,eAAe,EAAE;YAC5D,gBAAgB,EAAE,EAAG,CAAC,QAAS,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;SACzG,CAAC;IACJ,CAAC;IAEO,2BAA2B;QACjC,MAAM,QAAQ,GAAG,IAAI,IAAI,EAAE,CAAC;QAC5B,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC;QACzC,MAAM,SAAS,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,OAAO;YACL,QAAQ,EAAE;gBACR,MAAM,EAAE;oBACN,SAAS,EAAE,QAAQ;oBACnB,aAAa,EAAE,CAAC;iBACjB;aACF;YACD,aAAa,EAAE,CAAC;YAChB,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,OAAO;YAClB,SAAS;SACV,CAAC;IACJ,CAAC;CACF;AAngBD,oCAmgBC"}
497
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"AzKubernetes.js","sourceRoot":"","sources":["../../src/aks/AzKubernetes.ts"],"names":[],"mappings":"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"}
@@ -37,7 +37,7 @@ exports.ContainerRegistry = void 0;
37
37
  const pulumi = __importStar(require("@pulumi/pulumi"));
38
38
  const registry = __importStar(require("@pulumi/azure-native/containerregistry"));
39
39
  const base_1 = require("../base");
40
- const PrivateEndpoint_1 = require("../vnet/PrivateEndpoint");
40
+ const vnet_1 = require("../vnet");
41
41
  class ContainerRegistry extends base_1.BaseResourceComponent {
42
42
  id;
43
43
  resourceName;
@@ -56,7 +56,7 @@ class ContainerRegistry extends base_1.BaseResourceComponent {
56
56
  };
57
57
  }
58
58
  createAcr() {
59
- const { rsGroup, enableEncryption, defaultUAssignedId, retentionDaysPolicy, sku, network, ...props } = this.args;
59
+ const { rsGroup, enableEncryption, enableResourceIdentity, defaultUAssignedId, retentionDaysPolicy, sku, network, ...props } = this.args;
60
60
  const encryptionKey = sku === 'Premium' && enableEncryption ? this.getEncryptionKey() : undefined;
61
61
  const alphanumericString = (this.name.match(/[a-zA-Z0-9]+/g) || []).join('');
62
62
  return new registry.Registry(alphanumericString, {
@@ -66,14 +66,16 @@ class ContainerRegistry extends base_1.BaseResourceComponent {
66
66
  adminUserEnabled: false,
67
67
  anonymousPullEnabled: false,
68
68
  zoneRedundancy: sku != 'Basic' && props.zoneRedundancy ? 'Enabled' : 'Disabled',
69
- identity: {
70
- type: defaultUAssignedId
71
- ? registry.ResourceIdentityType.SystemAssigned_UserAssigned
72
- : registry.ResourceIdentityType.SystemAssigned,
73
- userAssignedIdentities: defaultUAssignedId
74
- ? pulumi.output(defaultUAssignedId).apply((id) => ({ [id.id]: {} }))
75
- : undefined,
76
- },
69
+ identity: enableResourceIdentity
70
+ ? {
71
+ type: defaultUAssignedId
72
+ ? registry.ResourceIdentityType.SystemAssigned_UserAssigned
73
+ : registry.ResourceIdentityType.SystemAssigned,
74
+ userAssignedIdentities: defaultUAssignedId
75
+ ? pulumi.output(defaultUAssignedId).apply((id) => ({ [id.id]: {} }))
76
+ : undefined,
77
+ }
78
+ : undefined,
77
79
  encryption: encryptionKey && defaultUAssignedId
78
80
  ? {
79
81
  keyVaultProperties: {
@@ -116,8 +118,8 @@ class ContainerRegistry extends base_1.BaseResourceComponent {
116
118
  const { rsGroup, network } = this.args;
117
119
  if (!network?.privateLink)
118
120
  return;
119
- return new PrivateEndpoint_1.PrivateEndpoint(this.name, { ...network.privateLink, resourceInfo: acr, rsGroup, type: 'azurecr' }, { dependsOn: acr, parent: this });
121
+ return new vnet_1.PrivateEndpoint(this.name, { ...network.privateLink, resourceInfo: acr, rsGroup, type: 'azurecr' }, { dependsOn: acr, parent: this });
120
122
  }
121
123
  }
122
124
  exports.ContainerRegistry = ContainerRegistry;
123
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udGFpbmVyUmVnaXN0cnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWtzL0NvbnRhaW5lclJlZ2lzdHJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHVEQUF5QztBQUN6QyxpRkFBbUU7QUFHbkUsa0NBQWdFO0FBRWhFLDZEQUEwRDtBQWExRCxNQUFhLGlCQUFrQixTQUFRLDRCQUE0QztJQUNqRSxFQUFFLENBQXdCO0lBQzFCLFlBQVksQ0FBd0I7SUFFcEQsWUFBWSxJQUFZLEVBQUUsSUFBMkIsRUFBRSxJQUFzQztRQUMzRixLQUFLLENBQUMsbUJBQW1CLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUU3QyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDN0IsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBRTVCLElBQUksQ0FBQyxFQUFFLEdBQUcsR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUNqQixJQUFJLENBQUMsWUFBWSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUM7UUFFN0IsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO0lBQ3pCLENBQUM7SUFFTSxVQUFVO1FBQ2YsT0FBTztZQUNMLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtZQUNYLFlBQVksRUFBRSxJQUFJLENBQUMsWUFBWTtTQUNoQyxDQUFDO0lBQ0osQ0FBQztJQUVPLFNBQVM7UUFDZixNQUFNLEVBQUUsT0FBTyxFQUFFLGdCQUFnQixFQUFFLGtCQUFrQixFQUFFLG1CQUFtQixFQUFFLEdBQUcsRUFBRSxPQUFPLEVBQUUsR0FBRyxLQUFLLEVBQUUsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDO1FBQ2pILE1BQU0sYUFBYSxHQUFHLEdBQUcsS0FBSyxTQUFTLElBQUksZ0JBQWdCLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsRUFBRSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUM7UUFDbEcsTUFBTSxrQkFBa0IsR0FBRyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztRQUU3RSxPQUFPLElBQUksUUFBUSxDQUFDLFFBQVEsQ0FDMUIsa0JBQWtCLEVBQ2xCO1lBQ0UsR0FBRyxLQUFLO1lBQ1IsR0FBRyxPQUFPO1lBRVYsR0FBRyxFQUFFLEVBQUUsSUFBSSxFQUFFLEdBQUcsRUFBRTtZQUNsQixnQkFBZ0IsRUFBRSxLQUFLO1lBQ3ZCLG9CQUFvQixFQUFFLEtBQUs7WUFDM0IsY0FBYyxFQUFFLEdBQUcsSUFBSSxPQUFPLElBQUksS0FBSyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxVQUFVO1lBRS9FLFFBQVEsRUFBRTtnQkFDUixJQUFJLEVBQUUsa0JBQWtCO29CQUN0QixDQUFDLENBQUMsUUFBUSxDQUFDLG9CQUFvQixDQUFDLDJCQUEyQjtvQkFDM0QsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxvQkFBb0IsQ0FBQyxjQUFjO2dCQUVoRCxzQkFBc0IsRUFBRSxrQkFBa0I7b0JBQ3hDLENBQUMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztvQkFDcEUsQ0FBQyxDQUFDLFNBQVM7YUFDZDtZQUVELFVBQVUsRUFDUixhQUFhLElBQUksa0JBQWtCO2dCQUNqQyxDQUFDLENBQUM7b0JBQ0Usa0JBQWtCLEVBQUU7d0JBQ2xCLFFBQVEsRUFBRSxrQkFBa0IsQ0FBQyxRQUFRO3dCQUNyQyxhQUFhLEVBQUUsYUFBYSxDQUFDLGlCQUFpQjtxQkFDL0M7aUJBQ0Y7Z0JBQ0gsQ0FBQyxDQUFDLFNBQVM7WUFFZixRQUFRLEVBQ04sR0FBRyxLQUFLLFNBQVM7Z0JBQ2YsQ0FBQyxDQUFDO29CQUNFLFlBQVksRUFBRTt3QkFDWixNQUFNLEVBQUUsUUFBUSxDQUFDLGtCQUFrQixDQUFDLFFBQVE7cUJBQzdDO29CQUNELGdCQUFnQixFQUFFLEVBQUUsTUFBTSxFQUFFLFFBQVEsQ0FBQyxZQUFZLENBQUMsT0FBTyxFQUFFO29CQUMzRCxlQUFlLEVBQUU7d0JBQ2YsSUFBSSxFQUFFLG1CQUFtQixJQUFJLEVBQUU7d0JBQy9CLE1BQU0sRUFBRSxRQUFRLENBQUMsWUFBWSxDQUFDLE9BQU87cUJBQ3RDO29CQUNELFdBQVcsRUFBRTt3QkFDWCxNQUFNLEVBQUUsUUFBUSxDQUFDLFlBQVksQ0FBQyxPQUFPO3dCQUNyQyxJQUFJLEVBQUUsUUFBUSxDQUFDLGVBQWUsQ0FBQyxNQUFNO3FCQUN0QztpQkFDRjtnQkFDSCxDQUFDLENBQUMsU0FBUztZQUVmLG1CQUFtQixFQUFFLE9BQU8sRUFBRSxtQkFBbUIsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxPQUFPLEVBQUUsV0FBVyxDQUFDLENBQUMsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLFNBQVM7WUFDN0csd0JBQXdCLEVBQUUsT0FBTyxFQUFFLE1BQU07WUFFekMsY0FBYyxFQUNaLEdBQUcsS0FBSyxTQUFTLElBQUksT0FBTztnQkFDMUIsQ0FBQyxDQUFDO29CQUNFLGFBQWEsRUFBRSxPQUFPLENBQUMsYUFBYSxJQUFJLFFBQVEsQ0FBQyxhQUFhLENBQUMsS0FBSztvQkFDcEUsT0FBTyxFQUFFLE9BQU8sQ0FBQyxPQUFPO3dCQUN0QixDQUFDLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FDM0MsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQzs0QkFDZixnQkFBZ0IsRUFBRSxFQUFFO3lCQUNyQixDQUFDLENBQUMsQ0FDSjt3QkFDSCxDQUFDLENBQUMsU0FBUztpQkFDZDtnQkFDSCxDQUFDLENBQUMsU0FBUztTQUNoQixFQUNELEVBQUUsR0FBRyxJQUFJLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FDL0IsQ0FBQztJQUNKLENBQUM7SUFFTyxpQkFBaUIsQ0FBQyxHQUFzQjtRQUM5QyxNQUFNLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUM7UUFDdkMsSUFBSSxDQUFDLE9BQU8sRUFBRSxXQUFXO1lBQUUsT0FBTztRQUVsQyxPQUFPLElBQUksaUNBQWUsQ0FDeEIsSUFBSSxDQUFDLElBQUksRUFDVCxFQUFFLEdBQUcsT0FBTyxDQUFDLFdBQVcsRUFBRSxZQUFZLEVBQUUsR0FBRyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLEVBQ3ZFLEVBQUUsU0FBUyxFQUFFLEdBQUcsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQ2pDLENBQUM7SUFDSixDQUFDO0NBQ0Y7QUE1R0QsOENBNEdDIn0=
125
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udGFpbmVyUmVnaXN0cnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvYWtzL0NvbnRhaW5lclJlZ2lzdHJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLHVEQUF5QztBQUN6QyxpRkFBbUU7QUFHbkUsa0NBQWdFO0FBRWhFLGtDQUEwQztBQWExQyxNQUFhLGlCQUFrQixTQUFRLDRCQUE0QztJQUNqRSxFQUFFLENBQXdCO0lBQzFCLFlBQVksQ0FBd0I7SUFFcEQsWUFBWSxJQUFZLEVBQUUsSUFBMkIsRUFBRSxJQUFzQztRQUMzRixLQUFLLENBQUMsbUJBQW1CLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxJQUFJLENBQUMsQ0FBQztRQUU3QyxNQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7UUFDN0IsSUFBSSxDQUFDLGlCQUFpQixDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBRTVCLElBQUksQ0FBQyxFQUFFLEdBQUcsR0FBRyxDQUFDLEVBQUUsQ0FBQztRQUNqQixJQUFJLENBQUMsWUFBWSxHQUFHLEdBQUcsQ0FBQyxJQUFJLENBQUM7UUFFN0IsSUFBSSxDQUFDLGVBQWUsRUFBRSxDQUFDO0lBQ3pCLENBQUM7SUFFTSxVQUFVO1FBQ2YsT0FBTztZQUNMLEVBQUUsRUFBRSxJQUFJLENBQUMsRUFBRTtZQUNYLFlBQVksRUFBRSxJQUFJLENBQUMsWUFBWTtTQUNoQyxDQUFDO0lBQ0osQ0FBQztJQUVPLFNBQVM7UUFDZixNQUFNLEVBQ0osT0FBTyxFQUNQLGdCQUFnQixFQUNoQixzQkFBc0IsRUFDdEIsa0JBQWtCLEVBQ2xCLG1CQUFtQixFQUNuQixHQUFHLEVBQ0gsT0FBTyxFQUNQLEdBQUcsS0FBSyxFQUNULEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQztRQUNkLE1BQU0sYUFBYSxHQUFHLEdBQUcsS0FBSyxTQUFTLElBQUksZ0JBQWdC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
package/aks/helpers.d.ts CHANGED
@@ -13,10 +13,9 @@ export declare const getAksClusterOutput: ({ resourceName, resourceGroupName, }:
13
13
  resourceName: pulumi.Input<string>;
14
14
  resourceGroupName: pulumi.Input<string>;
15
15
  }) => pulumi.Output<AksOutputType>;
16
- export type ArgoCDExtensionArgs = Required<types.WithGroupRolesArgs> & types.WithResourceGroupInputs & {
16
+ export type ArgoCDExtensionArgs = types.WithResourceGroupInputs & Required<types.WithUserAssignedIdentity> & {
17
17
  allowInsecureAccess?: boolean;
18
18
  argoCdDomain: pulumi.Input<string>;
19
- workloadIdentityClientId: pulumi.Input<string>;
20
19
  aks: azure.containerservice.ManagedCluster;
21
20
  identity: AppRegistration;
22
21
  releaseTrain?: 'preview' | pulumi.Input<string>;
@@ -24,5 +23,10 @@ export type ArgoCDExtensionArgs = Required<types.WithGroupRolesArgs> & types.Wit
24
23
  configs?: {
25
24
  [key: string]: pulumi.Input<string>;
26
25
  };
26
+ permission: {
27
+ syncGroupObjectId?: pulumi.Input<string>;
28
+ readonlyGroupObjectId?: pulumi.Input<string>;
29
+ adminGroupObjectId?: pulumi.Input<string>;
30
+ };
27
31
  };
28
- export declare const createArgoCDExtension: (name: string, { allowInsecureAccess, argoCdDomain, workloadIdentityClientId, aks, identity, groupRoles, rsGroup, releaseTrain, allowedNameSpaces, configs, }: ArgoCDExtensionArgs, opts?: pulumi.ComponentResourceOptions) => import("@pulumi/azure-native/kubernetesconfiguration/extension").Extension;
32
+ export declare const createArgoCDExtension: (name: string, { allowInsecureAccess, argoCdDomain, defaultUAssignedId, aks, identity, permission, rsGroup, releaseTrain, allowedNameSpaces, configs, }: ArgoCDExtensionArgs, opts?: pulumi.ComponentResourceOptions) => import("@pulumi/azure-native/kubernetesconfiguration/extension").Extension;
package/aks/helpers.js CHANGED
@@ -70,7 +70,7 @@ const getAksClusterOutput = ({ resourceName, resourceGroupName, }) => {
70
70
  });
71
71
  };
72
72
  exports.getAksClusterOutput = getAksClusterOutput;
73
- const createArgoCDExtension = (name, { allowInsecureAccess, argoCdDomain, workloadIdentityClientId, aks, identity, groupRoles, rsGroup, releaseTrain, allowedNameSpaces, configs, }, opts) => {
73
+ const createArgoCDExtension = (name, { allowInsecureAccess, argoCdDomain, defaultUAssignedId, aks, identity, permission, rsGroup, releaseTrain, allowedNameSpaces, configs, }, opts) => {
74
74
  const oidcConfig = pulumi.interpolate `
75
75
  name: Azure
76
76
  issuer: https://login.microsoftonline.com/${helpers_1.azureEnv.tenantId}/v2.0
@@ -87,14 +87,26 @@ requestedScopes:
87
87
  `;
88
88
  const defaultPolicy = 'role:readonly';
89
89
  const policy = pulumi.interpolate `
90
+ # Admin role
90
91
  p, role:org-admin, applications, *, */*, allow
91
92
  p, role:org-admin, clusters, get, *, allow
92
93
  p, role:org-admin, repositories, get, *, allow
93
94
  p, role:org-admin, repositories, create, *, allow
94
95
  p, role:org-admin, repositories, update, *, allow
95
96
  p, role:org-admin, repositories, delete, *, allow
96
- g, ${groupRoles.admin.objectId}, role:org-admin
97
- g, ${groupRoles.readOnly.objectId}, role:readonly
97
+
98
+ # Read-all + manual application sync custom role
99
+ p, role:app-sync, applications, get, */*, allow
100
+ p, role:app-sync, applications, sync, */*, allow
101
+ p, role:app-sync, projects, get, *, allow
102
+ p, role:app-sync, clusters, get, *, allow
103
+ p, role:app-sync, repositories, get, *, allow
104
+ p, role:app-sync, logs, get, *, allow
105
+
106
+ # Group role mappings
107
+ g, ${permission.adminGroupObjectId ?? '00000000-0000-0000-0000-000000000000'}, role:org-admin
108
+ g, ${permission.syncGroupObjectId ?? '00000000-0000-0000-0000-000000000000'}, role:app-sync
109
+ g, ${permission.readonlyGroupObjectId ?? '00000000-0000-0000-0000-000000000000'}, role:readonly
98
110
  `;
99
111
  return new azure.kubernetesconfiguration.Extension(name, {
100
112
  autoUpgradeMinorVersion: true,
@@ -108,13 +120,14 @@ g, ${groupRoles.readOnly.objectId}, role:readonly
108
120
  deployWithHighAvailability: 'false',
109
121
  namespaceInstall: 'true',
110
122
  'workloadIdentity.enable': 'true',
111
- 'workloadIdentity.clientId': workloadIdentityClientId,
123
+ 'workloadIdentity.clientId': defaultUAssignedId.clientId,
112
124
  'workloadIdentity.entraSSOClientId': identity.clientId,
113
- 'config-maps.argocd-cmd-params-cm.server.insecure': allowInsecureAccess ? 'true' : 'false',
125
+ 'config-maps.argocd-cm.data.admin.\\enabled': 'false',
114
126
  'config-maps.argocd-cm.data.oidc\\.config': oidcConfig,
115
127
  'config-maps.argocd-cm.data.url': pulumi.interpolate `https://${argoCdDomain}/`,
116
128
  'config-maps.argocd-rbac-cm.data.policy\\.default': defaultPolicy,
117
129
  'config-maps.argocd-rbac-cm.data.policy\\.csv': policy,
130
+ 'config-maps.argocd-cmd-params-cm.data.server\\.insecure': allowInsecureAccess ? 'true' : 'false',
118
131
  'config-maps.argocd-cmd-params-cm.data.application\\.namespaces': allowedNameSpaces
119
132
  ? pulumi.output(allowedNameSpaces).apply((ns) => ns.join(','))
120
133
  : 'argocd',
@@ -123,4 +136,4 @@ g, ${groupRoles.readOnly.objectId}, role:readonly
123
136
  }, { ...opts, dependsOn: [aks, identity] });
124
137
  };
125
138
  exports.createArgoCDExtension = createArgoCDExtension;
126
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ha3MvaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw0REFBOEM7QUFDOUMsd0NBQXNDO0FBQ3RDLHVEQUF5QztBQUs1QixRQUFBLHdCQUF3QixHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztBQUU1RSxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsRUFDakMsWUFBWSxFQUNaLGlCQUFpQixFQUNqQixvQkFBb0IsR0FLckIsRUFBbUIsRUFBRTtJQUNwQixNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLGdCQUFnQixDQUFDLGlDQUFpQyxDQUFDO1lBQzdELFlBQVk7WUFDWixpQkFBaUI7U0FDbEIsQ0FBQztRQUNKLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxrQ0FBa0MsQ0FBQztZQUM5RCxZQUFZO1lBQ1osaUJBQWlCO1NBQ2xCLENBQUMsQ0FBQztJQUVQLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUUsQ0FBQyxDQUFDO0FBcEJXLFFBQUEsWUFBWSxnQkFvQnZCO0FBRUssTUFBTSxtQkFBbUIsR0FBRyxDQUFDLEVBQ2xDLFlBQVksRUFDWixpQkFBaUIsR0FJbEIsRUFBZ0MsRUFBRTtJQUNqQyxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFBLDhDQUE4QyxrQkFBUSxDQUFDLGNBQWMsbUJBQW1CLGlCQUFpQix5REFBeUQsWUFBWSx5QkFBeUIsQ0FBQztJQUN0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
139
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ha3MvaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw0REFBOEM7QUFDOUMsd0NBQXNDO0FBQ3RDLHVEQUF5QztBQUs1QixRQUFBLHdCQUF3QixHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztBQUU1RSxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsRUFDakMsWUFBWSxFQUNaLGlCQUFpQixFQUNqQixvQkFBb0IsR0FLckIsRUFBbUIsRUFBRTtJQUNwQixNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLGdCQUFnQixDQUFDLGlDQUFpQyxDQUFDO1lBQzdELFlBQVk7WUFDWixpQkFBaUI7U0FDbEIsQ0FBQztRQUNKLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxrQ0FBa0MsQ0FBQztZQUM5RCxZQUFZO1lBQ1osaUJBQWlCO1NBQ2xCLENBQUMsQ0FBQztJQUVQLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUUsQ0FBQyxDQUFDO0FBcEJXLFFBQUEsWUFBWSxnQkFvQnZCO0FBRUssTUFBTSxtQkFBbUIsR0FBRyxDQUFDLEVBQ2xDLFlBQVksRUFDWixpQkFBaUIsR0FJbEIsRUFBZ0MsRUFBRTtJQUNqQyxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFBLDhDQUE4QyxrQkFBUSxDQUFDLGNBQWMsbUJBQW1CLGlCQUFpQix5REFBeUQsWUFBWSx5QkFBeUIsQ0FBQztJQUN0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
package/apim/Apim.d.ts CHANGED
@@ -6,7 +6,7 @@ import * as types from '../types';
6
6
  import { ApimProductArgs } from './ApimProduct';
7
7
  import { BaseResourceComponent, CommonBaseArgs } from '../base';
8
8
  type ApimCertType = certHelpers.CertType | certHelpers.VaultCertType | certHelpers.CertFile;
9
- export interface ApimArgs extends CommonBaseArgs, types.WithUserAssignedIdentity, types.WithNetworkArgs, types.WithLogs, Omit<apim.ApiManagementServiceArgs, types.CommonProps | 'serviceName' | 'sku' | 'additionalLocations' | 'certificates' | 'hostnameConfigurations' | 'publicNetworkAccess' | 'virtualNetworkType' | 'virtualNetworkConfiguration' | 'publisherName' | 'publisherEmail' | 'customProperties'> {
9
+ export interface ApimArgs extends CommonBaseArgs, types.WithNetworkArgs, types.WithLogs, Omit<apim.ApiManagementServiceArgs, types.CommonProps | 'serviceName' | 'sku' | 'additionalLocations' | 'certificates' | 'hostnameConfigurations' | 'publicNetworkAccess' | 'virtualNetworkType' | 'virtualNetworkConfiguration' | 'publisherName' | 'publisherEmail' | 'customProperties'> {
10
10
  publisherEmail?: pulumi.Input<string>;
11
11
  publisherName?: pulumi.Input<string>;
12
12
  customProperties?: string[];