change order and split projects (#173)

Author: guimou

bootstrap/applicationset/applicationset-bootstrap.yaml

@@ -100,17 +100,17 @@ spec:
               - key: purpose
                 operator: In
                 values:
-                  - ic-user-projects
+                  - ic-shared-llm-app
         - matchExpressions:
               - key: purpose
                 operator: In
                 values:
-                  - ic-shared-llm-app
+                  - ic-shared-app
         - matchExpressions:
               - key: purpose
                 operator: In
                 values:
-                  - ic-shared-app
+                  - ic-user-projects
   template:
     metadata:
       name: "{{name}}"

bootstrap/ic-user-projects/create-projects-and-resources-job.yaml

@@ -4,7 +4,7 @@ metadata:
   name: create-and-apply-resources
   namespace: ic-user-projects
   annotations:
-    argocd.argoproj.io/sync-wave: "1"
+    argocd.argoproj.io/sync-wave: "2"
     argocd.argoproj.io/hook: Sync
     argocd.argoproj.io/hook-delete-policy: BeforeHookCreation
     argocd.argoproj.io/compare-options: IgnoreExtraneous

bootstrap/ic-user-projects/kustomization.yaml

@@ -9,6 +9,8 @@ commonLabels:
 
 resources:
 # wave 0
-- project-manager.yaml
+- namespace.yaml
 # wave 1
+- project-manager.yaml
+# wave 2
 - create-projects-and-resources-job.yaml

bootstrap/ic-user-projects/namespace.yaml

@@ -0,0 +1,11 @@
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: ic-user-projects
+  labels:
+    app: ic-user-projects
+    argocd.argoproj.io/managed-by: openshift-gitops
+  annotations:
+    openshift.io/display-name: "Project Manager"
+    argocd.argoproj.io/sync-wave: "0"

bootstrap/ic-user-projects/project-manager.yaml

@@ -1,28 +1,18 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: ic-user-projects
-  labels:
-    app: ic-user-projects
-    argocd.argoproj.io/managed-by: openshift-gitops
-  annotations:
-    openshift.io/display-name: "Project Manager"
-    argocd.argoproj.io/sync-wave: "0"
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: project-creator
   namespace: ic-user-projects
   annotations:
-    argocd.argoproj.io/sync-wave: "0"
+    argocd.argoproj.io/sync-wave: "1"
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
   name: project-creator-binding
   annotations:
-    argocd.argoproj.io/sync-wave: "0"
+    argocd.argoproj.io/sync-wave: "1"
 subjects:
 - kind: ServiceAccount
   name: project-creator
@@ -37,7 +27,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 metadata:
   name: route-reader
   annotations:
-    argocd.argoproj.io/sync-wave: "0"
+    argocd.argoproj.io/sync-wave: "1"
 rules:
 - apiGroups: ["route.openshift.io"]
   resources: ["routes"]