refactor / cleanup

.github/workflows/linting.yaml

@@ -2,13 +2,13 @@ name: Linting
 on:  # yamllint disable-line rule:truthy
   push:
     branches:
-      - "*"
+      - "main"
     paths-ignore:
       - README.md
       - docs/*.md
   pull_request:
     branches:
-      - "*"
+      - "main"
     paths-ignore:
       - README.md
       - docs/*.md

.github/workflows/spellcheck.yaml

@@ -2,10 +2,10 @@ name: Check Spelling
 on:  # yamllint disable-line rule:truthy
   push:
     branches:
-      - "*"
+      - "main"
   pull_request:
     branches:
-      - "*"
+      - "main"
 
 jobs:
   lint-spelling:

.gitignore

@@ -2,7 +2,7 @@
 data/
 scratch/
 files.txt
-bootstrap/base/sealed-secrets-secret.yaml
+bootstrap/sealed-secrets-secret.yaml
 
 dictionary.dic
 

README.md

@@ -3,34 +3,35 @@
 [![Spelling](https://github.com/codekow/demo-ai-gitops-catalog/actions/workflows/spellcheck.yaml/badge.svg)](https://github.com/codekow/demo-ai-gitops-catalog/actions/workflows/spellcheck.yaml)
 [![Linting](https://github.com/codekow/demo-ai-gitops-catalog/actions/workflows/linting.yaml/badge.svg)](https://github.com/codekow/demo-ai-gitops-catalog/actions/workflows/linting.yaml)
 
-This project is a catalog of configurations used to provision infrastructure, on 
+This project is a catalog of configurations used to provision infrastructure, on
 OpenShift, that supports machine learning (ML) and artificial intelligence (AI) workloads.
 
-NOTICE: This repo is subject to frequent breaking changes
+**This repo is subject to frequent, breaking changes!**
 
 ## Prerequisites
 
 - OpenShift 4.8+
 
 Red Hat Demo Platform Options
 
-  - `MLOps Demo: Data Science & Edge Practice`
-  - `Red Hat OpenShift Container Platform 4 Demo`
+- `MLOps Demo: Data Science & Edge Practice`
+- `Red Hat OpenShift Container Platform 4 Demo`
 
 ### Tools
 
 The following cli tools are required:
 
+- `bash`
 - `oc` - Download [mac](https://formulae.brew.sh/formula/openshift-cli), [linux](https://mirror.openshift.com/pub/openshift-v4/clients)
-  - `kubectl` (optional) - Included in above bundle
+- `kubectl` (optional) - Included in `oc` bundle
 - `kustomize` (optional) - Download [mac](https://formulae.brew.sh/formula/kustomize), [linux](https://github.com/kubernetes-sigs/kustomize/releases)
 
 ## Bootstrapping a Cluster
 
 1. Verify you are logged into your cluster using `oc`.
 1. Clone this repository to your local environment.
 
-```
+```sh
 oc whoami
 git clone <repo>
 ```
@@ -45,17 +46,17 @@ Execute the following script:
 
 The `bootstrap.sh` script will:
 
-- Install the OpenShift GitOps Operator
-- Create an ArgoCD instance in the `openshift-gitops` namespace
-- Bootstrap a set of ArgoCD applications to configure the cluster
+- Install the [OpenShift GitOps Operator](components/operators/openshift-gitops-operator)
+- Create an [ArgoCD instance](components/operators/openshift-gitops-operator/instance/base/openshift-gitops-cr.yaml) in the `openshift-gitops` namespace
+<!-- - Bootstrap a set of ArgoCD applications to configure the cluster -->
 
 You can run individual [functions](scripts/functions.sh) in a `bash` shell:
 
 ```sh
 source scripts/functions.sh
 ```
 
-### Sealed Secrets Bootstrap
+<!-- ### Sealed Secrets Bootstrap
 
 `bootstrap.sh` will attempt to deploy sealed-secrets and requires a sealed secret master key to manage existing deployments.  
 
@@ -64,10 +65,10 @@ If managing an already bootstrapped cluster, the sealed-secrets key must be obta
 The sealed secret(s) for bootstrap should be located at:
 
 ```sh
-bootstrap/base/sealed-secrets-secret.yaml
+bootstrap/sealed-secrets-secret.yaml
 ```
 
-If this is the first time bootstrapping a cluster, `bootstrap.sh` will deploy a new sealed-secrets controller and obtain a new secret if it does not exist.
+If this is the first time bootstrapping a cluster, `bootstrap.sh` will deploy a new sealed-secrets controller and obtain a new secret if it does not exist. -->
 
 ## Additional Configurations
 
@@ -79,7 +80,7 @@ The `sandbox` [namespace](components/configs/namespaces/instance/sandbox/namespa
 
 Please run the following before submitting a PR / commit
 
-```
+```sh
 scripts/lint.sh
 ```
 

components/demos/instance/iris-id/kustomization.yaml → bootstrap/default/kustomization.yaml

@@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - namespace.yaml
-  - namespace-rb.yaml
+  - ../../clusters/default

clusters/README.md

@@ -0,0 +1,4 @@
+## Examples
+
+- Demos
+- Workshops

clusters/base/kustomization.yaml → clusters/argo-managed/base/kustomization.yaml

@@ -2,6 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-  - ../../components/argocd/projects/overlays/default
+  - ../../../components/argocd/projects/overlays/default
   - argocd-repo-https.yaml
   # - argocd-repo-ssh-ss.yaml

clusters/argo-managed/overlays/default/kustomization.yaml

@@ -0,0 +1,41 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+  - ../../../../components/argocd/apps/overlays/default
+
+patches:
+  - target:
+      group: argoproj.io
+      kind: ApplicationSet
+    patch: |-
+      - op: replace
+        path: /spec/template/spec/source/repoURL
+        value: 'https://github.com/codekow/demo-ai-gitops-catalog.git'
+      - op: replace
+        path: /spec/template/spec/source/targetRevision
+        value: cleanup
+  - target:
+      group: argoproj.io
+      kind: Application
+    patch: |-
+      - op: replace
+        path: /spec/source/repoURL
+        value: 'https://github.com/codekow/demo-ai-gitops-catalog.git'
+      - op: replace
+        path: /spec/source/targetRevision
+        value: cleanup
+  # Uncomment patches to disable automatic sync
+  # - target:
+  #     group: argoproj.io
+  #     kind: Application
+  #   patch: |-
+  #     - op: remove
+  #       path: /spec/syncPolicy
+  # - target:
+  #     group: argoproj.io
+  #     kind: ApplicationSet
+  #   patch: |-
+  #     - op: remove
+  #       path: /spec/template/spec/syncPolicy

clusters/default/kustomization.yaml

@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+- ../../components/configs/cluster/namespaces/overlays/default
+- ../../components/configs/cluster/console/overlays/default
+- ../../components/configs/cluster/rbac/overlays/default
+- ../../components/operators/web-terminal/operator/overlays/fast
+- ../../components/configs/cluster/web-terminal/overlays/default

components/.gitignore

@@ -1 +1 @@
-!instance
+!instance/