Moved some definitions from tst to base directory

base/README.md

+Base ArgoCD Configuration
+=========================
+
+Deployment of ArgoCD, common to all clusters:
+
+ - Upstream ArgoCD definitions
+ - set pull policy to IfNotPresent
+ - namespace
+ - basic ArgoCD projects
+

tst/infrastructure-project.yml → base/argocd-projects.yml

@@ -9,6 +9,26 @@ spec:
   sourceRepos:
   - '*'
 
+  destinations:
+  - namespace: '*'
+    server: '*'
+
+  clusterResourceWhitelist: []
+  namespaceResourceBlacklist:
+  - group: "rbac.authorization.k8s.io/v1"
+    kind: 'Role*'
+---
+apiVersion: argoproj.io/v1alpha1
+kind: AppProject
+metadata:
+  name: apps
+  namespace: argocd
+spec:
+  description: Apps project with restrictions
+
+  sourceRepos:
+  - '*'
+
   destinations:
   - namespace: '*'
     server: '*'

base/argocd-server-service.yml

-- op: add
-  path: /spec/ports/1/nodePort
-  value: 30000
-
-- op: replace
-  path: /spec/type
-  value: NodePort
-

base/kustomization.yml

-bases:
-  - github.com/argoproj/argo-cd/manifests/cluster-install?ref=v1.7.7
-
 resources:
+  # Base configuration from upstream
+  - github.com/argoproj/argo-cd/manifests/cluster-install?ref=v1.7.8
   - argocd-ns.yml
+  # Create projects in ArgoCD
+  - argocd-projects.yml
 
 patchesJson6902:
   - target:

tst/README.md

+Configuration of Test Cluster Instance
+======================================
+
+Test cluster specific configuration for
+
+ - role based access
+ - ArgoCD service node ports
+ - ingress
+
+and ArgoCD apps which read ArgoCD definitions in git repositories for
+
+ - system components
+ - training apps
+ - Jupyter Hub

tst/apps-project.yml

-apiVersion: argoproj.io/v1alpha1
-kind: AppProject
-metadata:
-  name: apps
-  namespace: argocd
-spec:
-  description: Apps project with restrictions
-
-  sourceRepos:
-  - '*'
-
-  destinations:
-  - namespace: '*'
-    server: '*'
-
-  clusterResourceWhitelist: []
-  namespaceResourceBlacklist:
-  - group: "rbac.authorization.k8s.io/v1"
-    kind: 'Role*'

tst/argocd-containers-generic.yml

-- op: add
-  path: /spec/template/spec/containers/0/imagePullPolicy
-  value: IfNotPresent

tst/argocd-containers-init.yml

-- op: add
-  path: /spec/template/spec/initContainers/0/imagePullPolicy
-  value: IfNotPresent

tst/kustomization.yml

 namespace: argocd
 
 resources:
-  # Base configuration from upstream
-  - github.com/argoproj/argo-cd/manifests/cluster-install?ref=v1.7.8
+  # Base configuration
+  - ../base
   # Configure ArgoCD itself
   - ./self.yml
-  # Create projects in ArgoCD
-  - ./infrastructure-project.yml
-  - ./apps-project.yml
   # Include app specific repos as "apps of apps"
   - ./cluster-tst-system.yml
   - ./cluster-tst-training.yml
@@ -15,48 +12,6 @@ resources:
   # Will work only after system setup has been completed and metallb running
   - ./argocd-ingress.yml
 
-patchesJson6902:
-  - target:
-      version: v1
-      kind: Service
-      name: argocd-server
-    path: argocd-server-service.yml
-  - target:
-      group: apps
-      version: v1
-      kind: Deployment
-      name: argocd-application-controller
-    path: argocd-containers-generic.yml
-  - target:
-      group: apps
-      version: v1
-      kind: Deployment
-      name: argocd-dex-server
-    path: argocd-containers-generic.yml
-  - target:
-      group: apps
-      version: v1
-      kind: Deployment
-      name: argocd-dex-server
-    path: argocd-containers-init.yml
-  - target:
-      group: apps
-      version: v1
-      kind: Deployment
-      name: argocd-redis
-    path: argocd-containers-generic.yml
-  - target:
-      group: apps
-      version: v1
-      kind: Deployment
-      name: argocd-repo-server
-    path: argocd-containers-generic.yml
-  - target:
-      group: apps
-      version: v1
-      kind: Deployment
-      name: argocd-server
-    path: argocd-containers-generic.yml
 
 patchesStrategicMerge:
   - ./argocd-rbac-cm.yml
@@ -64,7 +19,3 @@ patchesStrategicMerge:
   # Causes issues with argocd commandline tool
 #  - ./argocd-redirect-patch.yml
    
-  
-
-  
-