@drunk-pulumi/azure-components 1.1.2 → 1.1.3
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/helpers.d.ts +2 -2
- package/aks/helpers.js +6 -4
- package/package.json +1 -1
package/aks/helpers.d.ts
CHANGED
|
@@ -14,11 +14,11 @@ export declare const getAksClusterOutput: ({ resourceName, resourceGroupName, }:
|
|
|
14
14
|
resourceGroupName: pulumi.Input<string>;
|
|
15
15
|
}) => pulumi.Output<AksOutputType>;
|
|
16
16
|
export type ArgoCDExtensionArgs = Required<types.WithGroupRolesArgs> & types.WithResourceGroupInputs & {
|
|
17
|
-
namespace: pulumi.Input<string>;
|
|
18
17
|
argoCdDomain: pulumi.Input<string>;
|
|
19
18
|
workloadIdentityClientId: pulumi.Input<string>;
|
|
20
19
|
aks: azure.containerservice.ManagedCluster;
|
|
21
20
|
identity: AppRegistration;
|
|
22
21
|
releaseTrain?: 'preview' | pulumi.Input<string>;
|
|
22
|
+
allowedNameSpaces?: pulumi.Input<string>[];
|
|
23
23
|
};
|
|
24
|
-
export declare const createArgoCDExtension: (name: string, { argoCdDomain,
|
|
24
|
+
export declare const createArgoCDExtension: (name: string, { argoCdDomain, workloadIdentityClientId, aks, identity, groupRoles, rsGroup, releaseTrain, allowedNameSpaces, }: 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, { argoCdDomain,
|
|
73
|
+
const createArgoCDExtension = (name, { argoCdDomain, workloadIdentityClientId, aks, identity, groupRoles, rsGroup, releaseTrain, allowedNameSpaces, }, opts) => {
|
|
74
74
|
const oidcConfig = pulumi.interpolate `
|
|
75
75
|
name: Azure
|
|
76
76
|
issuer: https://login.microsoftonline.com/${helpers_1.azureEnv.tenantId}/v2.0
|
|
@@ -86,7 +86,7 @@ requestedScopes:
|
|
|
86
86
|
- email
|
|
87
87
|
`;
|
|
88
88
|
const defaultPolicy = 'role:readonly';
|
|
89
|
-
const policy = `
|
|
89
|
+
const policy = pulumi.interpolate `
|
|
90
90
|
p, role:org-admin, applications, *, */*, allow
|
|
91
91
|
p, role:org-admin, clusters, get, *, allow
|
|
92
92
|
p, role:org-admin, repositories, get, *, allow
|
|
@@ -114,9 +114,11 @@ g, ${groupRoles.readOnly.objectId}, role:readonly
|
|
|
114
114
|
'config-maps.argocd-cm.data.url': pulumi.interpolate `https://${argoCdDomain}/`,
|
|
115
115
|
'config-maps.argocd-rbac-cm.data.policy\\.default': defaultPolicy,
|
|
116
116
|
'config-maps.argocd-rbac-cm.data.policy\\.csv': policy,
|
|
117
|
-
'config-maps.argocd-cmd-params-cm.data.application\\.namespaces':
|
|
117
|
+
'config-maps.argocd-cmd-params-cm.data.application\\.namespaces': allowedNameSpaces
|
|
118
|
+
? pulumi.output(allowedNameSpaces).apply((ns) => ns.join(','))
|
|
119
|
+
: 'argocd',
|
|
118
120
|
},
|
|
119
121
|
}, { ...opts, dependsOn: [aks, identity] });
|
|
120
122
|
};
|
|
121
123
|
exports.createArgoCDExtension = createArgoCDExtension;
|
|
122
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
124
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVycy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9ha3MvaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSw0REFBOEM7QUFDOUMsd0NBQXNDO0FBQ3RDLHVEQUF5QztBQUs1QixRQUFBLHdCQUF3QixHQUFHLENBQUMsTUFBTSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxLQUFLLENBQUMsQ0FBQztBQUU1RSxNQUFNLFlBQVksR0FBRyxLQUFLLEVBQUUsRUFDakMsWUFBWSxFQUNaLGlCQUFpQixFQUNqQixvQkFBb0IsR0FLckIsRUFBbUIsRUFBRTtJQUNwQixNQUFNLEdBQUcsR0FBRyxvQkFBb0I7UUFDOUIsQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLGdCQUFnQixDQUFDLGlDQUFpQyxDQUFDO1lBQzdELFlBQVk7WUFDWixpQkFBaUI7U0FDbEIsQ0FBQztRQUNKLENBQUMsQ0FBQyxNQUFNLEtBQUssQ0FBQyxnQkFBZ0IsQ0FBQyxrQ0FBa0MsQ0FBQztZQUM5RCxZQUFZO1lBQ1osaUJBQWlCO1NBQ2xCLENBQUMsQ0FBQztJQUVQLE9BQU8sTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxRQUFRLENBQUMsQ0FBQyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDMUUsQ0FBQyxDQUFDO0FBcEJXLFFBQUEsWUFBWSxnQkFvQnZCO0FBRUssTUFBTSxtQkFBbUIsR0FBRyxDQUFDLEVBQ2xDLFlBQVksRUFDWixpQkFBaUIsR0FJbEIsRUFBZ0MsRUFBRTtJQUNqQyxNQUFNLEdBQUcsR0FBRyxNQUFNLENBQUMsV0FBVyxDQUFBLDhDQUE4QyxrQkFBUSxDQUFDLGNBQWMsbUJBQW1CLGlCQUFpQix5REFBeUQsWUFBWSx5QkFBeUIsQ0FBQztJQUN0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
|