Check for OIDC prov before creation in EKS sol

aws-observability · Jun 27, 2024 · 7a58d3a · 7a58d3a
1 parent 75d3435
commit 7a58d3a
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/...tions/oss/eks-infra/v2.0.0/iac/lib/existing-eks-opensource-observability-pattern/index.ts b/...tions/oss/eks-infra/v2.0.0/iac/lib/existing-eks-opensource-observability-pattern/index.ts
@@ -19,13 +19,14 @@ export default class ExistingEksOpenSourceobservabilityPattern {
         const region = process.env.COA_AWS_REGION! || process.env.CDK_DEFAULT_REGION!;
 
         const amgEndpointUrl = process.env.AMG_ENDPOINT || "";
-        const sdkCluster = await blueprints.describeCluster(clusterName, region); // get cluster information using EKS APIs
-        const vpcId = sdkCluster.resourcesVpcConfig?.vpcId;
 
         const ampWorkspaceArn = process.env.AMP_WS_ARN || "";
 
         validateInput(account, region, clusterName, amgEndpointUrl, ampWorkspaceArn)
 
+        const sdkCluster = await blueprints.describeCluster(clusterName, region); // get cluster information using EKS APIs
+        const vpcId = sdkCluster.resourcesVpcConfig?.vpcId;
+
         const ampEndpoint = getAmpWorkspaceEndpointFromArn(ampWorkspaceArn);
 
         const clusterRoleName = "EKS_Obs_" + clusterName;
@@ -88,10 +89,12 @@ export default class ExistingEksOpenSourceobservabilityPattern {
 
         const stack = obs.getClusterInfo().cluster.stack;
 
-        new iam.OpenIdConnectProvider(stack, 'OIDCProvider', {
-            url: sdkCluster.identity!.oidc!.issuer!,
-            clientIds: ['sts.amazonaws.com'],
-        });
+        if (!sdkCluster.identity?.oidc) {
+            new iam.OpenIdConnectProvider(stack, 'OIDCProvider', {
+                url: sdkCluster.identity!.oidc!.issuer!,
+                clientIds: ['sts.amazonaws.com'],
+            });
+        }
 
         const clusterRole = new iam.Role(stack, 'ClusterAdminRole', {
             assumedBy: new iam.CompositePrincipal(