refactor: update docs on split of cdk vs cdk8s

config/README.md

@@ -1,10 +1,12 @@
-# Kubernetes configuration with CDK8s
+# Kubernetes configuration with CDK8s and AWS-CDK
 
-Collection of Kubernetes resources.
+Collection of AWS & Kubernetes resources.
 
 ## Components
 
-Main entry point: [app](./app.ts)
+Main entry point: [cdk8s](./cdk8s.ts) and [cdk](./cdk.ts) 
+
+Generally all Kubernetes resources are defined with cdk8s and anything that needs AWS interactions such as service accounts are defined with CDK.
 
 - argo - Argo workflows for use with [linz/topo-workflows](https://github.com/linz/topo-workflows)
 

config/eks/cluster.ts

@@ -81,6 +81,7 @@ export class LinzEksCluster extends Stack {
   configureEks(): void {
     // Use fluent bit to ship logs from eks into aws
     const fluentBitNs = this.cluster.addManifest('FluentBitNamespace', {
+      apiVersion: 'v1',
       kind: 'Namespace',
       metadata: { name: 'fluent-bit' },
     });
@@ -90,12 +91,16 @@ export class LinzEksCluster extends Stack {
     });
     fluentBitSa.node.addDependency(fluentBitNs); // Ensure the namespace created first
 
-    // basic  constructs for
-    const argoNs = this.cluster.addManifest('ArgoNameSpace', { kind: 'Namespace', metadata: { name: 'argo' } });
+    // Basic constructs for argo to be deployed into
+    const argoNs = this.cluster.addManifest('ArgoNameSpace', {
+      apiVersion: 'v1',
+      kind: 'Namespace',
+      metadata: { name: 'argo' },
+    });
     const argoRunnerSa = this.cluster.addServiceAccount('ArgoRunnerServiceAccount', {
       name: 'argo-runner-sa',
       namespace: 'argo',
     });
-    argoNs.node.addDependency(argoRunnerSa);
+    argoRunnerSa.node.addDependency(argoNs);
   }
 }