fixing IRSA issues

aws-samples · Sep 11, 2024 · b18f5e7 · b18f5e7
1 parent d0d6615
commit b18f5e7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/lib/crossplane-argocd-gitops/custom-addons/crossplane-helm-provider-addon.ts b/lib/crossplane-argocd-gitops/custom-addons/crossplane-helm-provider-addon.ts
@@ -62,7 +62,6 @@ export class CrossplaneHelmProviderAddon implements blueprints.ClusterAddOn {
             metadata: { name: "helm-provider" },
             spec: {
                 package: 'xpkg.upbound.io/crossplane-contrib/provider-helm:'+this.helmProviderVersion,
-
                 runtimeConfigRef: {
                     name: "helm-runtime-config"
                 }
@@ -80,6 +79,6 @@ export class CrossplaneHelmProviderAddon implements blueprints.ClusterAddOn {
         });
 
         awsHelmProvider.node.addDependency(runtimeHelmConfig);
-        return Promise.resolve(runtimeHelmConfig);
+        return Promise.resolve(awsHelmProvider);
     }
 }
diff --git a/lib/crossplane-argocd-gitops/custom-addons/crossplane-k8s-provider-addon.ts b/lib/crossplane-argocd-gitops/custom-addons/crossplane-k8s-provider-addon.ts
@@ -71,13 +71,13 @@ export class CrossplaneK8sProviderAddon implements blueprints.ClusterAddOn {
             manifest: [roleBinding, runtimeConfig]
         });
 
-        const awsK8sProvider1 = new eks.KubernetesManifest(clusterInfo.cluster.stack, "awsK8sProvider1", {
+        const awsK8sProvider = new eks.KubernetesManifest(clusterInfo.cluster.stack, "awsK8sProvider", {
             cluster: cluster,
             manifest: [providerK8sResource]
         });
 
-        awsK8sProvider1.node.addDependency(runtimeK8sConfig);
+        awsK8sProvider.node.addDependency(runtimeK8sConfig);
 
-        return Promise.resolve(runtimeK8sConfig);
+        return Promise.resolve(awsK8sProvider);
     }
 }
diff --git a/lib/crossplane-argocd-gitops/custom-addons/upbound-crossplane-addon.ts b/lib/crossplane-argocd-gitops/custom-addons/upbound-crossplane-addon.ts
@@ -48,7 +48,6 @@ export class UpboundCrossplaneAddOn extends blueprints.HelmAddOn {
         const sa = cluster.addServiceAccount(serviceAccountName, {
             name: serviceAccountName,
             namespace: this.options.namespace!,
-
         });
         sa.node.addDependency(ns);
         sa.role.attachInlinePolicy(new Policy(cluster.stack, 'eks-connect-policy',  {

diff --git a/lib/crossplane-argocd-gitops/custom-addons/upbound-crossplane-eks-provider-addon.ts b/lib/crossplane-argocd-gitops/custom-addons/upbound-crossplane-eks-provider-addon.ts
@@ -16,7 +16,7 @@ export class UpboundCrossplaneEKSProviderAddOn implements blueprints.ClusterAddO
     deploy(clusterInfo: blueprints.ClusterInfo): void | Promise<Construct> {
         const cluster = clusterInfo.cluster;
 
-        // Create the CrossPlane AWS Provider IRSA.
+        // Create the CrossPlane EKS Provider IRSA.
         const serviceAccountName = "provider-aws-eks";
         const upboundNamespace = "upbound-system";
         const sa = cluster.addServiceAccount(serviceAccountName, {
@@ -39,7 +39,11 @@ export class UpboundCrossplaneEKSProviderAddOn implements blueprints.ClusterAddO
                     }                
                 ]
             })}));
-
+
+        clusterInfo.addAddOnContext(UpboundCrossplaneEKSProviderAddOn.name, {
+            arn: sa.role.roleArn
+        });
+
         const runtimeConfig = new eks.KubernetesManifest(clusterInfo.cluster.stack, "runtimeConfig", {
             cluster: cluster,
             manifest: [
@@ -84,7 +88,8 @@ export class UpboundCrossplaneEKSProviderAddOn implements blueprints.ClusterAddO
             ],
         });
 
+        runtimeConfig.node.addDependency(sa);
         awsEksProvider.node.addDependency(runtimeConfig);
-        return Promise.resolve(runtimeConfig);
+        return Promise.resolve(awsEksProvider);
     }
 }