diff --git a/.github/workflows/linting.yaml b/.github/workflows/linting.yaml index 4d04fd02..45f1a0af 100644 --- a/.github/workflows/linting.yaml +++ b/.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 diff --git a/.github/workflows/spellcheck.yaml b/.github/workflows/spellcheck.yaml index fac8513f..7fb17b77 100644 --- a/.github/workflows/spellcheck.yaml +++ b/.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: diff --git a/.gitignore b/.gitignore index e0ee9a9e..09c43ffc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,7 @@ data/ scratch/ files.txt -bootstrap/base/sealed-secrets-secret.yaml +bootstrap/sealed-secrets-secret.yaml dictionary.dic diff --git a/README.md b/README.md index 9fe129aa..f4823070 100644 --- a/README.md +++ b/README.md @@ -3,10 +3,10 @@ [![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 @@ -14,15 +14,16 @@ NOTICE: This repo is subject to frequent breaking changes 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 @@ -30,7 +31,7 @@ The following cli tools are required: 1. Verify you are logged into your cluster using `oc`. 1. Clone this repository to your local environment. -``` +```sh oc whoami git clone ``` @@ -45,9 +46,9 @@ 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 + You can run individual [functions](scripts/functions.sh) in a `bash` shell: @@ -55,7 +56,7 @@ You can run individual [functions](scripts/functions.sh) in a `bash` shell: source scripts/functions.sh ``` -### Sealed Secrets Bootstrap + ## 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 ``` diff --git a/components/configs/dev-catalog/builder-image.yaml b/bootstrap/README.md similarity index 100% rename from components/configs/dev-catalog/builder-image.yaml rename to bootstrap/README.md diff --git a/bootstrap/base/kustomization.yaml b/bootstrap/base/kustomization.yaml deleted file mode 100644 index 9cd8c9ae..00000000 --- a/bootstrap/base/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - # - ../../components/operators/openshift-gitops-operator/instance/overlays/default - # - ../../components/operators/sealed-secrets/operator/overlays/default - # - ../../components/configs/namespaces/base - # - argocd-ssh-known-hosts-cm.yaml - # - sealed-secrets-secret.yaml diff --git a/components/demos/instance/iris-id/kustomization.yaml b/bootstrap/default/kustomization.yaml similarity index 64% rename from components/demos/instance/iris-id/kustomization.yaml rename to bootstrap/default/kustomization.yaml index 99a3ea29..626f64d4 100644 --- a/components/demos/instance/iris-id/kustomization.yaml +++ b/bootstrap/default/kustomization.yaml @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - namespace.yaml - - namespace-rb.yaml + - ../../clusters/default diff --git a/bootstrap/overlays/baremetal/kustomization.yaml b/bootstrap/overlays/baremetal/kustomization.yaml deleted file mode 100644 index ea0aa6f7..00000000 --- a/bootstrap/overlays/baremetal/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - - ../../../clusters/overlays/baremetal diff --git a/bootstrap/overlays/default/kustomization.yaml b/bootstrap/overlays/default/kustomization.yaml deleted file mode 100644 index b6def049..00000000 --- a/bootstrap/overlays/default/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - - ../../../clusters/overlays/default diff --git a/bootstrap/overlays/rhdp-rhods/kustomization.yaml b/bootstrap/overlays/rhdp-rhods/kustomization.yaml deleted file mode 100644 index f620809b..00000000 --- a/bootstrap/overlays/rhdp-rhods/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - - ../../../clusters/overlays/rhdp-rhods diff --git a/bootstrap/overlays/rhdp/kustomization.yaml b/bootstrap/overlays/rhdp/kustomization.yaml deleted file mode 100644 index 784762aa..00000000 --- a/bootstrap/overlays/rhdp/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - - ../../../clusters/overlays/rhdp diff --git a/bootstrap/overlays/testing/kustomization.yaml b/bootstrap/overlays/testing/kustomization.yaml deleted file mode 100644 index 090b9425..00000000 --- a/bootstrap/overlays/testing/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - - ../../../clusters/overlays/testing diff --git a/clusters/README.md b/clusters/README.md new file mode 100644 index 00000000..d49576fa --- /dev/null +++ b/clusters/README.md @@ -0,0 +1,4 @@ +## Examples + +- Demos +- Workshops diff --git a/clusters/base/argocd-repo-https.yaml b/clusters/argo-managed/base/argocd-repo-https.yaml similarity index 100% rename from clusters/base/argocd-repo-https.yaml rename to clusters/argo-managed/base/argocd-repo-https.yaml diff --git a/clusters/base/argocd-repo-ssh-ss.yaml b/clusters/argo-managed/base/argocd-repo-ssh-ss.yaml similarity index 100% rename from clusters/base/argocd-repo-ssh-ss.yaml rename to clusters/argo-managed/base/argocd-repo-ssh-ss.yaml diff --git a/clusters/base/kustomization.yaml b/clusters/argo-managed/base/kustomization.yaml similarity index 70% rename from clusters/base/kustomization.yaml rename to clusters/argo-managed/base/kustomization.yaml index 5850f34b..4e6c6c44 100644 --- a/clusters/base/kustomization.yaml +++ b/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 diff --git a/clusters/argo-managed/overlays/default/kustomization.yaml b/clusters/argo-managed/overlays/default/kustomization.yaml new file mode 100644 index 00000000..1c9dad55 --- /dev/null +++ b/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 diff --git a/clusters/default/kustomization.yaml b/clusters/default/kustomization.yaml new file mode 100644 index 00000000..5354b137 --- /dev/null +++ b/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 diff --git a/clusters/overlays/default/kustomization.yaml b/clusters/overlays/default/kustomization.yaml deleted file mode 100644 index 1abcf596..00000000 --- a/clusters/overlays/default/kustomization.yaml +++ /dev/null @@ -1,29 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - - ../../../components/argocd/apps/overlays/default - -patches: - - path: patch-applicationset-repo-revision.yaml - target: - group: argoproj.io - version: v1alpha1 - kind: ApplicationSet - - path: patch-application-repo-revision.yaml - target: - group: argoproj.io - version: v1alpha1 - kind: Application - # Uncomment patches to disable automatic sync - # - path: patch-applicationset-manual-sync.yaml - # target: - # group: argoproj.io - # version: v1alpha1 - # kind: ApplicationSet - # - path: patch-application-manual-sync.yaml - # target: - # group: argoproj.io - # version: v1alpha1 - # kind: Application diff --git a/clusters/overlays/default/patch-application-manual-sync.yaml b/clusters/overlays/default/patch-application-manual-sync.yaml deleted file mode 100644 index d289dd4a..00000000 --- a/clusters/overlays/default/patch-application-manual-sync.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- op: remove - path: /spec/syncPolicy diff --git a/clusters/overlays/default/patch-application-repo-revision.yaml b/clusters/overlays/default/patch-application-repo-revision.yaml deleted file mode 100644 index b5c5b032..00000000 --- a/clusters/overlays/default/patch-application-repo-revision.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- op: replace - path: /spec/source/repoURL - value: 'https://github.com/codekow/demo-ai-gitops-catalog.git' -- op: replace - path: /spec/source/targetRevision - value: main diff --git a/clusters/overlays/default/patch-applicationset-manual-sync.yaml b/clusters/overlays/default/patch-applicationset-manual-sync.yaml deleted file mode 100644 index a60ffc01..00000000 --- a/clusters/overlays/default/patch-applicationset-manual-sync.yaml +++ /dev/null @@ -1,2 +0,0 @@ -- op: remove - path: /spec/template/spec/syncPolicy diff --git a/clusters/overlays/default/patch-applicationset-repo-revision.yaml b/clusters/overlays/default/patch-applicationset-repo-revision.yaml deleted file mode 100644 index 1a4c621d..00000000 --- a/clusters/overlays/default/patch-applicationset-repo-revision.yaml +++ /dev/null @@ -1,6 +0,0 @@ -- 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: main diff --git a/components/.gitignore b/components/.gitignore index d6c9c1c7..c001bd3b 100644 --- a/components/.gitignore +++ b/components/.gitignore @@ -1 +1 @@ -!instance \ No newline at end of file +!instance/ \ No newline at end of file diff --git a/components/argocd/apps/overlays/baremetal/kustomization.yaml b/components/argocd/apps/overlays/baremetal/kustomization.yaml deleted file mode 100644 index 7241ae0d..00000000 --- a/components/argocd/apps/overlays/baremetal/kustomization.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../base - -patches: - - target: - group: argoproj.io - version: v1alpha1 - kind: Application - name: cluster-config-app-of-apps - path: patch-cluster-config-app-of-apps.yaml - - target: - group: argoproj.io - version: v1alpha1 - kind: ApplicationSet - name: cluster-configs-applicationset - path: patch-configs-applicationset.yaml - - target: - group: argoproj.io - version: v1alpha1 - kind: ApplicationSet - name: cluster-operators-applicationset - path: patch-operators-applicationset.yaml diff --git a/components/argocd/apps/overlays/baremetal/patch-cluster-config-app-of-apps.yaml b/components/argocd/apps/overlays/baremetal/patch-cluster-config-app-of-apps.yaml deleted file mode 100644 index 18cdd36d..00000000 --- a/components/argocd/apps/overlays/baremetal/patch-cluster-config-app-of-apps.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/source/path - value: clusters/overlays/rhdp \ No newline at end of file diff --git a/components/argocd/apps/overlays/baremetal/patch-configs-applicationset.yaml b/components/argocd/apps/overlays/baremetal/patch-configs-applicationset.yaml deleted file mode 100644 index 622aeabb..00000000 --- a/components/argocd/apps/overlays/baremetal/patch-configs-applicationset.yaml +++ /dev/null @@ -1,33 +0,0 @@ -- op: add - path: /spec/generators/0/list/elements - value: - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-cluster-rbac - namespace: openshift-gitops - path: components/configs/rbac/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-console - namespace: openshift-gitops - path: components/configs/console/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-base-namespaces - namespace: openshift-gitops - path: components/configs/namespaces/overlays/default-limited - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-idm-login - namespace: openshift-gitops - path: components/configs/login/overlays/rhdp - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-sandbox-cleanup - namespace: openshift-gitops - path: components/configs/simple/sandbox-cleanup diff --git a/components/argocd/apps/overlays/baremetal/patch-operators-applicationset.yaml b/components/argocd/apps/overlays/baremetal/patch-operators-applicationset.yaml deleted file mode 100644 index 1ef37dba..00000000 --- a/components/argocd/apps/overlays/baremetal/patch-operators-applicationset.yaml +++ /dev/null @@ -1,28 +0,0 @@ -- op: add - path: /spec/generators/0/list/elements - value: - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-nvidia-gpu-operator - path: components/operators/gpu-operator-certified/aggregate/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-openshift-nfd - path: components/operators/nfd/aggregate/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-rhods - path: components/operators/rhods-operator/operator/overlays/stable - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-sealed-secrets - path: components/operators/sealed-secrets/operator/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-web-terminal - path: components/operators/web-terminal/operator/overlays/fast diff --git a/components/argocd/apps/overlays/default/kustomization.yaml b/components/argocd/apps/overlays/default/kustomization.yaml index 7241ae0d..10d36d10 100644 --- a/components/argocd/apps/overlays/default/kustomization.yaml +++ b/components/argocd/apps/overlays/default/kustomization.yaml @@ -7,19 +7,16 @@ resources: patches: - target: group: argoproj.io - version: v1alpha1 kind: Application name: cluster-config-app-of-apps path: patch-cluster-config-app-of-apps.yaml - target: group: argoproj.io - version: v1alpha1 kind: ApplicationSet name: cluster-configs-applicationset path: patch-configs-applicationset.yaml - target: group: argoproj.io - version: v1alpha1 kind: ApplicationSet name: cluster-operators-applicationset path: patch-operators-applicationset.yaml diff --git a/components/argocd/apps/overlays/default/patch-cluster-config-app-of-apps.yaml b/components/argocd/apps/overlays/default/patch-cluster-config-app-of-apps.yaml index 7f252e6c..d46ec4e4 100644 --- a/components/argocd/apps/overlays/default/patch-cluster-config-app-of-apps.yaml +++ b/components/argocd/apps/overlays/default/patch-cluster-config-app-of-apps.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/source/path - value: clusters/overlays/default \ No newline at end of file + value: clusters/argo-managed/overlays/default \ No newline at end of file diff --git a/components/argocd/apps/overlays/default/patch-configs-applicationset.yaml b/components/argocd/apps/overlays/default/patch-configs-applicationset.yaml index df934441..921c13de 100644 --- a/components/argocd/apps/overlays/default/patch-configs-applicationset.yaml +++ b/components/argocd/apps/overlays/default/patch-configs-applicationset.yaml @@ -6,7 +6,7 @@ values: name: config-cluster-console namespace: openshift-gitops - path: components/configs/console/overlays/default + path: components/configs/cluster/console/overlays/default # - cluster: local # url: https://kubernetes.default.svc # values: @@ -18,16 +18,21 @@ values: name: config-cluster-namespaces namespace: openshift-gitops - path: components/configs/namespaces/overlays/default + path: components/configs/cluster/namespaces/overlays/default - cluster: local url: https://kubernetes.default.svc values: name: config-cluster-rbac namespace: openshift-gitops - path: components/configs/rbac/overlays/default + path: components/configs/cluster/rbac/overlays/default - cluster: local url: https://kubernetes.default.svc values: name: config-sandbox-cleanup namespace: openshift-gitops - path: components/configs/simple/sandbox-cleanup + path: components/configs/apply-only/sandbox-cleanup + # - cluster: local + # url: https://kubernetes.default.svc + # values: + # name: config-prometheus-user-workload-monitoring + # path: components/operators/prometheus-monitoring/instance/overlays/user-workload-monitoring diff --git a/components/argocd/apps/overlays/default/patch-operators-applicationset.yaml b/components/argocd/apps/overlays/default/patch-operators-applicationset.yaml index 2f98c7cd..acba3354 100644 --- a/components/argocd/apps/overlays/default/patch-operators-applicationset.yaml +++ b/components/argocd/apps/overlays/default/patch-operators-applicationset.yaml @@ -1,28 +1,28 @@ - op: add path: /spec/generators/0/list/elements value: + - cluster: local + url: https://kubernetes.default.svc + values: + name: operator-openshift-gitops + path: components/operators/openshift-gitops-operator/operator/overlays/stable # - cluster: local # url: https://kubernetes.default.svc # values: - # name: openshift-logging-operator + # name: operator-openshift-logging # path: components/operators/openshift-logging/aggregate/overlays/default # - cluster: local # url: https://kubernetes.default.svc # values: - # name: openshift-pipelines-operator + # name: operator-openshift-pipelines # path: components/operators/openshift-pipelines/operator/overlays/latest # - cluster: local # url: https://kubernetes.default.svc # values: - # name: prometheus-user-workload-monitoring - # path: components/operators/prometheus-monitoring/instance/overlays/user-workload-monitoring + # name: operator-sealed-secrets + # path: components/operators/sealed-secrets/operator/overlays/default - cluster: local url: https://kubernetes.default.svc values: - name: sealed-secrets-operator - path: components/operators/sealed-secrets/operator/overlays/default - # - cluster: local - # url: https://kubernetes.default.svc - # values: - # name: web-terminal-operator - # path: components/operators/web-terminal-operator/operator/overlays/fast \ No newline at end of file + name: operator-web-terminal + path: components/operators/web-terminal/operator/overlays/fast diff --git a/components/argocd/apps/overlays/rhdp-rhods/kustomization.yaml b/components/argocd/apps/overlays/rhdp-rhods/kustomization.yaml deleted file mode 100644 index 3a64f1fd..00000000 --- a/components/argocd/apps/overlays/rhdp-rhods/kustomization.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../default - -patches: - - target: - group: argoproj.io - version: v1alpha1 - kind: Application - name: cluster-config-app-of-apps - path: patch-cluster-config-app-of-apps.yaml - - target: - group: argoproj.io - version: v1alpha1 - kind: ApplicationSet - name: cluster-configs-applicationset - path: patch-configs-applicationset.yaml - - target: - group: argoproj.io - version: v1alpha1 - kind: ApplicationSet - name: cluster-operators-applicationset - path: patch-operators-applicationset.yaml diff --git a/components/argocd/apps/overlays/rhdp-rhods/patch-cluster-config-app-of-apps.yaml b/components/argocd/apps/overlays/rhdp-rhods/patch-cluster-config-app-of-apps.yaml deleted file mode 100644 index 87c949e9..00000000 --- a/components/argocd/apps/overlays/rhdp-rhods/patch-cluster-config-app-of-apps.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/source/path - value: clusters/overlays/rhdp-rhods \ No newline at end of file diff --git a/components/argocd/apps/overlays/rhdp-rhods/patch-configs-applicationset.yaml b/components/argocd/apps/overlays/rhdp-rhods/patch-configs-applicationset.yaml deleted file mode 100644 index ecffdd34..00000000 --- a/components/argocd/apps/overlays/rhdp-rhods/patch-configs-applicationset.yaml +++ /dev/null @@ -1,45 +0,0 @@ -- op: add - path: /spec/generators/0/list/elements - value: - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-cluster-console - namespace: openshift-gitops - path: components/configs/console/overlays/rhods - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-cluster-login - namespace: openshift-config - path: components/configs/login/overlays/rhdp - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-cluster-namespaces - namespace: openshift-gitops - path: components/configs/namespaces/overlays/default-limited - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-cluster-rbac - namespace: openshift-gitops - path: components/configs/rbac/overlays/rhdp - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-demo-rhods - namespace: openshift-gitops - path: components/demos/overlays/rhods - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-demo-console-samples - namespace: openshift-gitops - path: components/configs/console-samples - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-sandbox-cleanup - namespace: openshift-gitops - path: components/configs/simple/sandbox-cleanup diff --git a/components/argocd/apps/overlays/rhdp-rhods/patch-operators-applicationset.yaml b/components/argocd/apps/overlays/rhdp-rhods/patch-operators-applicationset.yaml deleted file mode 100644 index 5931ad43..00000000 --- a/components/argocd/apps/overlays/rhdp-rhods/patch-operators-applicationset.yaml +++ /dev/null @@ -1,33 +0,0 @@ -- op: add - path: /spec/generators/0/list/elements - value: - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-openshift-nfd - path: components/operators/nfd/aggregate/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-openshift-pipelines - path: components/operators/openshift-pipelines-operator-rh/operator/overlays/latest - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-nvidia-gpu-operator - path: components/operators/gpu-operator-certified/aggregate/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-rhods - path: components/operators/rhods-operator/operator/overlays/stable - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-sealed-secrets - path: components/operators/sealed-secrets/operator/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-web-terminal - path: components/operators/web-terminal/operator/overlays/fast diff --git a/components/argocd/apps/overlays/rhdp/kustomization.yaml b/components/argocd/apps/overlays/rhdp/kustomization.yaml deleted file mode 100644 index 3a64f1fd..00000000 --- a/components/argocd/apps/overlays/rhdp/kustomization.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../default - -patches: - - target: - group: argoproj.io - version: v1alpha1 - kind: Application - name: cluster-config-app-of-apps - path: patch-cluster-config-app-of-apps.yaml - - target: - group: argoproj.io - version: v1alpha1 - kind: ApplicationSet - name: cluster-configs-applicationset - path: patch-configs-applicationset.yaml - - target: - group: argoproj.io - version: v1alpha1 - kind: ApplicationSet - name: cluster-operators-applicationset - path: patch-operators-applicationset.yaml diff --git a/components/argocd/apps/overlays/rhdp/patch-cluster-config-app-of-apps.yaml b/components/argocd/apps/overlays/rhdp/patch-cluster-config-app-of-apps.yaml deleted file mode 100644 index 18cdd36d..00000000 --- a/components/argocd/apps/overlays/rhdp/patch-cluster-config-app-of-apps.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/source/path - value: clusters/overlays/rhdp \ No newline at end of file diff --git a/components/argocd/apps/overlays/rhdp/patch-configs-applicationset.yaml b/components/argocd/apps/overlays/rhdp/patch-configs-applicationset.yaml deleted file mode 100644 index f525afff..00000000 --- a/components/argocd/apps/overlays/rhdp/patch-configs-applicationset.yaml +++ /dev/null @@ -1,39 +0,0 @@ -- op: add - path: /spec/generators/0/list/elements - value: - # - cluster: local - # url: https://kubernetes.default.svc - # values: - # name: config-cluster-certs - # namespace: openshift-gitops - # path: components/configs/cluster-certs/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-cluster-console - namespace: openshift-gitops - path: components/configs/console/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-cluster-login - namespace: openshift-config - path: components/configs/login/overlays/rhdp - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-base-namespaces - namespace: openshift-gitops - path: components/configs/namespaces/overlays/default-limited - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-cluster-rbac - namespace: openshift-gitops - path: components/configs/rbac/overlays/rhdp - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-sandbox-cleanup - namespace: openshift-gitops - path: components/configs/simple/sandbox-cleanup diff --git a/components/argocd/apps/overlays/rhdp/patch-operators-applicationset.yaml b/components/argocd/apps/overlays/rhdp/patch-operators-applicationset.yaml deleted file mode 100644 index 21434c92..00000000 --- a/components/argocd/apps/overlays/rhdp/patch-operators-applicationset.yaml +++ /dev/null @@ -1,53 +0,0 @@ -- op: add - path: /spec/generators/0/list/elements - value: - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-ack-controllers - path: components/operators/ack-controllers/aggregate/popular - # - cluster: local - # url: https://kubernetes.default.svc - # values: - # name: operator-crunchy-postgres - # path: components/operators/crunchy-postgres/overlays/v5 - # - cluster: local - # url: https://kubernetes.default.svc - # values: - # name: operator-openshift-logging - # path: components/operators/openshift-logging/aggregate/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-openshift-nfd - path: components/operators/nfd/aggregate/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-openshift-pipelines - path: components/operators/openshift-pipelines-operator-rh/operator/overlays/latest - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-nvidia-gpu-operator - path: components/operators/gpu-operator-certified/aggregate/overlays/default - # - cluster: local - # url: https://kubernetes.default.svc - # values: - # name: operator-rhods - # path: components/operators/rhods-operator/operator/overlays/stable - # - cluster: local - # url: https://kubernetes.default.svc - # values: - # name: prometheus-user-workload-monitoring - # path: components/operators/prometheus-monitoring/instance/overlays/user-workload-monitoring - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-sealed-secrets - path: components/operators/sealed-secrets/operator/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-web-terminal - path: components/operators/web-terminal/operator/overlays/fast diff --git a/components/argocd/apps/overlays/testing/app-airflow.yaml b/components/argocd/apps/overlays/testing/app-airflow.yaml deleted file mode 100644 index 0edcffb8..00000000 --- a/components/argocd/apps/overlays/testing/app-airflow.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - annotations: - argocd.argoproj.io/compare-options: IgnoreExtraneous - argocd.argoproj.io/sync-options: Prune=false - name: demo-rhods-airflow - namespace: openshift-gitops -spec: - destination: - namespace: airflow - server: https://kubernetes.default.svc - project: cluster-config - source: - path: components/demos/instance/airflow - repoURL: https://github.com/codekow/demo-ai-gitops-catalog.git - targetRevision: main - syncPolicy: - automated: - selfHeal: true diff --git a/components/argocd/apps/overlays/testing/app-pgadmin4.yaml b/components/argocd/apps/overlays/testing/app-pgadmin4.yaml deleted file mode 100644 index ba31f265..00000000 --- a/components/argocd/apps/overlays/testing/app-pgadmin4.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: simple-pgadmin4 - namespace: openshift-gitops -spec: - destination: - namespace: pgadmin4 - server: https://kubernetes.default.svc - project: cluster-config - source: - path: components/configs/simple/pgadmin4 - repoURL: https://github.com/codekow/demo-ai-gitops-catalog.git - targetRevision: main - syncPolicy: - automated: {} - ignoreDifferences: - - group: apps - kind: Deployment - jsonPointers: [] - jqPathExpressions: - # - .spec.template.spec.initContainers[] | select(.name == "injected-init-container") - # - .spec.template.spec.containers[].image - - .spec.template.spec.containers[] | select(.name == "pgadmin4") | .image diff --git a/components/argocd/apps/overlays/testing/appset-cluster-automation.yaml b/components/argocd/apps/overlays/testing/appset-cluster-automation.yaml deleted file mode 100644 index dec45754..00000000 --- a/components/argocd/apps/overlays/testing/appset-cluster-automation.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: ApplicationSet -metadata: - name: cluster-automation-applicationset - namespace: openshift-gitops - annotations: - argocd.argoproj.io/compare-options: IgnoreExtraneous - argocd.argoproj.io/sync-options: Prune=false -spec: - generators: - - list: - elements: - - cluster: local - url: https://kubernetes.default.svc - values: - name: simple-sandbox-cleanup - namespace: openshift-gitops - path: components/configs/simple/sandbox-cleanup - template: - metadata: - name: '{{values.name}}' - annotations: - argocd.argoproj.io/compare-options: IgnoreExtraneous - argocd.argoproj.io/sync-options: Prune=false - labels: - app.kubernetes.io/instance: cluster-config-app-of-apps - spec: - project: cluster-config - syncPolicy: - automated: - prune: false - selfHeal: true - retry: - limit: 2 - backoff: - duration: 5s - factor: 2 - maxDuration: 5m - source: - repoURL: patch-me-see-clusters-overlays - targetRevision: patch-me-see-clusters-overlays - path: '{{values.path}}' - destination: - server: https://kubernetes.default.svc - namespace: '{{values.namespace}}' diff --git a/components/argocd/apps/overlays/testing/kustomization.yaml b/components/argocd/apps/overlays/testing/kustomization.yaml deleted file mode 100644 index 29363ef0..00000000 --- a/components/argocd/apps/overlays/testing/kustomization.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../default - # - app-pgadmin4.yaml - # - appset-cluster-automation.yaml - -patches: - - target: - group: argoproj.io - version: v1alpha1 - kind: Application - name: cluster-config-app-of-apps - path: patch-cluster-config-app-of-apps.yaml - - target: - group: argoproj.io - version: v1alpha1 - kind: ApplicationSet - name: cluster-configs-applicationset - path: patch-configs-applicationset.yaml - - target: - group: argoproj.io - version: v1alpha1 - kind: ApplicationSet - name: cluster-operators-applicationset - path: patch-operators-applicationset.yaml diff --git a/components/argocd/apps/overlays/testing/patch-cluster-config-app-of-apps.yaml b/components/argocd/apps/overlays/testing/patch-cluster-config-app-of-apps.yaml deleted file mode 100644 index 7df4bad1..00000000 --- a/components/argocd/apps/overlays/testing/patch-cluster-config-app-of-apps.yaml +++ /dev/null @@ -1,3 +0,0 @@ -- op: replace - path: /spec/source/path - value: clusters/overlays/testing \ No newline at end of file diff --git a/components/argocd/apps/overlays/testing/patch-configs-applicationset.yaml b/components/argocd/apps/overlays/testing/patch-configs-applicationset.yaml deleted file mode 100644 index a18c57ff..00000000 --- a/components/argocd/apps/overlays/testing/patch-configs-applicationset.yaml +++ /dev/null @@ -1,45 +0,0 @@ -- op: add - path: /spec/generators/0/list/elements - value: - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-cluster-console - namespace: openshift-gitops - path: components/configs/console/overlays/testing - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-cluster-console-samples - namespace: openshift-gitops - path: components/configs/console-samples - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-cluster-login - namespace: openshift-config - path: components/configs/login/overlays/testing - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-cluster-namespaces - namespace: openshift-gitops - path: components/configs/namespaces/overlays/default-limited - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-cluster-rbac - namespace: openshift-gitops - path: components/configs/rbac/overlays/default - # - cluster: local - # url: https://kubernetes.default.svc - # values: - # name: config-demo-rhods - # namespace: openshift-gitops - # path: components/demos/overlays/rhods - - cluster: local - url: https://kubernetes.default.svc - values: - name: config-sandbox-cleanup - namespace: openshift-gitops - path: components/configs/simple/sandbox-cleanup diff --git a/components/argocd/apps/overlays/testing/patch-operators-applicationset.yaml b/components/argocd/apps/overlays/testing/patch-operators-applicationset.yaml deleted file mode 100644 index bef3dc26..00000000 --- a/components/argocd/apps/overlays/testing/patch-operators-applicationset.yaml +++ /dev/null @@ -1,53 +0,0 @@ -- op: add - path: /spec/generators/0/list/elements - value: - # - cluster: local - # url: https://kubernetes.default.svc - # values: - # name: operator-acm - # path: components/operators/advanced-cluster-management/operator/overlays/release-2.7 - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-devspaces - path: components/operators/devspaces/aggregate/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-gpu - path: components/operators/gpu-operator-certified/aggregate/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-openshift-nfd - path: components/operators/nfd/aggregate/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-openshift-pipelines - path: components/operators/openshift-pipelines-operator-rh/operator/overlays/latest - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-velero - path: components/operators/redhat-oadp-operator/operator/overlays/stable - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-rhods - path: components/operators/rhods-operator/operator/overlays/stable - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-sealed-secrets - path: components/operators/sealed-secrets/operator/overlays/default - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-strimzi-kafka - path: components/operators/strimzi-kafka-operator/operator/overlays/stable - - cluster: local - url: https://kubernetes.default.svc - values: - name: operator-web-terminal - path: components/operators/web-terminal/operator/overlays/fast diff --git a/components/demos/overlays/custom-notebooks/kustomization.yaml b/components/configs/aggragates/custom-notebooks/kustomization.yaml similarity index 95% rename from components/demos/overlays/custom-notebooks/kustomization.yaml rename to components/configs/aggragates/custom-notebooks/kustomization.yaml index 7847b263..88edaebc 100644 --- a/components/demos/overlays/custom-notebooks/kustomization.yaml +++ b/components/configs/aggragates/custom-notebooks/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../instance/custom-notebook-images + - ../../kustomized/custom-notebook-images patches: - target: diff --git a/components/demos/overlays/rhods/kustomization.yaml b/components/configs/aggragates/rhods/kustomization.yaml similarity index 90% rename from components/demos/overlays/rhods/kustomization.yaml rename to components/configs/aggragates/rhods/kustomization.yaml index 385fc08e..412d5767 100644 --- a/components/demos/overlays/rhods/kustomization.yaml +++ b/components/configs/aggragates/rhods/kustomization.yaml @@ -2,9 +2,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../instance/custom-notebook-images - - ../../instance/rhods - - ../../instance/rhods-projects + - ../../kustomized/custom-notebook-images + - ../../kustomized/rhods + - ../../kustomized/rhods-projects patches: - target: diff --git a/components/demos/overlays/rhods/patch-workshop-users.yaml b/components/configs/aggragates/rhods/patch-workshop-users.yaml similarity index 100% rename from components/demos/overlays/rhods/patch-workshop-users.yaml rename to components/configs/aggragates/rhods/patch-workshop-users.yaml diff --git a/components/configs/simple/README.md b/components/configs/apply-only/README.md similarity index 100% rename from components/configs/simple/README.md rename to components/configs/apply-only/README.md diff --git a/components/configs/simple/aap-instance/controller.yaml b/components/configs/apply-only/aap-instance/controller.yaml similarity index 100% rename from components/configs/simple/aap-instance/controller.yaml rename to components/configs/apply-only/aap-instance/controller.yaml diff --git a/components/configs/simple/aap-instance/eda-controller.yaml b/components/configs/apply-only/aap-instance/eda-controller.yaml similarity index 100% rename from components/configs/simple/aap-instance/eda-controller.yaml rename to components/configs/apply-only/aap-instance/eda-controller.yaml diff --git a/components/configs/simple/kludge-rosa-htpasswd/htpasswd-workshop-kludge-cronjob.yaml b/components/configs/apply-only/kludge-rosa-htpasswd/htpasswd-workshop-kludge-cronjob.yaml similarity index 100% rename from components/configs/simple/kludge-rosa-htpasswd/htpasswd-workshop-kludge-cronjob.yaml rename to components/configs/apply-only/kludge-rosa-htpasswd/htpasswd-workshop-kludge-cronjob.yaml diff --git a/components/configs/simple/kludge-rosa-htpasswd/htpasswd-workshop-kludge-rb.yaml b/components/configs/apply-only/kludge-rosa-htpasswd/htpasswd-workshop-kludge-rb.yaml similarity index 100% rename from components/configs/simple/kludge-rosa-htpasswd/htpasswd-workshop-kludge-rb.yaml rename to components/configs/apply-only/kludge-rosa-htpasswd/htpasswd-workshop-kludge-rb.yaml diff --git a/components/configs/simple/kludge-rosa-htpasswd/htpasswd-workshop-kludge-role.yaml b/components/configs/apply-only/kludge-rosa-htpasswd/htpasswd-workshop-kludge-role.yaml similarity index 100% rename from components/configs/simple/kludge-rosa-htpasswd/htpasswd-workshop-kludge-role.yaml rename to components/configs/apply-only/kludge-rosa-htpasswd/htpasswd-workshop-kludge-role.yaml diff --git a/components/configs/simple/kludge-rosa-htpasswd/htpasswd-workshop-kludge-sa.yaml b/components/configs/apply-only/kludge-rosa-htpasswd/htpasswd-workshop-kludge-sa.yaml similarity index 100% rename from components/configs/simple/kludge-rosa-htpasswd/htpasswd-workshop-kludge-sa.yaml rename to components/configs/apply-only/kludge-rosa-htpasswd/htpasswd-workshop-kludge-sa.yaml diff --git a/components/configs/simple/local-storage/local-disk-block-sc.yaml b/components/configs/apply-only/local-storage/local-disk-block-sc.yaml similarity index 100% rename from components/configs/simple/local-storage/local-disk-block-sc.yaml rename to components/configs/apply-only/local-storage/local-disk-block-sc.yaml diff --git a/components/configs/simple/local-storage/local-volume-discovery.yaml b/components/configs/apply-only/local-storage/local-volume-discovery.yaml similarity index 100% rename from components/configs/simple/local-storage/local-volume-discovery.yaml rename to components/configs/apply-only/local-storage/local-volume-discovery.yaml diff --git a/components/configs/simple/local-storage/local-volume-set-block.yaml b/components/configs/apply-only/local-storage/local-volume-set-block.yaml similarity index 100% rename from components/configs/simple/local-storage/local-volume-set-block.yaml rename to components/configs/apply-only/local-storage/local-volume-set-block.yaml diff --git a/components/configs/simple/odf/README.md b/components/configs/apply-only/odf/README.md similarity index 100% rename from components/configs/simple/odf/README.md rename to components/configs/apply-only/odf/README.md diff --git a/components/configs/simple/odf/storage-cluster.yaml b/components/configs/apply-only/odf/storage-cluster.yaml similarity index 100% rename from components/configs/simple/odf/storage-cluster.yaml rename to components/configs/apply-only/odf/storage-cluster.yaml diff --git a/components/configs/simple/odf/storage-system.yaml b/components/configs/apply-only/odf/storage-system.yaml similarity index 100% rename from components/configs/simple/odf/storage-system.yaml rename to components/configs/apply-only/odf/storage-system.yaml diff --git a/components/configs/simple/pgadmin4/pgadmin4-bc.yml b/components/configs/apply-only/pgadmin4/pgadmin4-bc.yml similarity index 100% rename from components/configs/simple/pgadmin4/pgadmin4-bc.yml rename to components/configs/apply-only/pgadmin4/pgadmin4-bc.yml diff --git a/components/configs/simple/pgadmin4/pgadmin4-deployement.yml b/components/configs/apply-only/pgadmin4/pgadmin4-deployement.yml similarity index 100% rename from components/configs/simple/pgadmin4/pgadmin4-deployement.yml rename to components/configs/apply-only/pgadmin4/pgadmin4-deployement.yml diff --git a/components/configs/simple/pgadmin4/pgadmin4-is.yml b/components/configs/apply-only/pgadmin4/pgadmin4-is.yml similarity index 100% rename from components/configs/simple/pgadmin4/pgadmin4-is.yml rename to components/configs/apply-only/pgadmin4/pgadmin4-is.yml diff --git a/components/configs/simple/pgadmin4/pgadmin4-ns.yml b/components/configs/apply-only/pgadmin4/pgadmin4-ns.yml similarity index 100% rename from components/configs/simple/pgadmin4/pgadmin4-ns.yml rename to components/configs/apply-only/pgadmin4/pgadmin4-ns.yml diff --git a/components/configs/simple/pgadmin4/pgadmin4-pvc.yml.bak b/components/configs/apply-only/pgadmin4/pgadmin4-pvc.yml.bak similarity index 100% rename from components/configs/simple/pgadmin4/pgadmin4-pvc.yml.bak rename to components/configs/apply-only/pgadmin4/pgadmin4-pvc.yml.bak diff --git a/components/configs/simple/pgadmin4/pgadmin4-route.yml b/components/configs/apply-only/pgadmin4/pgadmin4-route.yml similarity index 100% rename from components/configs/simple/pgadmin4/pgadmin4-route.yml rename to components/configs/apply-only/pgadmin4/pgadmin4-route.yml diff --git a/components/configs/simple/pgadmin4/pgadmin4-svc.yml b/components/configs/apply-only/pgadmin4/pgadmin4-svc.yml similarity index 100% rename from components/configs/simple/pgadmin4/pgadmin4-svc.yml rename to components/configs/apply-only/pgadmin4/pgadmin4-svc.yml diff --git a/components/configs/simple/rosa-htpasswd-kludge/htpasswd-workshop-kludge-cronjob.yaml b/components/configs/apply-only/rosa-htpasswd-kludge/htpasswd-workshop-kludge-cronjob.yaml similarity index 100% rename from components/configs/simple/rosa-htpasswd-kludge/htpasswd-workshop-kludge-cronjob.yaml rename to components/configs/apply-only/rosa-htpasswd-kludge/htpasswd-workshop-kludge-cronjob.yaml diff --git a/components/configs/simple/rosa-htpasswd-kludge/htpasswd-workshop-kludge-rb.yaml b/components/configs/apply-only/rosa-htpasswd-kludge/htpasswd-workshop-kludge-rb.yaml similarity index 100% rename from components/configs/simple/rosa-htpasswd-kludge/htpasswd-workshop-kludge-rb.yaml rename to components/configs/apply-only/rosa-htpasswd-kludge/htpasswd-workshop-kludge-rb.yaml diff --git a/components/configs/simple/rosa-htpasswd-kludge/htpasswd-workshop-kludge-role.yaml b/components/configs/apply-only/rosa-htpasswd-kludge/htpasswd-workshop-kludge-role.yaml similarity index 100% rename from components/configs/simple/rosa-htpasswd-kludge/htpasswd-workshop-kludge-role.yaml rename to components/configs/apply-only/rosa-htpasswd-kludge/htpasswd-workshop-kludge-role.yaml diff --git a/components/configs/simple/rosa-htpasswd-kludge/htpasswd-workshop-kludge-sa.yaml b/components/configs/apply-only/rosa-htpasswd-kludge/htpasswd-workshop-kludge-sa.yaml similarity index 100% rename from components/configs/simple/rosa-htpasswd-kludge/htpasswd-workshop-kludge-sa.yaml rename to components/configs/apply-only/rosa-htpasswd-kludge/htpasswd-workshop-kludge-sa.yaml diff --git a/components/configs/simple/sandbox-cleanup/sandbox-cleanup-cj.yml b/components/configs/apply-only/sandbox-cleanup/sandbox-cleanup-cj.yml similarity index 100% rename from components/configs/simple/sandbox-cleanup/sandbox-cleanup-cj.yml rename to components/configs/apply-only/sandbox-cleanup/sandbox-cleanup-cj.yml diff --git a/components/configs/simple/sandbox-cleanup/sandbox-cleanup-rolebinding.yml b/components/configs/apply-only/sandbox-cleanup/sandbox-cleanup-rolebinding.yml similarity index 100% rename from components/configs/simple/sandbox-cleanup/sandbox-cleanup-rolebinding.yml rename to components/configs/apply-only/sandbox-cleanup/sandbox-cleanup-rolebinding.yml diff --git a/components/configs/simple/sandbox-cleanup/sandbox-cleanup-sa.yml b/components/configs/apply-only/sandbox-cleanup/sandbox-cleanup-sa.yml similarity index 100% rename from components/configs/simple/sandbox-cleanup/sandbox-cleanup-sa.yml rename to components/configs/apply-only/sandbox-cleanup/sandbox-cleanup-sa.yml diff --git a/components/configs/cluster-certs/base/kustomization.yaml b/components/configs/cluster-certs/base/kustomization.yaml deleted file mode 100644 index 97f4ede1..00000000 --- a/components/configs/cluster-certs/base/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - ../../../operators/openshift-cert-manager-operator/examples/letsencrypt-route53-issuer - - ../../../operators/openshift-cert-manager-operator/examples/openshift-api-certificate - - ../../../operators/openshift-cert-manager-operator/examples/openshift-wildcard-certificate \ No newline at end of file diff --git a/components/configs/adhoc/README.md b/components/configs/cluster/adhoc/README.md similarity index 100% rename from components/configs/adhoc/README.md rename to components/configs/cluster/adhoc/README.md diff --git a/components/configs/adhoc/base/adhoc-pod.yaml b/components/configs/cluster/adhoc/base/adhoc-pod.yaml similarity index 100% rename from components/configs/adhoc/base/adhoc-pod.yaml rename to components/configs/cluster/adhoc/base/adhoc-pod.yaml diff --git a/components/configs/adhoc/base/admin-rolebinding.yaml b/components/configs/cluster/adhoc/base/admin-rolebinding.yaml similarity index 100% rename from components/configs/adhoc/base/admin-rolebinding.yaml rename to components/configs/cluster/adhoc/base/admin-rolebinding.yaml diff --git a/components/configs/adhoc/base/kustomization.yaml b/components/configs/cluster/adhoc/base/kustomization.yaml similarity index 100% rename from components/configs/adhoc/base/kustomization.yaml rename to components/configs/cluster/adhoc/base/kustomization.yaml diff --git a/components/configs/adhoc/base/namespace.yaml b/components/configs/cluster/adhoc/base/namespace.yaml similarity index 100% rename from components/configs/adhoc/base/namespace.yaml rename to components/configs/cluster/adhoc/base/namespace.yaml diff --git a/components/configs/adhoc/base/terminal-role.yaml b/components/configs/cluster/adhoc/base/terminal-role.yaml similarity index 100% rename from components/configs/adhoc/base/terminal-role.yaml rename to components/configs/cluster/adhoc/base/terminal-role.yaml diff --git a/components/configs/adhoc/base/terminal-rolebinding.yaml b/components/configs/cluster/adhoc/base/terminal-rolebinding.yaml similarity index 100% rename from components/configs/adhoc/base/terminal-rolebinding.yaml rename to components/configs/cluster/adhoc/base/terminal-rolebinding.yaml diff --git a/components/configs/adhoc/overlays/rhpds/fix-remove-project-template.yaml b/components/configs/cluster/adhoc/overlays/rhpds/fix-remove-project-template.yaml similarity index 100% rename from components/configs/adhoc/overlays/rhpds/fix-remove-project-template.yaml rename to components/configs/cluster/adhoc/overlays/rhpds/fix-remove-project-template.yaml diff --git a/components/configs/adhoc/overlays/rhpds/kustomization.yaml b/components/configs/cluster/adhoc/overlays/rhpds/kustomization.yaml similarity index 100% rename from components/configs/adhoc/overlays/rhpds/kustomization.yaml rename to components/configs/cluster/adhoc/overlays/rhpds/kustomization.yaml diff --git a/components/configs/autoscale/base/autoscaling.yaml b/components/configs/cluster/autoscale/base/autoscaling.yaml similarity index 100% rename from components/configs/autoscale/base/autoscaling.yaml rename to components/configs/cluster/autoscale/base/autoscaling.yaml diff --git a/components/configs/autoscale/base/kustomization.yaml b/components/configs/cluster/autoscale/base/kustomization.yaml similarity index 100% rename from components/configs/autoscale/base/kustomization.yaml rename to components/configs/cluster/autoscale/base/kustomization.yaml diff --git a/components/configs/autoscale/overlays/default/kustomization.yaml b/components/configs/cluster/autoscale/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/autoscale/overlays/default/kustomization.yaml rename to components/configs/cluster/autoscale/overlays/default/kustomization.yaml diff --git a/components/configs/autoscale/overlays/gpus-accelerator-label/kustomization.yaml b/components/configs/cluster/autoscale/overlays/gpus-accelerator-label/kustomization.yaml similarity index 100% rename from components/configs/autoscale/overlays/gpus-accelerator-label/kustomization.yaml rename to components/configs/cluster/autoscale/overlays/gpus-accelerator-label/kustomization.yaml diff --git a/components/configs/autoscale/overlays/gpus/kustomization.yaml b/components/configs/cluster/autoscale/overlays/gpus/kustomization.yaml similarity index 100% rename from components/configs/autoscale/overlays/gpus/kustomization.yaml rename to components/configs/cluster/autoscale/overlays/gpus/kustomization.yaml diff --git a/components/configs/autoscale/overlays/workshop-50/kustomization.yaml b/components/configs/cluster/autoscale/overlays/workshop-50/kustomization.yaml similarity index 100% rename from components/configs/autoscale/overlays/workshop-50/kustomization.yaml rename to components/configs/cluster/autoscale/overlays/workshop-50/kustomization.yaml diff --git a/components/configs/baremetal/base/example-bmc-secret.yaml b/components/configs/cluster/baremetal/base/example-bmc-secret.yaml similarity index 100% rename from components/configs/baremetal/base/example-bmc-secret.yaml rename to components/configs/cluster/baremetal/base/example-bmc-secret.yaml diff --git a/components/configs/baremetal/base/example-bmh.yaml b/components/configs/cluster/baremetal/base/example-bmh.yaml similarity index 100% rename from components/configs/baremetal/base/example-bmh.yaml rename to components/configs/cluster/baremetal/base/example-bmh.yaml diff --git a/components/configs/baremetal/base/kustomization.yaml b/components/configs/cluster/baremetal/base/kustomization.yaml similarity index 100% rename from components/configs/baremetal/base/kustomization.yaml rename to components/configs/cluster/baremetal/base/kustomization.yaml diff --git a/components/configs/baremetal/overlays/default/kustomization.yaml b/components/configs/cluster/baremetal/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/baremetal/overlays/default/kustomization.yaml rename to components/configs/cluster/baremetal/overlays/default/kustomization.yaml diff --git a/components/configs/cluster/cluster-certs/base/kustomization.yaml b/components/configs/cluster/cluster-certs/base/kustomization.yaml new file mode 100644 index 00000000..de177bbf --- /dev/null +++ b/components/configs/cluster/cluster-certs/base/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../../../operators/openshift-cert-manager-operator/examples/letsencrypt-route53-issuer + - ../../../../operators/openshift-cert-manager-operator/examples/openshift-api-certificate + - ../../../../operators/openshift-cert-manager-operator/examples/openshift-wildcard-certificate \ No newline at end of file diff --git a/components/configs/cluster-certs/overlays/letsencrypt/kustomization.yaml b/components/configs/cluster/cluster-certs/overlays/letsencrypt/kustomization.yaml similarity index 100% rename from components/configs/cluster-certs/overlays/letsencrypt/kustomization.yaml rename to components/configs/cluster/cluster-certs/overlays/letsencrypt/kustomization.yaml diff --git a/components/configs/cluster-certs/overlays/letsencrypt/letsencrypt-aws-sealed-secret.yaml b/components/configs/cluster/cluster-certs/overlays/letsencrypt/letsencrypt-aws-sealed-secret.yaml similarity index 100% rename from components/configs/cluster-certs/overlays/letsencrypt/letsencrypt-aws-sealed-secret.yaml rename to components/configs/cluster/cluster-certs/overlays/letsencrypt/letsencrypt-aws-sealed-secret.yaml diff --git a/components/configs/cluster-certs/overlays/todo/kustomization.yaml b/components/configs/cluster/cluster-certs/overlays/todo/kustomization.yaml similarity index 100% rename from components/configs/cluster-certs/overlays/todo/kustomization.yaml rename to components/configs/cluster/cluster-certs/overlays/todo/kustomization.yaml diff --git a/components/configs/console-samples/sample-build-config-dockerfile.yaml b/components/configs/cluster/console-samples/sample-build-config-dockerfile.yaml similarity index 100% rename from components/configs/console-samples/sample-build-config-dockerfile.yaml rename to components/configs/cluster/console-samples/sample-build-config-dockerfile.yaml diff --git a/components/configs/console-samples/sample-custom-s2i-quickstart.yaml b/components/configs/cluster/console-samples/sample-custom-s2i-quickstart.yaml similarity index 100% rename from components/configs/console-samples/sample-custom-s2i-quickstart.yaml rename to components/configs/cluster/console-samples/sample-custom-s2i-quickstart.yaml diff --git a/components/configs/console/base/README.md b/components/configs/cluster/console/base/README.md similarity index 100% rename from components/configs/console/base/README.md rename to components/configs/cluster/console/base/README.md diff --git a/components/configs/console/base/banner-data.yaml b/components/configs/cluster/console/base/banner-data.yaml similarity index 100% rename from components/configs/console/base/banner-data.yaml rename to components/configs/cluster/console/base/banner-data.yaml diff --git a/components/configs/console/base/banner-top.yaml b/components/configs/cluster/console/base/banner-top.yaml similarity index 100% rename from components/configs/console/base/banner-top.yaml rename to components/configs/cluster/console/base/banner-top.yaml diff --git a/components/configs/console/base/error-page-404.http b/components/configs/cluster/console/base/error-page-404.http similarity index 100% rename from components/configs/console/base/error-page-404.http rename to components/configs/cluster/console/base/error-page-404.http diff --git a/components/configs/console/base/error-page-503.http b/components/configs/cluster/console/base/error-page-503.http similarity index 100% rename from components/configs/console/base/error-page-503.http rename to components/configs/cluster/console/base/error-page-503.http diff --git a/components/configs/console/base/error-pages-custom-cm.yaml b/components/configs/cluster/console/base/error-pages-custom-cm.yaml similarity index 100% rename from components/configs/console/base/error-pages-custom-cm.yaml rename to components/configs/cluster/console/base/error-pages-custom-cm.yaml diff --git a/components/configs/console/base/error-pages-normal-cm.yaml b/components/configs/cluster/console/base/error-pages-normal-cm.yaml similarity index 100% rename from components/configs/console/base/error-pages-normal-cm.yaml rename to components/configs/cluster/console/base/error-pages-normal-cm.yaml diff --git a/components/configs/console/base/ingresscontroller-cr.yaml b/components/configs/cluster/console/base/ingresscontroller-cr.yaml similarity index 100% rename from components/configs/console/base/ingresscontroller-cr.yaml rename to components/configs/cluster/console/base/ingresscontroller-cr.yaml diff --git a/components/configs/console/base/kustomization.yaml b/components/configs/cluster/console/base/kustomization.yaml similarity index 100% rename from components/configs/console/base/kustomization.yaml rename to components/configs/cluster/console/base/kustomization.yaml diff --git a/components/configs/console/base/link-github.yaml b/components/configs/cluster/console/base/link-github.yaml similarity index 100% rename from components/configs/console/base/link-github.yaml rename to components/configs/cluster/console/base/link-github.yaml diff --git a/components/configs/console/base/link-quay.yaml b/components/configs/cluster/console/base/link-quay.yaml similarity index 100% rename from components/configs/console/base/link-quay.yaml rename to components/configs/cluster/console/base/link-quay.yaml diff --git a/components/configs/console/overlays/default/kustomization.yaml b/components/configs/cluster/console/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/console/overlays/default/kustomization.yaml rename to components/configs/cluster/console/overlays/default/kustomization.yaml diff --git a/components/configs/console/overlays/rhods/kustomization.yaml b/components/configs/cluster/console/overlays/rhods/kustomization.yaml similarity index 100% rename from components/configs/console/overlays/rhods/kustomization.yaml rename to components/configs/cluster/console/overlays/rhods/kustomization.yaml diff --git a/components/configs/console/overlays/testing/kustomization.yaml b/components/configs/cluster/console/overlays/testing/kustomization.yaml similarity index 100% rename from components/configs/console/overlays/testing/kustomization.yaml rename to components/configs/cluster/console/overlays/testing/kustomization.yaml diff --git a/components/configs/login/base/README.md b/components/configs/cluster/login/base/README.md similarity index 100% rename from components/configs/login/base/README.md rename to components/configs/cluster/login/base/README.md diff --git a/components/configs/login/base/cluster-oauth.yaml b/components/configs/cluster/login/base/cluster-oauth.yaml similarity index 100% rename from components/configs/login/base/cluster-oauth.yaml rename to components/configs/cluster/login/base/cluster-oauth.yaml diff --git a/components/configs/login/base/errors.html b/components/configs/cluster/login/base/errors.html similarity index 100% rename from components/configs/login/base/errors.html rename to components/configs/cluster/login/base/errors.html diff --git a/components/configs/login/base/kustomization.yaml b/components/configs/cluster/login/base/kustomization.yaml similarity index 100% rename from components/configs/login/base/kustomization.yaml rename to components/configs/cluster/login/base/kustomization.yaml diff --git a/components/configs/login/base/login.html b/components/configs/cluster/login/base/login.html similarity index 100% rename from components/configs/login/base/login.html rename to components/configs/cluster/login/base/login.html diff --git a/components/configs/login/base/providers.html b/components/configs/cluster/login/base/providers.html similarity index 100% rename from components/configs/login/base/providers.html rename to components/configs/cluster/login/base/providers.html diff --git a/components/configs/login/overlays/baremetal/kustomization.yaml b/components/configs/cluster/login/overlays/baremetal/kustomization.yaml similarity index 100% rename from components/configs/login/overlays/baremetal/kustomization.yaml rename to components/configs/cluster/login/overlays/baremetal/kustomization.yaml diff --git a/components/configs/login/overlays/default/kustomization.yaml b/components/configs/cluster/login/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/login/overlays/default/kustomization.yaml rename to components/configs/cluster/login/overlays/default/kustomization.yaml diff --git a/components/configs/login/overlays/github/github-client-sealed-secret.yaml b/components/configs/cluster/login/overlays/github/github-client-sealed-secret.yaml similarity index 100% rename from components/configs/login/overlays/github/github-client-sealed-secret.yaml rename to components/configs/cluster/login/overlays/github/github-client-sealed-secret.yaml diff --git a/components/configs/login/overlays/github/kustomization.yaml b/components/configs/cluster/login/overlays/github/kustomization.yaml similarity index 100% rename from components/configs/login/overlays/github/kustomization.yaml rename to components/configs/cluster/login/overlays/github/kustomization.yaml diff --git a/components/configs/login/overlays/github/patch-idp.yaml b/components/configs/cluster/login/overlays/github/patch-idp.yaml similarity index 100% rename from components/configs/login/overlays/github/patch-idp.yaml rename to components/configs/cluster/login/overlays/github/patch-idp.yaml diff --git a/components/configs/login/overlays/rhdp/htpasswd-secret-ss-job.yaml b/components/configs/cluster/login/overlays/rhdp/htpasswd-secret-ss-job.yaml similarity index 100% rename from components/configs/login/overlays/rhdp/htpasswd-secret-ss-job.yaml rename to components/configs/cluster/login/overlays/rhdp/htpasswd-secret-ss-job.yaml diff --git a/components/configs/login/overlays/rhdp/htpasswd-secret-ss.yaml b/components/configs/cluster/login/overlays/rhdp/htpasswd-secret-ss.yaml similarity index 100% rename from components/configs/login/overlays/rhdp/htpasswd-secret-ss.yaml rename to components/configs/cluster/login/overlays/rhdp/htpasswd-secret-ss.yaml diff --git a/components/configs/login/overlays/rhdp/kustomization.yaml b/components/configs/cluster/login/overlays/rhdp/kustomization.yaml similarity index 100% rename from components/configs/login/overlays/rhdp/kustomization.yaml rename to components/configs/cluster/login/overlays/rhdp/kustomization.yaml diff --git a/components/configs/login/overlays/rhdp/patch-idp.yaml b/components/configs/cluster/login/overlays/rhdp/patch-idp.yaml similarity index 100% rename from components/configs/login/overlays/rhdp/patch-idp.yaml rename to components/configs/cluster/login/overlays/rhdp/patch-idp.yaml diff --git a/components/configs/login/overlays/testing/github-client-sealed-secret.yaml b/components/configs/cluster/login/overlays/testing/github-client-sealed-secret.yaml similarity index 100% rename from components/configs/login/overlays/testing/github-client-sealed-secret.yaml rename to components/configs/cluster/login/overlays/testing/github-client-sealed-secret.yaml diff --git a/components/configs/login/overlays/testing/htpasswd-fix-user-job.yaml b/components/configs/cluster/login/overlays/testing/htpasswd-fix-user-job.yaml similarity index 100% rename from components/configs/login/overlays/testing/htpasswd-fix-user-job.yaml rename to components/configs/cluster/login/overlays/testing/htpasswd-fix-user-job.yaml diff --git a/components/configs/login/overlays/testing/htpasswd-secret-ss-job.yaml b/components/configs/cluster/login/overlays/testing/htpasswd-secret-ss-job.yaml similarity index 100% rename from components/configs/login/overlays/testing/htpasswd-secret-ss-job.yaml rename to components/configs/cluster/login/overlays/testing/htpasswd-secret-ss-job.yaml diff --git a/components/configs/login/overlays/testing/htpasswd-secret-ss.yaml b/components/configs/cluster/login/overlays/testing/htpasswd-secret-ss.yaml similarity index 100% rename from components/configs/login/overlays/testing/htpasswd-secret-ss.yaml rename to components/configs/cluster/login/overlays/testing/htpasswd-secret-ss.yaml diff --git a/components/configs/login/overlays/testing/kustomization.yaml b/components/configs/cluster/login/overlays/testing/kustomization.yaml similarity index 100% rename from components/configs/login/overlays/testing/kustomization.yaml rename to components/configs/cluster/login/overlays/testing/kustomization.yaml diff --git a/components/configs/login/overlays/testing/login-custom-secret.yaml b/components/configs/cluster/login/overlays/testing/login-custom-secret.yaml similarity index 100% rename from components/configs/login/overlays/testing/login-custom-secret.yaml rename to components/configs/cluster/login/overlays/testing/login-custom-secret.yaml diff --git a/components/configs/login/overlays/testing/patch-idp.yaml b/components/configs/cluster/login/overlays/testing/patch-idp.yaml similarity index 100% rename from components/configs/login/overlays/testing/patch-idp.yaml rename to components/configs/cluster/login/overlays/testing/patch-idp.yaml diff --git a/components/configs/login/overlays/testing/v4-0-config-user-template-login.yaml b/components/configs/cluster/login/overlays/testing/v4-0-config-user-template-login.yaml similarity index 100% rename from components/configs/login/overlays/testing/v4-0-config-user-template-login.yaml rename to components/configs/cluster/login/overlays/testing/v4-0-config-user-template-login.yaml diff --git a/components/configs/machine/hugepages-1g/hugepages-1g-mcp.yml b/components/configs/cluster/machine/hugepages-1g/hugepages-1g-mcp.yml similarity index 100% rename from components/configs/machine/hugepages-1g/hugepages-1g-mcp.yml rename to components/configs/cluster/machine/hugepages-1g/hugepages-1g-mcp.yml diff --git a/components/configs/machine/hugepages-1g/hugepages-1g-ms.yml b/components/configs/cluster/machine/hugepages-1g/hugepages-1g-ms.yml similarity index 100% rename from components/configs/machine/hugepages-1g/hugepages-1g-ms.yml rename to components/configs/cluster/machine/hugepages-1g/hugepages-1g-ms.yml diff --git a/components/configs/machine/hugepages-1g/hugepages-1g-tuned-boottime.yml b/components/configs/cluster/machine/hugepages-1g/hugepages-1g-tuned-boottime.yml similarity index 100% rename from components/configs/machine/hugepages-1g/hugepages-1g-tuned-boottime.yml rename to components/configs/cluster/machine/hugepages-1g/hugepages-1g-tuned-boottime.yml diff --git a/components/configs/machine/hugepages-2m/hugepages-2m-mc-50.yml b/components/configs/cluster/machine/hugepages-2m/hugepages-2m-mc-50.yml similarity index 100% rename from components/configs/machine/hugepages-2m/hugepages-2m-mc-50.yml rename to components/configs/cluster/machine/hugepages-2m/hugepages-2m-mc-50.yml diff --git a/components/configs/machine/hugepages-2m/hugepages-2m-mcp.yml b/components/configs/cluster/machine/hugepages-2m/hugepages-2m-mcp.yml similarity index 100% rename from components/configs/machine/hugepages-2m/hugepages-2m-mcp.yml rename to components/configs/cluster/machine/hugepages-2m/hugepages-2m-mcp.yml diff --git a/components/configs/machine/hugepages-2m/hugepages-2m-ms.yml b/components/configs/cluster/machine/hugepages-2m/hugepages-2m-ms.yml similarity index 100% rename from components/configs/machine/hugepages-2m/hugepages-2m-ms.yml rename to components/configs/cluster/machine/hugepages-2m/hugepages-2m-ms.yml diff --git a/components/configs/machine/hugepages-2m/hugepages-2m-tuned-boottime.yml b/components/configs/cluster/machine/hugepages-2m/hugepages-2m-tuned-boottime.yml similarity index 100% rename from components/configs/machine/hugepages-2m/hugepages-2m-tuned-boottime.yml rename to components/configs/cluster/machine/hugepages-2m/hugepages-2m-tuned-boottime.yml diff --git a/components/configs/namespaces/base/cluster-config-project.yaml b/components/configs/cluster/namespaces/base/cluster-config-project.yaml similarity index 100% rename from components/configs/namespaces/base/cluster-config-project.yaml rename to components/configs/cluster/namespaces/base/cluster-config-project.yaml diff --git a/components/configs/namespaces/base/kustomization.yaml b/components/configs/cluster/namespaces/base/kustomization.yaml similarity index 100% rename from components/configs/namespaces/base/kustomization.yaml rename to components/configs/cluster/namespaces/base/kustomization.yaml diff --git a/components/configs/namespaces/base/project-request-template.yaml b/components/configs/cluster/namespaces/base/project-request-template.yaml similarity index 100% rename from components/configs/namespaces/base/project-request-template.yaml rename to components/configs/cluster/namespaces/base/project-request-template.yaml diff --git a/components/configs/namespaces/base/self-provisioner-clusterrolebinding.yaml b/components/configs/cluster/namespaces/base/self-provisioner-clusterrolebinding.yaml similarity index 100% rename from components/configs/namespaces/base/self-provisioner-clusterrolebinding.yaml rename to components/configs/cluster/namespaces/base/self-provisioner-clusterrolebinding.yaml diff --git a/components/configs/namespaces/instance/codekow/admin-rolebinding.yaml b/components/configs/cluster/namespaces/instance/codekow/admin-rolebinding.yaml similarity index 100% rename from components/configs/namespaces/instance/codekow/admin-rolebinding.yaml rename to components/configs/cluster/namespaces/instance/codekow/admin-rolebinding.yaml diff --git a/components/configs/namespaces/instance/codekow/kustomization.yaml b/components/configs/cluster/namespaces/instance/codekow/kustomization.yaml similarity index 100% rename from components/configs/namespaces/instance/codekow/kustomization.yaml rename to components/configs/cluster/namespaces/instance/codekow/kustomization.yaml diff --git a/components/configs/namespaces/instance/codekow/namespace.yaml b/components/configs/cluster/namespaces/instance/codekow/namespace.yaml similarity index 100% rename from components/configs/namespaces/instance/codekow/namespace.yaml rename to components/configs/cluster/namespaces/instance/codekow/namespace.yaml diff --git a/components/configs/namespaces/instance/registry/kustomization.yaml b/components/configs/cluster/namespaces/instance/registry/kustomization.yaml similarity index 100% rename from components/configs/namespaces/instance/registry/kustomization.yaml rename to components/configs/cluster/namespaces/instance/registry/kustomization.yaml diff --git a/components/configs/namespaces/instance/registry/namespace.yaml b/components/configs/cluster/namespaces/instance/registry/namespace.yaml similarity index 100% rename from components/configs/namespaces/instance/registry/namespace.yaml rename to components/configs/cluster/namespaces/instance/registry/namespace.yaml diff --git a/components/configs/namespaces/instance/registry/rolebinding-edit.yaml b/components/configs/cluster/namespaces/instance/registry/rolebinding-edit.yaml similarity index 100% rename from components/configs/namespaces/instance/registry/rolebinding-edit.yaml rename to components/configs/cluster/namespaces/instance/registry/rolebinding-edit.yaml diff --git a/components/configs/namespaces/instance/registry/rolebinding-puller.yaml b/components/configs/cluster/namespaces/instance/registry/rolebinding-puller.yaml similarity index 100% rename from components/configs/namespaces/instance/registry/rolebinding-puller.yaml rename to components/configs/cluster/namespaces/instance/registry/rolebinding-puller.yaml diff --git a/components/configs/namespaces/instance/registry/rolebinding-pusher.yaml b/components/configs/cluster/namespaces/instance/registry/rolebinding-pusher.yaml similarity index 100% rename from components/configs/namespaces/instance/registry/rolebinding-pusher.yaml rename to components/configs/cluster/namespaces/instance/registry/rolebinding-pusher.yaml diff --git a/components/configs/namespaces/instance/registry/rolebinding-viewer.yaml b/components/configs/cluster/namespaces/instance/registry/rolebinding-viewer.yaml similarity index 100% rename from components/configs/namespaces/instance/registry/rolebinding-viewer.yaml rename to components/configs/cluster/namespaces/instance/registry/rolebinding-viewer.yaml diff --git a/components/configs/namespaces/instance/registry/sa-puller.yaml b/components/configs/cluster/namespaces/instance/registry/sa-puller.yaml similarity index 100% rename from components/configs/namespaces/instance/registry/sa-puller.yaml rename to components/configs/cluster/namespaces/instance/registry/sa-puller.yaml diff --git a/components/configs/namespaces/instance/registry/sa-pusher.yaml b/components/configs/cluster/namespaces/instance/registry/sa-pusher.yaml similarity index 100% rename from components/configs/namespaces/instance/registry/sa-pusher.yaml rename to components/configs/cluster/namespaces/instance/registry/sa-pusher.yaml diff --git a/components/configs/namespaces/instance/sandbox/group-admin.yaml b/components/configs/cluster/namespaces/instance/sandbox/group-admin.yaml similarity index 100% rename from components/configs/namespaces/instance/sandbox/group-admin.yaml rename to components/configs/cluster/namespaces/instance/sandbox/group-admin.yaml diff --git a/components/configs/namespaces/instance/sandbox/kustomization.yaml b/components/configs/cluster/namespaces/instance/sandbox/kustomization.yaml similarity index 89% rename from components/configs/namespaces/instance/sandbox/kustomization.yaml rename to components/configs/cluster/namespaces/instance/sandbox/kustomization.yaml index 7849497c..e1446b76 100644 --- a/components/configs/namespaces/instance/sandbox/kustomization.yaml +++ b/components/configs/cluster/namespaces/instance/sandbox/kustomization.yaml @@ -1,6 +1,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +namespace: sandbox + resources: # - group-admin.yaml - limit-range.yaml diff --git a/components/configs/namespaces/instance/sandbox/limit-range.yaml b/components/configs/cluster/namespaces/instance/sandbox/limit-range.yaml similarity index 85% rename from components/configs/namespaces/instance/sandbox/limit-range.yaml rename to components/configs/cluster/namespaces/instance/sandbox/limit-range.yaml index 1d32e2fc..91dc4392 100644 --- a/components/configs/namespaces/instance/sandbox/limit-range.yaml +++ b/components/configs/cluster/namespaces/instance/sandbox/limit-range.yaml @@ -2,12 +2,11 @@ apiVersion: v1 kind: LimitRange metadata: name: limit-range - namespace: sandbox spec: limits: - type: Container default: - memory: 1Gi + memory: 2Gi cpu: 500m defaultRequest: memory: 256Mi diff --git a/components/configs/namespaces/instance/sandbox/namespace.yaml b/components/configs/cluster/namespaces/instance/sandbox/namespace.yaml similarity index 77% rename from components/configs/namespaces/instance/sandbox/namespace.yaml rename to components/configs/cluster/namespaces/instance/sandbox/namespace.yaml index e51d2e25..50d074db 100644 --- a/components/configs/namespaces/instance/sandbox/namespace.yaml +++ b/components/configs/cluster/namespaces/instance/sandbox/namespace.yaml @@ -7,5 +7,3 @@ metadata: Try your ideas here. Reset weekly on Saturday openshift.io/display-name: Sandbox - labels: - argocd.argoproj.io/managed-by: cluster-config \ No newline at end of file diff --git a/components/configs/namespaces/instance/sandbox/quota.yaml b/components/configs/cluster/namespaces/instance/sandbox/quota.yaml similarity index 56% rename from components/configs/namespaces/instance/sandbox/quota.yaml rename to components/configs/cluster/namespaces/instance/sandbox/quota.yaml index ba702d3b..7e96915d 100644 --- a/components/configs/namespaces/instance/sandbox/quota.yaml +++ b/components/configs/cluster/namespaces/instance/sandbox/quota.yaml @@ -10,13 +10,23 @@ spec: # requests.memory: 1Gi limits.cpu: '32' limits.memory: 128Gi + requests.nvidia.com/gpu: '0' --- apiVersion: v1 kind: ResourceQuota metadata: name: quota-storage - namespace: sandbox spec: hard: - requests.storage: 20Gi + requests.storage: 40Gi persistentvolumeclaims: '40' +--- +apiVersion: v1 +kind: ResourceQuota +metadata: + name: quota-objects +spec: + hard: + count/sealedsecrets.bitnami.com: '0' + count/cronjobs.batch: '4' + count/daemonsets.apps: '0' \ No newline at end of file diff --git a/components/configs/namespaces/instance/sandbox/rolebinding-edit.yaml b/components/configs/cluster/namespaces/instance/sandbox/rolebinding-edit.yaml similarity index 92% rename from components/configs/namespaces/instance/sandbox/rolebinding-edit.yaml rename to components/configs/cluster/namespaces/instance/sandbox/rolebinding-edit.yaml index ff1585ed..2afd80c3 100644 --- a/components/configs/namespaces/instance/sandbox/rolebinding-edit.yaml +++ b/components/configs/cluster/namespaces/instance/sandbox/rolebinding-edit.yaml @@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: name: edit - namespace: sandbox roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole diff --git a/components/configs/namespaces/instance/template/group-admin.yaml b/components/configs/cluster/namespaces/instance/template/group-admin.yaml similarity index 100% rename from components/configs/namespaces/instance/template/group-admin.yaml rename to components/configs/cluster/namespaces/instance/template/group-admin.yaml diff --git a/components/configs/namespaces/instance/template/kustomization.yaml b/components/configs/cluster/namespaces/instance/template/kustomization.yaml similarity index 100% rename from components/configs/namespaces/instance/template/kustomization.yaml rename to components/configs/cluster/namespaces/instance/template/kustomization.yaml diff --git a/components/configs/namespaces/instance/template/limit-range.yaml b/components/configs/cluster/namespaces/instance/template/limit-range.yaml similarity index 100% rename from components/configs/namespaces/instance/template/limit-range.yaml rename to components/configs/cluster/namespaces/instance/template/limit-range.yaml diff --git a/components/configs/namespaces/instance/template/namespace.yaml b/components/configs/cluster/namespaces/instance/template/namespace.yaml similarity index 100% rename from components/configs/namespaces/instance/template/namespace.yaml rename to components/configs/cluster/namespaces/instance/template/namespace.yaml diff --git a/components/configs/namespaces/instance/template/quota.yaml b/components/configs/cluster/namespaces/instance/template/quota.yaml similarity index 100% rename from components/configs/namespaces/instance/template/quota.yaml rename to components/configs/cluster/namespaces/instance/template/quota.yaml diff --git a/components/configs/namespaces/instance/template/rolebinding-edit.yaml b/components/configs/cluster/namespaces/instance/template/rolebinding-edit.yaml similarity index 100% rename from components/configs/namespaces/instance/template/rolebinding-edit.yaml rename to components/configs/cluster/namespaces/instance/template/rolebinding-edit.yaml diff --git a/components/configs/namespaces/overlays/default-limited/kustomization.yaml b/components/configs/cluster/namespaces/overlays/default-limited/kustomization.yaml similarity index 100% rename from components/configs/namespaces/overlays/default-limited/kustomization.yaml rename to components/configs/cluster/namespaces/overlays/default-limited/kustomization.yaml diff --git a/components/configs/namespaces/overlays/default/kustomization.yaml b/components/configs/cluster/namespaces/overlays/default/kustomization.yaml similarity index 89% rename from components/configs/namespaces/overlays/default/kustomization.yaml rename to components/configs/cluster/namespaces/overlays/default/kustomization.yaml index 8f26eb01..967278a9 100644 --- a/components/configs/namespaces/overlays/default/kustomization.yaml +++ b/components/configs/cluster/namespaces/overlays/default/kustomization.yaml @@ -1,6 +1,9 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +commonLabels: + namespaces: default + resources: - ../../base - ../../instance/sandbox diff --git a/components/configs/namespaces/overlays/team/kustomization.yaml b/components/configs/cluster/namespaces/overlays/team/kustomization.yaml similarity index 100% rename from components/configs/namespaces/overlays/team/kustomization.yaml rename to components/configs/cluster/namespaces/overlays/team/kustomization.yaml diff --git a/components/configs/rbac/base/99-master-ssh-machineconfig.yaml b/components/configs/cluster/rbac/base/99-master-ssh-machineconfig.yaml similarity index 84% rename from components/configs/rbac/base/99-master-ssh-machineconfig.yaml rename to components/configs/cluster/rbac/base/99-master-ssh-machineconfig.yaml index 8ba7cdce..a9388e31 100644 --- a/components/configs/rbac/base/99-master-ssh-machineconfig.yaml +++ b/components/configs/cluster/rbac/base/99-master-ssh-machineconfig.yaml @@ -12,4 +12,4 @@ spec: users: - name: core sshAuthorizedKeys: - - "# authorized_keys managed by argocd" \ No newline at end of file + - "# authorized_keys need to be patched" diff --git a/components/configs/rbac/base/99-worker-ssh-machineconfig.yaml b/components/configs/cluster/rbac/base/99-worker-ssh-machineconfig.yaml similarity index 84% rename from components/configs/rbac/base/99-worker-ssh-machineconfig.yaml rename to components/configs/cluster/rbac/base/99-worker-ssh-machineconfig.yaml index 6bb20580..3f3736f7 100644 --- a/components/configs/rbac/base/99-worker-ssh-machineconfig.yaml +++ b/components/configs/cluster/rbac/base/99-worker-ssh-machineconfig.yaml @@ -12,4 +12,4 @@ spec: users: - name: core sshAuthorizedKeys: - - "# authorized_keys managed by argocd" \ No newline at end of file + - "# authorized_keys need to be patched" diff --git a/components/configs/rbac/base/cluster-admins-group.yaml b/components/configs/cluster/rbac/base/cluster-admins-group.yaml similarity index 100% rename from components/configs/rbac/base/cluster-admins-group.yaml rename to components/configs/cluster/rbac/base/cluster-admins-group.yaml diff --git a/components/configs/rbac/base/cluster-admins-rolebinding.yaml b/components/configs/cluster/rbac/base/cluster-admins-rolebinding.yaml similarity index 100% rename from components/configs/rbac/base/cluster-admins-rolebinding.yaml rename to components/configs/cluster/rbac/base/cluster-admins-rolebinding.yaml diff --git a/components/configs/rbac/base/cluster-readers-group.yaml b/components/configs/cluster/rbac/base/cluster-readers-group.yaml similarity index 100% rename from components/configs/rbac/base/cluster-readers-group.yaml rename to components/configs/cluster/rbac/base/cluster-readers-group.yaml diff --git a/components/configs/rbac/base/cluster-readers-rolebinding.yaml b/components/configs/cluster/rbac/base/cluster-readers-rolebinding.yaml similarity index 100% rename from components/configs/rbac/base/cluster-readers-rolebinding.yaml rename to components/configs/cluster/rbac/base/cluster-readers-rolebinding.yaml diff --git a/components/configs/rbac/base/kustomization.yaml b/components/configs/cluster/rbac/base/kustomization.yaml similarity index 100% rename from components/configs/rbac/base/kustomization.yaml rename to components/configs/cluster/rbac/base/kustomization.yaml diff --git a/components/configs/rbac/overlays/rhdp/cluster-admins-custom-group.yaml b/components/configs/cluster/rbac/overlays/default/cluster-admins-custom-group.yaml similarity index 100% rename from components/configs/rbac/overlays/rhdp/cluster-admins-custom-group.yaml rename to components/configs/cluster/rbac/overlays/default/cluster-admins-custom-group.yaml diff --git a/components/configs/rbac/overlays/default/cluster-admins-custom-rolebinding.yaml b/components/configs/cluster/rbac/overlays/default/cluster-admins-custom-rolebinding.yaml similarity index 100% rename from components/configs/rbac/overlays/default/cluster-admins-custom-rolebinding.yaml rename to components/configs/cluster/rbac/overlays/default/cluster-admins-custom-rolebinding.yaml diff --git a/components/configs/rbac/overlays/default/cluster-readers-custom-group.yaml b/components/configs/cluster/rbac/overlays/default/cluster-readers-custom-group.yaml similarity index 100% rename from components/configs/rbac/overlays/default/cluster-readers-custom-group.yaml rename to components/configs/cluster/rbac/overlays/default/cluster-readers-custom-group.yaml diff --git a/components/configs/rbac/overlays/default/cluster-readers-custom-rolebinding.yaml b/components/configs/cluster/rbac/overlays/default/cluster-readers-custom-rolebinding.yaml similarity index 100% rename from components/configs/rbac/overlays/default/cluster-readers-custom-rolebinding.yaml rename to components/configs/cluster/rbac/overlays/default/cluster-readers-custom-rolebinding.yaml diff --git a/components/configs/rbac/overlays/testing/kustomization.yaml b/components/configs/cluster/rbac/overlays/default/kustomization.yaml similarity index 54% rename from components/configs/rbac/overlays/testing/kustomization.yaml rename to components/configs/cluster/rbac/overlays/default/kustomization.yaml index c752bfd3..f7aa9d6f 100644 --- a/components/configs/rbac/overlays/testing/kustomization.yaml +++ b/components/configs/cluster/rbac/overlays/default/kustomization.yaml @@ -16,16 +16,4 @@ patches: version: v1 kind: MachineConfig name: 99-worker-ssh - path: patch-ssh.yaml - - target: - group: user.openshift.io - version: v1 - kind: Group - name: cluster-admins - path: patch-cluster-admins-group.yaml - - target: - group: user.openshift.io - version: v1 - kind: Group - name: cluster-readers - path: patch-cluster-readers-group.yaml + path: patch-ssh.yaml \ No newline at end of file diff --git a/components/configs/rbac/overlays/default/patch-cluster-admins-group.yaml b/components/configs/cluster/rbac/overlays/default/patch-cluster-admins-group.yaml similarity index 100% rename from components/configs/rbac/overlays/default/patch-cluster-admins-group.yaml rename to components/configs/cluster/rbac/overlays/default/patch-cluster-admins-group.yaml diff --git a/components/configs/rbac/overlays/default/patch-cluster-readers-group.yaml b/components/configs/cluster/rbac/overlays/default/patch-cluster-readers-group.yaml similarity index 100% rename from components/configs/rbac/overlays/default/patch-cluster-readers-group.yaml rename to components/configs/cluster/rbac/overlays/default/patch-cluster-readers-group.yaml diff --git a/components/configs/cluster/rbac/overlays/default/patch-ssh.yaml b/components/configs/cluster/rbac/overlays/default/patch-ssh.yaml new file mode 100644 index 00000000..4ed2b6cc --- /dev/null +++ b/components/configs/cluster/rbac/overlays/default/patch-ssh.yaml @@ -0,0 +1,30 @@ +- op: remove + path: /spec/config/passwd/users/0/sshAuthorizedKeys/0 + +- op: add + path: /spec/config/passwd/users/0/sshAuthorizedKeys/- + value: >- + ssh-rsa + AAAAB3NzaC1yc2EAAAADAQABAAABgQC5Ydtf2FA4Pj48KO7bhg0X3OWOA9Fx38RcCMumr+s6Pr4T30tbdp9qyu4036yl4wUoXMKQW5Ql5pKBy+6APdG/E7xAf8W9IV1MKxuwtg9kuYKmKL9YbPZ4C37p/OaudZp2iiubBxCDa4CM7sX+DgUKq7uVCH0L1ukYqwciv9eF4FRSK4ARn+TQ8Zx3tMX/VTUniriDKOBbTWqQpqPTxT+oW5hypEtei89si8jB/7wtm1TngzQlVOcHYCT/x14r0INJJpX8gvkEr7f1aZPwsPsULxYrskuitXEK0MzZcRjh6xtVq5e/8T6M1pdY4k4m7BK6m5NY1prL25ELtuOYYgJAfpuUc0z+pt0mhGv5CbFAf86E4VkIWn1wo7GbtSKgc8p0TeCOYQIslzN1MH8O/BZW1WyAsQJXaodfoAbm0UTsP32G+1mzM1d4yL8smw1SJdg+BbCAtVBhMaELMI3993jkO93RM/KNNYKNQKU1krC3+HuxYtGqnBb5TTDXMTvg/FU= + cory@macntoss + +- op: add + path: /spec/config/passwd/users/0/sshAuthorizedKeys/- + value: >- + ssh-rsa + AAAAB3NzaC1yc2EAAAADAQABAAABgQC4YQz9vhWtFC89pW+OdIjtngtYqoVHWfUQpqWqrS1OvvxFBGhMtA+AHd6er2rwXg+yg9v0vs9HJoHI0zzBueGy9zgeqZ73MydGLWSRkUZT/j345zz0z+lc9wgneUBn9gp1h7BBMajsrMVH+9xW+llsU7/CFOi8PAAF+DymBmUmvZU6Wvo+6JctO89p4dGZd+L1a9dbHbIO3crI+pc+JGooH16gdqnLUI/ZB1NencFezN5Wihkyazh2PvDr33TIXukzc2arpRcfW8rDWddFI661ieHjjHNaONohU7GRCUUgOor1a9Wy9U2goJ2BFuMpSrLu72HV9xjw0Q6Gqbp+zpJ7Yayg9NgtaPNCM7vAV+5u36Ip3/ADpXG2o5OKsg7uW0EvB3UdduPy10j+fyRzBmvAORBjdkHAssjRVZgYO0GsOPxW2RJHZY7xprm8CfvsJxLOy6tkh+dMZ9ufuWiYVbIHb536kz3W/c2f+DFsjVRPUee11r5LNZ/XO4xx7QpYIxc= + cory@kowdora + +- op: add + path: /spec/config/passwd/users/0/sshAuthorizedKeys/- + value: >- + ssh-rsa + AAAAB3NzaC1yc2EAAAADAQABAAABgQCiDkivcV1aY1A95hZ1Zmz0I5DRApnJ2ratLrXJ5Ty5pT/6IgukkSKjdcXEMYkjln7pN+7zNUJ0IOJVSHdmBIJtQeSg0BjYYIgybJiTXBT60vBIxop5f6dYYUFNeQtdxDYIBrkBNmkOoTF9WDVpjFV2QqIs2My0YY+CUVyxNLx7DZAYCg5ncD9dxLkvvuTh9F6+xt75+Z/lM/Y1WD9vqVSYlvPV8IZhL6ln3h2asZgjWYkwVW5gk5uQd2aLacMBd8BgcOgOvBo8XeRGtqHvmVqqMDuml3SuzB4fjSkwHO2NTwMvy1rJ/Z8on4j6aXl9AFqFWED682V5Ij4+n311azHhwL7x8FHipnN5m4eG7RD0fTvqzOPTOI43RsccUUOfOtAaVwBZ8QboZRxboQwZ1VZobCw0EzMAxvWhTSg/YNZnQaCb29mHF3mNjupxPd/Q38L9SLM1dIEQU/dgfe/Na2Ok8nNbRIyyplccq4LZgy1dG7/BvHBpG5fquwZKtvHrdQs= + cory@kowbuntu + +- op: add + path: /spec/config/passwd/users/0/sshAuthorizedKeys/- + value: >- + ssh-rsa + AAAAB3NzaC1yc2EAAAADAQABAAACAQCm1+pkpakcPp10Ql7TzTnvdhzenq5nuFa8MvOD/WeQPa36pJZQWeppkPZaxWfQzSmr8+/16nYgt1uWLiD/rlYsq5gNpGfA8Xk7Z6aUU6zfG8RDAhd9d8wgVCzeXrYj8z9FtzhdFTUfJZQkbgUu3kxAIXu0c66LsJ9C1fHI2bDRcVhYMk3ugFJWrpG0FPSOhE7CSwNHzeQcnPscjUq4w40nke90RnHtt4OgHD7dMW+clUT19kE7Jg9GSkbNrcTSH0JudXHApC49QfNnaKEn58y4hL6DnDViveNOu6ajki5JVUJAG550tw4NNBGZzq66masuHI3Jq4iTYzRYf802SiS/ylxwEWClxwmkor5MrhbVgMA8Jt3ijOdbDFs5DD6QGoIfFj2RsEtPxg8UXu6bYn2I14GlBIGpxmg7a+Gtsl0hgqMgPEbwjregOf7MqvQ6fg5pQHlMSxrNdqs5mfF2xqD7QptBdOBKaVDw9GJZaoO4ehEUSeAJIARBf+59THjvVm1zA/a7ZA2i+wb/fPCGvdSjb9M/4X/c8k0ySGym/wtwap+9lYUMaKU4zKsfx2Kjv57g5i5cEFneRbInZXaTaG8gxRyPend+VaLFcHOyL1hXoxApri5wVELZCjUxdlk9QNc5gUdKL/8c5TfzrfMjMly8Rlvd8GdATD8r9uoWglPtWw== + cory@pi diff --git a/components/configs/rbac/overlays/default/cluster-admins-custom-group.yaml b/components/configs/cluster/rbac/overlays/rhdp/cluster-admins-custom-group.yaml similarity index 91% rename from components/configs/rbac/overlays/default/cluster-admins-custom-group.yaml rename to components/configs/cluster/rbac/overlays/rhdp/cluster-admins-custom-group.yaml index 3119a73c..59c56f23 100644 --- a/components/configs/rbac/overlays/default/cluster-admins-custom-group.yaml +++ b/components/configs/cluster/rbac/overlays/rhdp/cluster-admins-custom-group.yaml @@ -4,3 +4,4 @@ metadata: name: cluster-admins-custom users: - opentlc-mgr + - admin diff --git a/components/configs/rbac/overlays/rhdp/cluster-admins-custom-rolebinding.yaml b/components/configs/cluster/rbac/overlays/rhdp/cluster-admins-custom-rolebinding.yaml similarity index 100% rename from components/configs/rbac/overlays/rhdp/cluster-admins-custom-rolebinding.yaml rename to components/configs/cluster/rbac/overlays/rhdp/cluster-admins-custom-rolebinding.yaml diff --git a/components/configs/rbac/overlays/rhdp/cluster-readers-custom-group.yaml b/components/configs/cluster/rbac/overlays/rhdp/cluster-readers-custom-group.yaml similarity index 100% rename from components/configs/rbac/overlays/rhdp/cluster-readers-custom-group.yaml rename to components/configs/cluster/rbac/overlays/rhdp/cluster-readers-custom-group.yaml diff --git a/components/configs/rbac/overlays/rhdp/cluster-readers-custom-rolebinding.yaml b/components/configs/cluster/rbac/overlays/rhdp/cluster-readers-custom-rolebinding.yaml similarity index 100% rename from components/configs/rbac/overlays/rhdp/cluster-readers-custom-rolebinding.yaml rename to components/configs/cluster/rbac/overlays/rhdp/cluster-readers-custom-rolebinding.yaml diff --git a/components/configs/rbac/overlays/rhdp/kustomization.yaml b/components/configs/cluster/rbac/overlays/rhdp/kustomization.yaml similarity index 100% rename from components/configs/rbac/overlays/rhdp/kustomization.yaml rename to components/configs/cluster/rbac/overlays/rhdp/kustomization.yaml diff --git a/components/configs/rbac/overlays/default/patch-ssh.yaml b/components/configs/cluster/rbac/overlays/rhdp/patch-ssh.yaml similarity index 100% rename from components/configs/rbac/overlays/default/patch-ssh.yaml rename to components/configs/cluster/rbac/overlays/rhdp/patch-ssh.yaml diff --git a/components/demos/instance/smart-cities/kustomization.yaml b/components/configs/cluster/web-terminal/base/kustomization.yaml similarity index 64% rename from components/demos/instance/smart-cities/kustomization.yaml rename to components/configs/cluster/web-terminal/base/kustomization.yaml index 99a3ea29..00edbc0d 100644 --- a/components/demos/instance/smart-cities/kustomization.yaml +++ b/components/configs/cluster/web-terminal/base/kustomization.yaml @@ -2,5 +2,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - namespace.yaml - - namespace-rb.yaml + - web-terminal-tooling.yaml diff --git a/components/configs/cluster/web-terminal/base/web-terminal-tooling.yaml b/components/configs/cluster/web-terminal/base/web-terminal-tooling.yaml new file mode 100644 index 00000000..a1eb3cd3 --- /dev/null +++ b/components/configs/cluster/web-terminal/base/web-terminal-tooling.yaml @@ -0,0 +1,24 @@ +apiVersion: workspace.devfile.io/v1alpha2 +kind: DevWorkspaceTemplate +metadata: + annotations: + controller.devfile.io/allow-import-from: '*' + name: web-terminal-tooling + namespace: openshift-operators + labels: + console.openshift.io/terminal: 'true' +spec: + components: + - container: + args: + - tail + - '-f' + - /dev/null + cpuLimit: 400m + cpuRequest: 100m + image: registry.redhat.io/web-terminal/web-terminal-tooling-rhel8@sha256:657874adad93a9e6c2b746b836015de410d2e280f85c079c81e24ae81343fa6c + memoryLimit: 256Mi + memoryRequest: 128Mi + mountSources: false + sourceMapping: /projects + name: web-terminal-tooling diff --git a/components/configs/rbac/overlays/default/kustomization.yaml b/components/configs/cluster/web-terminal/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/rbac/overlays/default/kustomization.yaml rename to components/configs/cluster/web-terminal/overlays/default/kustomization.yaml diff --git a/components/configs/cluster/web-terminal/overlays/enhanced/kustomization.yaml b/components/configs/cluster/web-terminal/overlays/enhanced/kustomization.yaml new file mode 100644 index 00000000..49b9da0e --- /dev/null +++ b/components/configs/cluster/web-terminal/overlays/enhanced/kustomization.yaml @@ -0,0 +1,44 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../default + +patches: + - target: + group: workspace.devfile.io + kind: DevWorkspaceTemplate + patch: |- + - op: replace + path: /spec/components/0/container/args + value: + - "/bin/bash" + - "-c" + - | + #!/bin/bash + GIT_REPO=https://github.com/codekow/demo-ai-gitops-catalog.git + + git clone "${GIT_REPO}" gitops + + cd gitops + . scripts/functions.sh + + check_bin busybox + check_bin rclone + check_bin restic + + echo " + echo + echo 'This terminal has been enhanced.' + echo See ${GIT_REPO} + + cd gitops; . scripts/functions.sh; cd .. + + pc(){ + git name-rev --name-only @ 2>/dev/null + } + + PS1='\e];\s\a\n\e[33m\w \e[36m\$(pc)\e[m$ ' + " >> ~/.bashrc + + sleep infinity diff --git a/components/demos/instance/airflow/Chart.yaml b/components/configs/kustomized/airflow/Chart.yaml similarity index 100% rename from components/demos/instance/airflow/Chart.yaml rename to components/configs/kustomized/airflow/Chart.yaml diff --git a/components/demos/instance/airflow/README.md b/components/configs/kustomized/airflow/README.md similarity index 100% rename from components/demos/instance/airflow/README.md rename to components/configs/kustomized/airflow/README.md diff --git a/components/demos/instance/airflow/app-airflow.yaml b/components/configs/kustomized/airflow/app-airflow.yaml similarity index 100% rename from components/demos/instance/airflow/app-airflow.yaml rename to components/configs/kustomized/airflow/app-airflow.yaml diff --git a/components/demos/instance/airflow/get_helm.sh b/components/configs/kustomized/airflow/get_helm.sh similarity index 100% rename from components/demos/instance/airflow/get_helm.sh rename to components/configs/kustomized/airflow/get_helm.sh diff --git a/components/demos/instance/airflow/kustomization.yaml b/components/configs/kustomized/airflow/kustomization.yaml similarity index 100% rename from components/demos/instance/airflow/kustomization.yaml rename to components/configs/kustomized/airflow/kustomization.yaml diff --git a/components/demos/instance/airflow/values.yaml b/components/configs/kustomized/airflow/values.yaml similarity index 100% rename from components/demos/instance/airflow/values.yaml rename to components/configs/kustomized/airflow/values.yaml diff --git a/components/configs/custom-images/README.md b/components/configs/kustomized/custom-images/README.md similarity index 100% rename from components/configs/custom-images/README.md rename to components/configs/kustomized/custom-images/README.md diff --git a/components/configs/custom-images/s2i-r-shiny.yaml b/components/configs/kustomized/custom-images/s2i-r-shiny.yaml similarity index 100% rename from components/configs/custom-images/s2i-r-shiny.yaml rename to components/configs/kustomized/custom-images/s2i-r-shiny.yaml diff --git a/components/demos/instance/custom-notebook-images/README.md b/components/configs/kustomized/custom-notebook-images/README.md similarity index 100% rename from components/demos/instance/custom-notebook-images/README.md rename to components/configs/kustomized/custom-notebook-images/README.md diff --git a/components/demos/instance/custom-notebook-images/code-server/imagestream.yaml b/components/configs/kustomized/custom-notebook-images/code-server/imagestream.yaml similarity index 100% rename from components/demos/instance/custom-notebook-images/code-server/imagestream.yaml rename to components/configs/kustomized/custom-notebook-images/code-server/imagestream.yaml diff --git a/components/demos/instance/custom-notebook-images/code-server/kustomization.yaml b/components/configs/kustomized/custom-notebook-images/code-server/kustomization.yaml similarity index 100% rename from components/demos/instance/custom-notebook-images/code-server/kustomization.yaml rename to components/configs/kustomized/custom-notebook-images/code-server/kustomization.yaml diff --git a/components/demos/instance/custom-notebook-images/kustomization.yaml b/components/configs/kustomized/custom-notebook-images/kustomization.yaml similarity index 100% rename from components/demos/instance/custom-notebook-images/kustomization.yaml rename to components/configs/kustomized/custom-notebook-images/kustomization.yaml diff --git a/components/demos/instance/custom-notebook-images/lightgbm/Containerfile b/components/configs/kustomized/custom-notebook-images/lightgbm/Containerfile similarity index 100% rename from components/demos/instance/custom-notebook-images/lightgbm/Containerfile rename to components/configs/kustomized/custom-notebook-images/lightgbm/Containerfile diff --git a/components/demos/instance/custom-notebook-images/lightgbm/Pipfile b/components/configs/kustomized/custom-notebook-images/lightgbm/Pipfile similarity index 100% rename from components/demos/instance/custom-notebook-images/lightgbm/Pipfile rename to components/configs/kustomized/custom-notebook-images/lightgbm/Pipfile diff --git a/components/demos/instance/custom-notebook-images/lightgbm/Pipfile.lock b/components/configs/kustomized/custom-notebook-images/lightgbm/Pipfile.lock similarity index 100% rename from components/demos/instance/custom-notebook-images/lightgbm/Pipfile.lock rename to components/configs/kustomized/custom-notebook-images/lightgbm/Pipfile.lock diff --git a/components/demos/instance/custom-notebook-images/lightgbm/buildconfig.yml b/components/configs/kustomized/custom-notebook-images/lightgbm/buildconfig.yml similarity index 100% rename from components/demos/instance/custom-notebook-images/lightgbm/buildconfig.yml rename to components/configs/kustomized/custom-notebook-images/lightgbm/buildconfig.yml diff --git a/components/demos/instance/custom-notebook-images/lightgbm/imagestream.yml b/components/configs/kustomized/custom-notebook-images/lightgbm/imagestream.yml similarity index 100% rename from components/demos/instance/custom-notebook-images/lightgbm/imagestream.yml rename to components/configs/kustomized/custom-notebook-images/lightgbm/imagestream.yml diff --git a/components/demos/instance/custom-notebook-images/lightgbm/kustomization.yaml b/components/configs/kustomized/custom-notebook-images/lightgbm/kustomization.yaml similarity index 100% rename from components/demos/instance/custom-notebook-images/lightgbm/kustomization.yaml rename to components/configs/kustomized/custom-notebook-images/lightgbm/kustomization.yaml diff --git a/components/demos/instance/custom-notebook-images/namespace-rb.yaml b/components/configs/kustomized/custom-notebook-images/namespace-rb.yaml similarity index 100% rename from components/demos/instance/custom-notebook-images/namespace-rb.yaml rename to components/configs/kustomized/custom-notebook-images/namespace-rb.yaml diff --git a/components/demos/instance/custom-notebook-images/namespace.yaml b/components/configs/kustomized/custom-notebook-images/namespace.yaml similarity index 100% rename from components/demos/instance/custom-notebook-images/namespace.yaml rename to components/configs/kustomized/custom-notebook-images/namespace.yaml diff --git a/components/demos/instance/custom-notebook-images/opencv/Containerfile b/components/configs/kustomized/custom-notebook-images/opencv/Containerfile similarity index 100% rename from components/demos/instance/custom-notebook-images/opencv/Containerfile rename to components/configs/kustomized/custom-notebook-images/opencv/Containerfile diff --git a/components/demos/instance/custom-notebook-images/opencv/buildconfig-graphviz.yaml b/components/configs/kustomized/custom-notebook-images/opencv/buildconfig-graphviz.yaml similarity index 100% rename from components/demos/instance/custom-notebook-images/opencv/buildconfig-graphviz.yaml rename to components/configs/kustomized/custom-notebook-images/opencv/buildconfig-graphviz.yaml diff --git a/components/demos/instance/custom-notebook-images/opencv/buildconfig.yaml b/components/configs/kustomized/custom-notebook-images/opencv/buildconfig.yaml similarity index 100% rename from components/demos/instance/custom-notebook-images/opencv/buildconfig.yaml rename to components/configs/kustomized/custom-notebook-images/opencv/buildconfig.yaml diff --git a/components/demos/instance/custom-notebook-images/opencv/imagestream.yaml b/components/configs/kustomized/custom-notebook-images/opencv/imagestream.yaml similarity index 100% rename from components/demos/instance/custom-notebook-images/opencv/imagestream.yaml rename to components/configs/kustomized/custom-notebook-images/opencv/imagestream.yaml diff --git a/components/demos/instance/custom-notebook-images/opencv/kustomization.yaml b/components/configs/kustomized/custom-notebook-images/opencv/kustomization.yaml similarity index 100% rename from components/demos/instance/custom-notebook-images/opencv/kustomization.yaml rename to components/configs/kustomized/custom-notebook-images/opencv/kustomization.yaml diff --git a/components/demos/instance/custom-notebook-images/rstudio/imagestream.yaml b/components/configs/kustomized/custom-notebook-images/rstudio/imagestream.yaml similarity index 100% rename from components/demos/instance/custom-notebook-images/rstudio/imagestream.yaml rename to components/configs/kustomized/custom-notebook-images/rstudio/imagestream.yaml diff --git a/components/demos/instance/custom-notebook-images/rstudio/kustomization.yaml b/components/configs/kustomized/custom-notebook-images/rstudio/kustomization.yaml similarity index 100% rename from components/demos/instance/custom-notebook-images/rstudio/kustomization.yaml rename to components/configs/kustomized/custom-notebook-images/rstudio/kustomization.yaml diff --git a/components/demos/instance/datasci-pipelines/README.md b/components/configs/kustomized/datasci-pipelines/README.md similarity index 100% rename from components/demos/instance/datasci-pipelines/README.md rename to components/configs/kustomized/datasci-pipelines/README.md diff --git a/components/demos/instance/datasci-pipelines/dspa.yaml b/components/configs/kustomized/datasci-pipelines/dspa.yaml similarity index 100% rename from components/demos/instance/datasci-pipelines/dspa.yaml rename to components/configs/kustomized/datasci-pipelines/dspa.yaml diff --git a/components/demos/instance/datasci-pipelines/kustomization.yaml b/components/configs/kustomized/datasci-pipelines/kustomization.yaml similarity index 100% rename from components/demos/instance/datasci-pipelines/kustomization.yaml rename to components/configs/kustomized/datasci-pipelines/kustomization.yaml diff --git a/components/demos/instance/datasci-pipelines/requirements.txt b/components/configs/kustomized/datasci-pipelines/requirements.txt similarity index 100% rename from components/demos/instance/datasci-pipelines/requirements.txt rename to components/configs/kustomized/datasci-pipelines/requirements.txt diff --git a/components/demos/instance/datasci-project/kustomization.yaml b/components/configs/kustomized/datasci-project/kustomization.yaml similarity index 100% rename from components/demos/instance/datasci-project/kustomization.yaml rename to components/configs/kustomized/datasci-project/kustomization.yaml diff --git a/components/demos/instance/datasci-project/minio-secret.yaml b/components/configs/kustomized/datasci-project/minio-secret.yaml similarity index 100% rename from components/demos/instance/datasci-project/minio-secret.yaml rename to components/configs/kustomized/datasci-project/minio-secret.yaml diff --git a/components/demos/instance/datasci-project/namespace.yaml b/components/configs/kustomized/datasci-project/namespace.yaml similarity index 100% rename from components/demos/instance/datasci-project/namespace.yaml rename to components/configs/kustomized/datasci-project/namespace.yaml diff --git a/components/configs/dev-catalog/devfile.yaml b/components/configs/kustomized/dev-catalog/builder-image.yaml similarity index 100% rename from components/configs/dev-catalog/devfile.yaml rename to components/configs/kustomized/dev-catalog/builder-image.yaml diff --git a/components/configs/dev-catalog/template.yaml b/components/configs/kustomized/dev-catalog/devfile.yaml similarity index 100% rename from components/configs/dev-catalog/template.yaml rename to components/configs/kustomized/dev-catalog/devfile.yaml diff --git a/components/configs/dev-catalog/helm-codekow-repo.yaml b/components/configs/kustomized/dev-catalog/helm-codekow-repo.yaml similarity index 100% rename from components/configs/dev-catalog/helm-codekow-repo.yaml rename to components/configs/kustomized/dev-catalog/helm-codekow-repo.yaml diff --git a/components/demos/instance/pipeline-images/s2i-build-ingest.yaml b/components/configs/kustomized/dev-catalog/template.yaml similarity index 100% rename from components/demos/instance/pipeline-images/s2i-build-ingest.yaml rename to components/configs/kustomized/dev-catalog/template.yaml diff --git a/components/demos/instance/kafka/base/edit-rolebinding.yaml b/components/configs/kustomized/kafka/base/edit-rolebinding.yaml similarity index 100% rename from components/demos/instance/kafka/base/edit-rolebinding.yaml rename to components/configs/kustomized/kafka/base/edit-rolebinding.yaml diff --git a/components/demos/instance/kafka/base/kafka-cluster-config.yaml b/components/configs/kustomized/kafka/base/kafka-cluster-config.yaml similarity index 100% rename from components/demos/instance/kafka/base/kafka-cluster-config.yaml rename to components/configs/kustomized/kafka/base/kafka-cluster-config.yaml diff --git a/components/demos/instance/kafka/base/kustomization.yaml b/components/configs/kustomized/kafka/base/kustomization.yaml similarity index 100% rename from components/demos/instance/kafka/base/kustomization.yaml rename to components/configs/kustomized/kafka/base/kustomization.yaml diff --git a/components/demos/instance/kafka/base/namespace.yaml b/components/configs/kustomized/kafka/base/namespace.yaml similarity index 100% rename from components/demos/instance/kafka/base/namespace.yaml rename to components/configs/kustomized/kafka/base/namespace.yaml diff --git a/components/demos/instance/kafka/overlays/default/kustomization.yaml b/components/configs/kustomized/kafka/overlays/default/kustomization.yaml similarity index 100% rename from components/demos/instance/kafka/overlays/default/kustomization.yaml rename to components/configs/kustomized/kafka/overlays/default/kustomization.yaml diff --git a/components/demos/instance/kafka/overlays/kafdrop/app-kafdrop.yaml b/components/configs/kustomized/kafka/overlays/kafdrop/app-kafdrop.yaml similarity index 100% rename from components/demos/instance/kafka/overlays/kafdrop/app-kafdrop.yaml rename to components/configs/kustomized/kafka/overlays/kafdrop/app-kafdrop.yaml diff --git a/components/demos/instance/kafka/overlays/kafdrop/kafdrop-route.yaml b/components/configs/kustomized/kafka/overlays/kafdrop/kafdrop-route.yaml similarity index 100% rename from components/demos/instance/kafka/overlays/kafdrop/kafdrop-route.yaml rename to components/configs/kustomized/kafka/overlays/kafdrop/kafdrop-route.yaml diff --git a/components/demos/instance/kafka/overlays/kafdrop/kustomization.yaml b/components/configs/kustomized/kafka/overlays/kafdrop/kustomization.yaml similarity index 100% rename from components/demos/instance/kafka/overlays/kafdrop/kustomization.yaml rename to components/configs/kustomized/kafka/overlays/kafdrop/kustomization.yaml diff --git a/components/demos/instance/minio/deployment.yaml b/components/configs/kustomized/minio/deployment.yaml similarity index 100% rename from components/demos/instance/minio/deployment.yaml rename to components/configs/kustomized/minio/deployment.yaml diff --git a/components/demos/instance/minio/kustomization.yaml b/components/configs/kustomized/minio/kustomization.yaml similarity index 100% rename from components/demos/instance/minio/kustomization.yaml rename to components/configs/kustomized/minio/kustomization.yaml diff --git a/components/demos/instance/minio/namespace.yaml b/components/configs/kustomized/minio/namespace.yaml similarity index 100% rename from components/demos/instance/minio/namespace.yaml rename to components/configs/kustomized/minio/namespace.yaml diff --git a/components/demos/instance/minio/pvc.yaml b/components/configs/kustomized/minio/pvc.yaml similarity index 100% rename from components/demos/instance/minio/pvc.yaml rename to components/configs/kustomized/minio/pvc.yaml diff --git a/components/demos/instance/minio/route.yaml b/components/configs/kustomized/minio/route.yaml similarity index 100% rename from components/demos/instance/minio/route.yaml rename to components/configs/kustomized/minio/route.yaml diff --git a/components/demos/instance/minio/secret.yaml b/components/configs/kustomized/minio/secret.yaml similarity index 100% rename from components/demos/instance/minio/secret.yaml rename to components/configs/kustomized/minio/secret.yaml diff --git a/components/demos/instance/minio/service.yaml b/components/configs/kustomized/minio/service.yaml similarity index 100% rename from components/demos/instance/minio/service.yaml rename to components/configs/kustomized/minio/service.yaml diff --git a/components/demos/instance/minio/setup-job.yaml b/components/configs/kustomized/minio/setup-job.yaml similarity index 100% rename from components/demos/instance/minio/setup-job.yaml rename to components/configs/kustomized/minio/setup-job.yaml diff --git a/components/demos/instance/model-server/inference.yaml b/components/configs/kustomized/model-server/inference.yaml similarity index 100% rename from components/demos/instance/model-server/inference.yaml rename to components/configs/kustomized/model-server/inference.yaml diff --git a/components/demos/instance/model-server/kustomization.yaml b/components/configs/kustomized/model-server/kustomization.yaml similarity index 100% rename from components/demos/instance/model-server/kustomization.yaml rename to components/configs/kustomized/model-server/kustomization.yaml diff --git a/components/demos/instance/model-server/runtime.yaml b/components/configs/kustomized/model-server/runtime.yaml similarity index 100% rename from components/demos/instance/model-server/runtime.yaml rename to components/configs/kustomized/model-server/runtime.yaml diff --git a/components/demos/instance/notebook/kustomization.yaml b/components/configs/kustomized/notebook/kustomization.yaml similarity index 100% rename from components/demos/instance/notebook/kustomization.yaml rename to components/configs/kustomized/notebook/kustomization.yaml diff --git a/components/demos/instance/notebook/notebook.yaml b/components/configs/kustomized/notebook/notebook.yaml similarity index 100% rename from components/demos/instance/notebook/notebook.yaml rename to components/configs/kustomized/notebook/notebook.yaml diff --git a/components/demos/instance/notebook/pvc.yaml b/components/configs/kustomized/notebook/pvc.yaml similarity index 100% rename from components/demos/instance/notebook/pvc.yaml rename to components/configs/kustomized/notebook/pvc.yaml diff --git a/components/demos/instance/nvidia-gpu-verification/base/deployment.yaml b/components/configs/kustomized/nvidia-gpu-verification/base/deployment.yaml similarity index 100% rename from components/demos/instance/nvidia-gpu-verification/base/deployment.yaml rename to components/configs/kustomized/nvidia-gpu-verification/base/deployment.yaml diff --git a/components/demos/instance/nvidia-gpu-verification/base/kustomization.yaml b/components/configs/kustomized/nvidia-gpu-verification/base/kustomization.yaml similarity index 100% rename from components/demos/instance/nvidia-gpu-verification/base/kustomization.yaml rename to components/configs/kustomized/nvidia-gpu-verification/base/kustomization.yaml diff --git a/components/demos/instance/nvidia-gpu-verification/overlays/default/kustomization.yaml b/components/configs/kustomized/nvidia-gpu-verification/overlays/default/kustomization.yaml similarity index 100% rename from components/demos/instance/nvidia-gpu-verification/overlays/default/kustomization.yaml rename to components/configs/kustomized/nvidia-gpu-verification/overlays/default/kustomization.yaml diff --git a/components/demos/instance/nvidia-gpu-verification/overlays/default/namespace.yaml b/components/configs/kustomized/nvidia-gpu-verification/overlays/default/namespace.yaml similarity index 100% rename from components/demos/instance/nvidia-gpu-verification/overlays/default/namespace.yaml rename to components/configs/kustomized/nvidia-gpu-verification/overlays/default/namespace.yaml diff --git a/components/demos/instance/nvidia-gpu-verification/overlays/toleration-replicas-6/kustomization.yaml b/components/configs/kustomized/nvidia-gpu-verification/overlays/toleration-replicas-6/kustomization.yaml similarity index 100% rename from components/demos/instance/nvidia-gpu-verification/overlays/toleration-replicas-6/kustomization.yaml rename to components/configs/kustomized/nvidia-gpu-verification/overlays/toleration-replicas-6/kustomization.yaml diff --git a/components/demos/instance/nvidia-gpu-verification/overlays/toleration/kustomization.yaml b/components/configs/kustomized/nvidia-gpu-verification/overlays/toleration/kustomization.yaml similarity index 100% rename from components/demos/instance/nvidia-gpu-verification/overlays/toleration/kustomization.yaml rename to components/configs/kustomized/nvidia-gpu-verification/overlays/toleration/kustomization.yaml diff --git a/components/demos/instance/pgadmin4/app-pgadmin4.yaml b/components/configs/kustomized/pgadmin4/app-pgadmin4.yaml similarity index 100% rename from components/demos/instance/pgadmin4/app-pgadmin4.yaml rename to components/configs/kustomized/pgadmin4/app-pgadmin4.yaml diff --git a/components/demos/instance/pgadmin4/kustomization.yaml b/components/configs/kustomized/pgadmin4/kustomization.yaml similarity index 100% rename from components/demos/instance/pgadmin4/kustomization.yaml rename to components/configs/kustomized/pgadmin4/kustomization.yaml diff --git a/components/demos/instance/pgadmin4/namespace-rb.yaml b/components/configs/kustomized/pgadmin4/namespace-rb.yaml similarity index 100% rename from components/demos/instance/pgadmin4/namespace-rb.yaml rename to components/configs/kustomized/pgadmin4/namespace-rb.yaml diff --git a/components/demos/instance/pipeline-images/kustomization.yaml b/components/configs/kustomized/pipeline-images/kustomization.yaml similarity index 100% rename from components/demos/instance/pipeline-images/kustomization.yaml rename to components/configs/kustomized/pipeline-images/kustomization.yaml diff --git a/components/demos/instance/pipeline-images/s2i-build-train.yaml b/components/configs/kustomized/pipeline-images/s2i-build-ingest.yaml similarity index 100% rename from components/demos/instance/pipeline-images/s2i-build-train.yaml rename to components/configs/kustomized/pipeline-images/s2i-build-ingest.yaml diff --git a/components/configs/kustomized/pipeline-images/s2i-build-train.yaml b/components/configs/kustomized/pipeline-images/s2i-build-train.yaml new file mode 100644 index 00000000..e69de29b diff --git a/components/demos/instance/pipelines/kustomization.yaml b/components/configs/kustomized/pipelines/kustomization.yaml similarity index 100% rename from components/demos/instance/pipelines/kustomization.yaml rename to components/configs/kustomized/pipelines/kustomization.yaml diff --git a/components/demos/instance/pipelines/pipeline-build-worker.yaml b/components/configs/kustomized/pipelines/pipeline-build-worker.yaml similarity index 100% rename from components/demos/instance/pipelines/pipeline-build-worker.yaml rename to components/configs/kustomized/pipelines/pipeline-build-worker.yaml diff --git a/components/demos/instance/pipelines/pipeline-train.yaml b/components/configs/kustomized/pipelines/pipeline-train.yaml similarity index 100% rename from components/demos/instance/pipelines/pipeline-train.yaml rename to components/configs/kustomized/pipelines/pipeline-train.yaml diff --git a/components/demos/instance/pipelines/pvc.yaml b/components/configs/kustomized/pipelines/pvc.yaml similarity index 100% rename from components/demos/instance/pipelines/pvc.yaml rename to components/configs/kustomized/pipelines/pvc.yaml diff --git a/components/demos/instance/pipelines/tasks/python-task.yaml b/components/configs/kustomized/pipelines/tasks/python-task.yaml similarity index 100% rename from components/demos/instance/pipelines/tasks/python-task.yaml rename to components/configs/kustomized/pipelines/tasks/python-task.yaml diff --git a/components/demos/instance/rhods-projects/group-project/admin-rolebinding.yaml b/components/configs/kustomized/rhods-projects/group-project/admin-rolebinding.yaml similarity index 100% rename from components/demos/instance/rhods-projects/group-project/admin-rolebinding.yaml rename to components/configs/kustomized/rhods-projects/group-project/admin-rolebinding.yaml diff --git a/components/demos/instance/rhods-projects/group-project/edit-rolebinding.yaml b/components/configs/kustomized/rhods-projects/group-project/edit-rolebinding.yaml similarity index 100% rename from components/demos/instance/rhods-projects/group-project/edit-rolebinding.yaml rename to components/configs/kustomized/rhods-projects/group-project/edit-rolebinding.yaml diff --git a/components/demos/instance/rhods-projects/group-project/kustomization.yaml b/components/configs/kustomized/rhods-projects/group-project/kustomization.yaml similarity index 100% rename from components/demos/instance/rhods-projects/group-project/kustomization.yaml rename to components/configs/kustomized/rhods-projects/group-project/kustomization.yaml diff --git a/components/demos/instance/rhods-projects/group-project/limit-range.yaml b/components/configs/kustomized/rhods-projects/group-project/limit-range.yaml similarity index 100% rename from components/demos/instance/rhods-projects/group-project/limit-range.yaml rename to components/configs/kustomized/rhods-projects/group-project/limit-range.yaml diff --git a/components/demos/instance/rhods-projects/group-project/namespace.yaml b/components/configs/kustomized/rhods-projects/group-project/namespace.yaml similarity index 100% rename from components/demos/instance/rhods-projects/group-project/namespace.yaml rename to components/configs/kustomized/rhods-projects/group-project/namespace.yaml diff --git a/components/demos/instance/rhods-projects/group-project/quota.yaml b/components/configs/kustomized/rhods-projects/group-project/quota.yaml similarity index 100% rename from components/demos/instance/rhods-projects/group-project/quota.yaml rename to components/configs/kustomized/rhods-projects/group-project/quota.yaml diff --git a/components/demos/instance/rhods-projects/individual-project/admin-rolebinding.yaml b/components/configs/kustomized/rhods-projects/individual-project/admin-rolebinding.yaml similarity index 100% rename from components/demos/instance/rhods-projects/individual-project/admin-rolebinding.yaml rename to components/configs/kustomized/rhods-projects/individual-project/admin-rolebinding.yaml diff --git a/components/demos/instance/rhods-projects/individual-project/kustomization.yaml b/components/configs/kustomized/rhods-projects/individual-project/kustomization.yaml similarity index 100% rename from components/demos/instance/rhods-projects/individual-project/kustomization.yaml rename to components/configs/kustomized/rhods-projects/individual-project/kustomization.yaml diff --git a/components/demos/instance/rhods-projects/individual-project/namespace.yaml b/components/configs/kustomized/rhods-projects/individual-project/namespace.yaml similarity index 100% rename from components/demos/instance/rhods-projects/individual-project/namespace.yaml rename to components/configs/kustomized/rhods-projects/individual-project/namespace.yaml diff --git a/components/demos/instance/rhods-projects/kustomization.yaml b/components/configs/kustomized/rhods-projects/kustomization.yaml similarity index 100% rename from components/demos/instance/rhods-projects/kustomization.yaml rename to components/configs/kustomized/rhods-projects/kustomization.yaml diff --git a/components/demos/instance/rhods-projects/secret-project/admin-rolebinding.yaml b/components/configs/kustomized/rhods-projects/secret-project/admin-rolebinding.yaml similarity index 100% rename from components/demos/instance/rhods-projects/secret-project/admin-rolebinding.yaml rename to components/configs/kustomized/rhods-projects/secret-project/admin-rolebinding.yaml diff --git a/components/demos/instance/rhods-projects/secret-project/kustomization.yaml b/components/configs/kustomized/rhods-projects/secret-project/kustomization.yaml similarity index 100% rename from components/demos/instance/rhods-projects/secret-project/kustomization.yaml rename to components/configs/kustomized/rhods-projects/secret-project/kustomization.yaml diff --git a/components/demos/instance/rhods-projects/secret-project/namespace.yaml b/components/configs/kustomized/rhods-projects/secret-project/namespace.yaml similarity index 100% rename from components/demos/instance/rhods-projects/secret-project/namespace.yaml rename to components/configs/kustomized/rhods-projects/secret-project/namespace.yaml diff --git a/components/demos/instance/rhods/custom-notebooks-rb.yaml b/components/configs/kustomized/rhods/custom-notebooks-rb.yaml similarity index 100% rename from components/demos/instance/rhods/custom-notebooks-rb.yaml rename to components/configs/kustomized/rhods/custom-notebooks-rb.yaml diff --git a/components/demos/instance/rhods/kustomization.yaml b/components/configs/kustomized/rhods/kustomization.yaml similarity index 94% rename from components/demos/instance/rhods/kustomization.yaml rename to components/configs/kustomized/rhods/kustomization.yaml index 5a96d0f0..f1a59e82 100644 --- a/components/demos/instance/rhods/kustomization.yaml +++ b/components/configs/kustomized/rhods/kustomization.yaml @@ -2,7 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../base - custom-notebooks-rb.yaml - nb-culler-config.yaml - odh-dashboard-config-cr.yaml diff --git a/components/demos/instance/rhods/nb-culler-config.yaml b/components/configs/kustomized/rhods/nb-culler-config.yaml similarity index 100% rename from components/demos/instance/rhods/nb-culler-config.yaml rename to components/configs/kustomized/rhods/nb-culler-config.yaml diff --git a/components/demos/instance/rhods/odh-dashboard-config-cr.yaml b/components/configs/kustomized/rhods/odh-dashboard-config-cr.yaml similarity index 100% rename from components/demos/instance/rhods/odh-dashboard-config-cr.yaml rename to components/configs/kustomized/rhods/odh-dashboard-config-cr.yaml diff --git a/components/demos/instance/rhods/rhods-admins-group.yaml b/components/configs/kustomized/rhods/rhods-admins-group.yaml similarity index 100% rename from components/demos/instance/rhods/rhods-admins-group.yaml rename to components/configs/kustomized/rhods/rhods-admins-group.yaml diff --git a/components/demos/instance/rhods/rhods-self-provisioner-clusterrolebinding.yaml b/components/configs/kustomized/rhods/rhods-self-provisioner-clusterrolebinding.yaml similarity index 100% rename from components/demos/instance/rhods/rhods-self-provisioner-clusterrolebinding.yaml rename to components/configs/kustomized/rhods/rhods-self-provisioner-clusterrolebinding.yaml diff --git a/components/demos/instance/rhods/rhods-self-provisioner-group.yaml b/components/configs/kustomized/rhods/rhods-self-provisioner-group.yaml similarity index 100% rename from components/demos/instance/rhods/rhods-self-provisioner-group.yaml rename to components/configs/kustomized/rhods/rhods-self-provisioner-group.yaml diff --git a/components/demos/instance/fingerprint-id/kustomization.yaml b/components/configs/kustomized/smart-cities/kustomization.yaml similarity index 100% rename from components/demos/instance/fingerprint-id/kustomization.yaml rename to components/configs/kustomized/smart-cities/kustomization.yaml diff --git a/components/demos/instance/smart-cities/namespace-rb.yaml b/components/configs/kustomized/smart-cities/namespace-rb.yaml similarity index 100% rename from components/demos/instance/smart-cities/namespace-rb.yaml rename to components/configs/kustomized/smart-cities/namespace-rb.yaml diff --git a/components/demos/instance/smart-cities/namespace.yaml b/components/configs/kustomized/smart-cities/namespace.yaml similarity index 100% rename from components/demos/instance/smart-cities/namespace.yaml rename to components/configs/kustomized/smart-cities/namespace.yaml diff --git a/components/configs/turbonomic/base/kustomization.yaml b/components/configs/kustomized/turbonomic/base/kustomization.yaml similarity index 100% rename from components/configs/turbonomic/base/kustomization.yaml rename to components/configs/kustomized/turbonomic/base/kustomization.yaml diff --git a/components/configs/turbonomic/base/turbo-cr-patch-job.yaml b/components/configs/kustomized/turbonomic/base/turbo-cr-patch-job.yaml similarity index 100% rename from components/configs/turbonomic/base/turbo-cr-patch-job.yaml rename to components/configs/kustomized/turbonomic/base/turbo-cr-patch-job.yaml diff --git a/components/configs/turbonomic/base/turbo-cr.yaml b/components/configs/kustomized/turbonomic/base/turbo-cr.yaml similarity index 100% rename from components/configs/turbonomic/base/turbo-cr.yaml rename to components/configs/kustomized/turbonomic/base/turbo-cr.yaml diff --git a/components/configs/turbonomic/overlays/default/kustomization.yaml b/components/configs/kustomized/turbonomic/overlays/default/kustomization.yaml similarity index 100% rename from components/configs/turbonomic/overlays/default/kustomization.yaml rename to components/configs/kustomized/turbonomic/overlays/default/kustomization.yaml diff --git a/components/configs/turbonomic/overlays/hou-edge/kustomization.yaml b/components/configs/kustomized/turbonomic/overlays/hou-edge/kustomization.yaml similarity index 100% rename from components/configs/turbonomic/overlays/hou-edge/kustomization.yaml rename to components/configs/kustomized/turbonomic/overlays/hou-edge/kustomization.yaml diff --git a/components/configs/turbonomic/overlays/hou-edge/turbo-sc.yaml b/components/configs/kustomized/turbonomic/overlays/hou-edge/turbo-sc.yaml similarity index 100% rename from components/configs/turbonomic/overlays/hou-edge/turbo-sc.yaml rename to components/configs/kustomized/turbonomic/overlays/hou-edge/turbo-sc.yaml diff --git a/components/demos/instance/weaviate/NOTES.md b/components/configs/kustomized/weaviate/NOTES.md similarity index 100% rename from components/demos/instance/weaviate/NOTES.md rename to components/configs/kustomized/weaviate/NOTES.md diff --git a/components/demos/instance/weaviate/openshift/weaviate-bc.yml b/components/configs/kustomized/weaviate/openshift/weaviate-bc.yml similarity index 100% rename from components/demos/instance/weaviate/openshift/weaviate-bc.yml rename to components/configs/kustomized/weaviate/openshift/weaviate-bc.yml diff --git a/components/demos/instance/weaviate/openshift/weaviate-is.yml b/components/configs/kustomized/weaviate/openshift/weaviate-is.yml similarity index 100% rename from components/demos/instance/weaviate/openshift/weaviate-is.yml rename to components/configs/kustomized/weaviate/openshift/weaviate-is.yml diff --git a/components/demos/instance/weaviate/src/00-weaviate-test-connection.py b/components/configs/kustomized/weaviate/src/00-weaviate-test-connection.py similarity index 100% rename from components/demos/instance/weaviate/src/00-weaviate-test-connection.py rename to components/configs/kustomized/weaviate/src/00-weaviate-test-connection.py diff --git a/components/demos/instance/weaviate/src/requirements.txt b/components/configs/kustomized/weaviate/src/requirements.txt similarity index 100% rename from components/demos/instance/weaviate/src/requirements.txt rename to components/configs/kustomized/weaviate/src/requirements.txt diff --git a/components/demos/instance/weaviate/values.yaml b/components/configs/kustomized/weaviate/values.yaml similarity index 100% rename from components/demos/instance/weaviate/values.yaml rename to components/configs/kustomized/weaviate/values.yaml diff --git a/components/configs/rbac/overlays/rhdp/patch-ssh.yaml b/components/configs/rbac/overlays/rhdp/patch-ssh.yaml deleted file mode 100644 index 5302ff80..00000000 --- a/components/configs/rbac/overlays/rhdp/patch-ssh.yaml +++ /dev/null @@ -1,9 +0,0 @@ -- op: remove - path: /spec/config/passwd/users/0/sshAuthorizedKeys/0 - -- op: add - path: /spec/config/passwd/users/0/sshAuthorizedKeys/- - value: >- - ssh-rsa - AAAAB3NzaC1yc2EAAAADAQABAAABgQC5Ydtf2FA4Pj48KO7bhg0X3OWOA9Fx38RcCMumr+s6Pr4T30tbdp9qyu4036yl4wUoXMKQW5Ql5pKBy+6APdG/E7xAf8W9IV1MKxuwtg9kuYKmKL9YbPZ4C37p/OaudZp2iiubBxCDa4CM7sX+DgUKq7uVCH0L1ukYqwciv9eF4FRSK4ARn+TQ8Zx3tMX/VTUniriDKOBbTWqQpqPTxT+oW5hypEtei89si8jB/7wtm1TngzQlVOcHYCT/x14r0INJJpX8gvkEr7f1aZPwsPsULxYrskuitXEK0MzZcRjh6xtVq5e/8T6M1pdY4k4m7BK6m5NY1prL25ELtuOYYgJAfpuUc0z+pt0mhGv5CbFAf86E4VkIWn1wo7GbtSKgc8p0TeCOYQIslzN1MH8O/BZW1WyAsQJXaodfoAbm0UTsP32G+1mzM1d4yL8smw1SJdg+BbCAtVBhMaELMI3993jkO93RM/KNNYKNQKU1krC3+HuxYtGqnBb5TTDXMTvg/FU= - koree@macntoss.sgu diff --git a/components/configs/rbac/overlays/testing/patch-cluster-admins-group.yaml b/components/configs/rbac/overlays/testing/patch-cluster-admins-group.yaml deleted file mode 100644 index cfe4ed2f..00000000 --- a/components/configs/rbac/overlays/testing/patch-cluster-admins-group.yaml +++ /dev/null @@ -1,5 +0,0 @@ -- op: replace - path: /users - value: - - admin - - opentlc-mgr diff --git a/components/configs/rbac/overlays/testing/patch-cluster-readers-group.yaml b/components/configs/rbac/overlays/testing/patch-cluster-readers-group.yaml deleted file mode 100644 index 08fad059..00000000 --- a/components/configs/rbac/overlays/testing/patch-cluster-readers-group.yaml +++ /dev/null @@ -1,8 +0,0 @@ -- op: replace - path: /users - value: - - adrezni - - codekow - - sabre1041 - - strangiato - - TroyNelson11 diff --git a/components/configs/rbac/overlays/testing/patch-ssh.yaml b/components/configs/rbac/overlays/testing/patch-ssh.yaml deleted file mode 100644 index 5302ff80..00000000 --- a/components/configs/rbac/overlays/testing/patch-ssh.yaml +++ /dev/null @@ -1,9 +0,0 @@ -- op: remove - path: /spec/config/passwd/users/0/sshAuthorizedKeys/0 - -- op: add - path: /spec/config/passwd/users/0/sshAuthorizedKeys/- - value: >- - ssh-rsa - AAAAB3NzaC1yc2EAAAADAQABAAABgQC5Ydtf2FA4Pj48KO7bhg0X3OWOA9Fx38RcCMumr+s6Pr4T30tbdp9qyu4036yl4wUoXMKQW5Ql5pKBy+6APdG/E7xAf8W9IV1MKxuwtg9kuYKmKL9YbPZ4C37p/OaudZp2iiubBxCDa4CM7sX+DgUKq7uVCH0L1ukYqwciv9eF4FRSK4ARn+TQ8Zx3tMX/VTUniriDKOBbTWqQpqPTxT+oW5hypEtei89si8jB/7wtm1TngzQlVOcHYCT/x14r0INJJpX8gvkEr7f1aZPwsPsULxYrskuitXEK0MzZcRjh6xtVq5e/8T6M1pdY4k4m7BK6m5NY1prL25ELtuOYYgJAfpuUc0z+pt0mhGv5CbFAf86E4VkIWn1wo7GbtSKgc8p0TeCOYQIslzN1MH8O/BZW1WyAsQJXaodfoAbm0UTsP32G+1mzM1d4yL8smw1SJdg+BbCAtVBhMaELMI3993jkO93RM/KNNYKNQKU1krC3+HuxYtGqnBb5TTDXMTvg/FU= - koree@macntoss.sgu diff --git a/components/demos/instance/workshop-users/admin-rolebinding.yaml b/components/configs/workshops/workshop-users/admin-rolebinding.yaml similarity index 100% rename from components/demos/instance/workshop-users/admin-rolebinding.yaml rename to components/configs/workshops/workshop-users/admin-rolebinding.yaml diff --git a/components/demos/instance/workshop-users/kustomization.yaml b/components/configs/workshops/workshop-users/kustomization.yaml similarity index 100% rename from components/demos/instance/workshop-users/kustomization.yaml rename to components/configs/workshops/workshop-users/kustomization.yaml diff --git a/components/demos/instance/workshop-users/namespace.yaml b/components/configs/workshops/workshop-users/namespace.yaml similarity index 100% rename from components/demos/instance/workshop-users/namespace.yaml rename to components/configs/workshops/workshop-users/namespace.yaml diff --git a/components/demos/instance/workshop-users/workshop-admins-group.yaml b/components/configs/workshops/workshop-users/workshop-admins-group.yaml similarity index 100% rename from components/demos/instance/workshop-users/workshop-admins-group.yaml rename to components/configs/workshops/workshop-users/workshop-admins-group.yaml diff --git a/components/demos/instance/workshop-users/workshop-users-group.yaml b/components/configs/workshops/workshop-users/workshop-users-group.yaml similarity index 100% rename from components/demos/instance/workshop-users/workshop-users-group.yaml rename to components/configs/workshops/workshop-users/workshop-users-group.yaml diff --git a/containers/python/README.md b/components/containers/python/README.md similarity index 100% rename from containers/python/README.md rename to components/containers/python/README.md diff --git a/containers/python/ubi8/3.11/Dockerfile b/components/containers/python/ubi8/3.11/Dockerfile similarity index 100% rename from containers/python/ubi8/3.11/Dockerfile rename to components/containers/python/ubi8/3.11/Dockerfile diff --git a/containers/python/ubi8/3.9/Dockerfile b/components/containers/python/ubi8/3.9/Dockerfile similarity index 100% rename from containers/python/ubi8/3.9/Dockerfile rename to components/containers/python/ubi8/3.9/Dockerfile diff --git a/containers/udi-cuda/README.md b/components/containers/udi-cuda/README.md similarity index 100% rename from containers/udi-cuda/README.md rename to components/containers/udi-cuda/README.md diff --git a/containers/udi-cuda/openshift/image-streams.yaml b/components/containers/udi-cuda/openshift/image-streams.yaml similarity index 100% rename from containers/udi-cuda/openshift/image-streams.yaml rename to components/containers/udi-cuda/openshift/image-streams.yaml diff --git a/containers/udi-cuda/openshift/udi-cuda-overlay-bc.yml b/components/containers/udi-cuda/openshift/udi-cuda-overlay-bc.yml similarity index 100% rename from containers/udi-cuda/openshift/udi-cuda-overlay-bc.yml rename to components/containers/udi-cuda/openshift/udi-cuda-overlay-bc.yml diff --git a/containers/udi-cuda/openshift/udi-cuda-patch-bc.yaml b/components/containers/udi-cuda/openshift/udi-cuda-patch-bc.yaml similarity index 100% rename from containers/udi-cuda/openshift/udi-cuda-patch-bc.yaml rename to components/containers/udi-cuda/openshift/udi-cuda-patch-bc.yaml diff --git a/containers/udi-cuda/openshift/udi-cuda-universal-bc.yml b/components/containers/udi-cuda/openshift/udi-cuda-universal-bc.yml similarity index 100% rename from containers/udi-cuda/openshift/udi-cuda-universal-bc.yml rename to components/containers/udi-cuda/openshift/udi-cuda-universal-bc.yml diff --git a/containers/udi-cuda/ubi8/Dockerfile b/components/containers/udi-cuda/ubi8/Dockerfile similarity index 100% rename from containers/udi-cuda/ubi8/Dockerfile rename to components/containers/udi-cuda/ubi8/Dockerfile diff --git a/containers/udi-cuda/ubi8/entrypoint.sh b/components/containers/udi-cuda/ubi8/entrypoint.sh similarity index 100% rename from containers/udi-cuda/ubi8/entrypoint.sh rename to components/containers/udi-cuda/ubi8/entrypoint.sh diff --git a/components/demos/base/kustomization.yaml b/components/demos/base/kustomization.yaml deleted file mode 100644 index 4ea1bcca..00000000 --- a/components/demos/base/kustomization.yaml +++ /dev/null @@ -1,2 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization diff --git a/components/demos/instance/fingerprint-id/namespace-rb.yaml b/components/demos/instance/fingerprint-id/namespace-rb.yaml deleted file mode 100644 index 78ab4161..00000000 --- a/components/demos/instance/fingerprint-id/namespace-rb.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: fingerprint-id-admin - namespace: fingerprint-id -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- apiGroup: rbac.authorization.k8s.io - kind: Group - name: workshop-admins diff --git a/components/demos/instance/fingerprint-id/namespace.yaml b/components/demos/instance/fingerprint-id/namespace.yaml deleted file mode 100644 index e58583c7..00000000 --- a/components/demos/instance/fingerprint-id/namespace.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: fingerprint-id - annotations: - openshift.io/display-name: Fingerprint ID (Demo) - labels: - argocd.argoproj.io/managed-by: cluster-config - opendatahub.io/dashboard: 'true' diff --git a/components/demos/instance/iris-id/namespace-rb.yaml b/components/demos/instance/iris-id/namespace-rb.yaml deleted file mode 100644 index eebc476f..00000000 --- a/components/demos/instance/iris-id/namespace-rb.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: iris-id-admin - namespace: iris-id -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: ClusterRole - name: admin -subjects: -- apiGroup: rbac.authorization.k8s.io - kind: Group - name: workshop-admins diff --git a/components/demos/instance/iris-id/namespace.yaml b/components/demos/instance/iris-id/namespace.yaml deleted file mode 100644 index 376ec2bd..00000000 --- a/components/demos/instance/iris-id/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: iris-id - annotations: - openshift.io/display-name: Iris ID (Demo) - labels: - argocd.argoproj.io/managed-by: cluster-config diff --git a/components/demos/instance/weaviate/src/.env b/components/demos/instance/weaviate/src/.env deleted file mode 100644 index 29aa153c..00000000 --- a/components/demos/instance/weaviate/src/.env +++ /dev/null @@ -1,4 +0,0 @@ -WEAVIATE_API_KEY='all-the-power' - -# oc port-forward service/weaviate 8080:8080 -WEAVIATE_URL='http://localhost:8080' diff --git a/components/demos/overlays/default/kustomization.yaml b/components/demos/overlays/default/kustomization.yaml deleted file mode 100644 index 4ea1bcca..00000000 --- a/components/demos/overlays/default/kustomization.yaml +++ /dev/null @@ -1,2 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization diff --git a/components/operators/README.md b/components/operators/README.md new file mode 100644 index 00000000..e69de29b diff --git a/components/operators/gpu-operator-certified/instance/base/kustomization.yaml b/components/operators/gpu-operator-certified/instance/base/kustomization.yaml index eead45d1..e16c64dc 100644 --- a/components/operators/gpu-operator-certified/instance/base/kustomization.yaml +++ b/components/operators/gpu-operator-certified/instance/base/kustomization.yaml @@ -1,8 +1,12 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +commonLabels: + kustomize: gpu-operator + namespace: nvidia-gpu-operator resources: - cluster-policy.yaml - device-plugin-config.yaml + - setup-job.yaml diff --git a/components/operators/gpu-operator-certified/instance/base/setup-job.yaml b/components/operators/gpu-operator-certified/instance/base/setup-job.yaml new file mode 100644 index 00000000..a4f1b54b --- /dev/null +++ b/components/operators/gpu-operator-certified/instance/base/setup-job.yaml @@ -0,0 +1,78 @@ +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRole +annotations: + todo: improve security for role +metadata: + name: setup-aws-gpu-machineset +rules: +- apiGroups: + - '*' + resources: + - '*' + verbs: + - '*' +- nonResourceURLs: + - '*' + verbs: + - '*' +--- +apiVersion: rbac.authorization.k8s.io/v1 +kind: ClusterRoleBinding +metadata: + name: setup-aws-gpu-machineset +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: setup-aws-gpu-machineset +subjects: + - kind: ServiceAccount + name: setup-aws-gpu-machineset + namespace: nvidia-gpu-operator +--- +apiVersion: v1 +kind: ServiceAccount +metadata: + name: setup-aws-gpu-machineset +--- +apiVersion: batch/v1 +kind: Job +metadata: + generateName: setup-aws-gpu-machineset- + name: setup-aws-gpu-machineset + annotations: + argocd.argoproj.io/hook: Sync + # argocd.argoproj.io/hook-delete-policy: HookSucceeded +spec: + template: + spec: + containers: + - name: setup-aws-gpu-machineset + image: image-registry.openshift-image-registry.svc:5000/openshift/cli:latest + env: + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + command: + - /bin/bash + - -c + - | + #!/usr/bin/env bash + # set -x + + oc whoami + + setup-aws-gpu-machineset(){ + oc -n openshift-machine-api \ + get machinesets -o yaml | grep type + echo "setup: AWS GPU machineset..." + } + + setup-aws-gpu-machineset + + + restartPolicy: Never + terminationGracePeriodSeconds: 30 + serviceAccount: setup-aws-gpu-machineset + serviceAccountName: setup-aws-gpu-machineset diff --git a/components/operators/grafana-operator/overlays/user-app/kustomization.yaml b/components/operators/grafana-operator/overlays/user-app/kustomization.yaml index 9bbc61f1..133177f1 100644 --- a/components/operators/grafana-operator/overlays/user-app/kustomization.yaml +++ b/components/operators/grafana-operator/overlays/user-app/kustomization.yaml @@ -5,8 +5,8 @@ commonAnnotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true resources: - - github.com/redhat-cop/gitops-catalog//grafana-operator/base/operator?ref=main - - github.com/redhat-cop/gitops-catalog//grafana-operator/base/instance?ref=main + - github.com/redhat-cop/gitops-catalog/grafana-operator/base/operator?ref=main + - github.com/redhat-cop/gitops-catalog/grafana-operator/base/instance?ref=main - grafana-ds.yaml - cluster-monitor-view-rb.yaml - grafana-auth-secret.yaml diff --git a/docs/APPS.md b/docs/APPS.md index 19cab161..3934897a 100644 --- a/docs/APPS.md +++ b/docs/APPS.md @@ -7,7 +7,7 @@ Convert an existing secret into a sealed-secret that can be committed in git Dump current sealed secret cert ``` -SEALED_SECRETS_SECRET=bootstrap/base/sealed-secrets-secret.yaml +SEALED_SECRETS_SECRET=bootstrap/sealed-secrets-secret.yaml oc -n sealed-secrets -o yaml \ get secret \ diff --git a/docs/ARGOCD.md b/docs/ARGOCD.md index dde1d65e..87d3f9a2 100644 --- a/docs/ARGOCD.md +++ b/docs/ARGOCD.md @@ -21,7 +21,7 @@ This repository deploys sealed-secrets and requires a sealed secret master key t The sealed secret(s) for bootstrap should be located at: ```sh -bootstrap/base/sealed-secrets-secret.yaml +bootstrap/sealed-secrets-secret.yaml ``` If you do not plan to utilize existing sealed secrets you can instead bootstrap a new sealed-secrets controller and obtain a new secret. diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh index 46d977fb..55303d4b 100755 --- a/scripts/bootstrap.sh +++ b/scripts/bootstrap.sh @@ -35,7 +35,15 @@ export SLEEP_SECONDS=8 # shellcheck source=/dev/null . "${SCRIPT_DIR}/functions.sh" - +# # manage args passed to script +# if [ "${1}" == "demo=enter_name_here" ]; then +# export NON_INTERACTIVE=true + +# bootstrap_dir=bootstrap/overlays/workshop-rhdp +# ocp_control_nodes_not_schedulable +# ocp_create_machineset_autoscale 0 30 +# ocp_scale_machineset 1 +# fi check_bin oc # check_bin kustomize @@ -43,6 +51,9 @@ check_bin oc ocp_check_info # bootstrap -sealed_secret_check -install_gitops -bootstrap_cluster +# sealed_secret_check +argo_install +select_folder bootstrap + +# shellcheck disable=SC2154 +oc apply -k "bootstrap/${selected}" diff --git a/scripts/dump_api_resources.sh b/scripts/dump_api_resources.sh deleted file mode 100755 index b6dc8ea5..00000000 --- a/scripts/dump_api_resources.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash -# shellcheck disable=SC2034,SC1091 - -. "$(dirname "$0")/library/k8s.sh" - -k8s_api_dump_resources diff --git a/scripts/library/argo.sh b/scripts/library/argo.sh index 10d3687a..750cf227 100644 --- a/scripts/library/argo.sh +++ b/scripts/library/argo.sh @@ -1,82 +1,26 @@ #!/bin/bash -LANG=C +# LANG=C SLEEP_SECONDS="${SLEEP_SECONDS:-8}" -SEALED_SECRETS_FOLDER=components/operators/sealed-secrets/operator/overlays/default -SEALED_SECRETS_SECRET=bootstrap/base/sealed-secrets-secret.yaml - -sealed_secret_create(){ - read -r -p "Create NEW [${SEALED_SECRETS_SECRET}]? [y/N] " input - case $input in - [yY][eE][sS]|[yY]) - - oc apply -k "${SEALED_SECRETS_FOLDER}" - - # sanity check - [ -e "${SEALED_SECRETS_SECRET}" ] && return - - # TODO: explore using openssl - # oc -n sealed-secrets -o yaml \ - # create secret generic - - # just wait for it - k8s_wait_for_crd sealedsecrets.bitnami.com - oc -n sealed-secrets \ - rollout status deployment sealed-secrets-controller - sleep 10 - - oc -n sealed-secrets \ - -o yaml \ - get secret \ - -l sealedsecrets.bitnami.com/sealed-secrets-key=active \ - > ${SEALED_SECRETS_SECRET} - - ;; - [nN][oO]|[nN]) - echo - ;; - *) - echo - echo "!!NOTICE!!: Cluster automation MAY NOT WORK w/o a valid sealed secret" - echo "Choosing NO may have unintended results - see docs for more info" - echo "Contact a repo MAINTINAER to get a current sealed secrets key" - echo - echo 'You must choose yes or no to continue' - echo - sealed_secret_create - ;; - esac -} - -sealed_secret_check(){ - if [ -f ${SEALED_SECRETS_SECRET} ]; then - echo "Exists: ${SEALED_SECRETS_SECRET}" - oc apply -f "${SEALED_SECRETS_FOLDER}/namespace.yaml" - oc apply -f "${SEALED_SECRETS_SECRET}" || return 0 - oc apply -k "${SEALED_SECRETS_FOLDER}" - else - echo "Missing: ${SEALED_SECRETS_SECRET}" - echo "The master key is required to bootstrap sealed secrets and CANNOT be checked into git." - echo - [ -n "${NON_INTERACTIVE}" ] || sealed_secret_create - fi -} ARGO_NS="openshift-gitops" ARGO_CHANNEL="stable" -ARGO_DEPLOY_STABLE=(cluster kam openshift-gitops-applicationset-controller openshift-gitops-redis openshift-gitops-repo-server openshift-gitops-server) - -# manage args passed to script -if [ "${1}" == "demo=enter_name_here" ]; then - export NON_INTERACTIVE=true - - bootstrap_dir=bootstrap/overlays/workshop-rhdp - ocp_control_nodes_not_schedulable - ocp_create_machineset_autoscale 0 30 - ocp_scale_machineset 1 -fi - -wait_for_gitops(){ +ARGO_KUSTOMIZE_OPERATOR="components/operators/openshift-gitops-operator/operator/overlays/${ARGO_CHANNEL}" +ARGO_KUSTOMIZE_INSTANCE="components/operators/openshift-gitops-operator/instance/overlays/default" + +argo_print_info(){ + echo + echo "Access your cluster here:" + + route=$(oc get route openshift-gitops-server -o jsonpath='{.spec.host}' -n ${ARGO_NS}) + + echo "https://${route}" + echo +} + +argo_wait_for_operator(){ + ARGO_DEPLOY_STABLE=(cluster kam openshift-gitops-applicationset-controller openshift-gitops-redis openshift-gitops-repo-server openshift-gitops-server) + echo "Waiting for operator to start" until oc get deployment gitops-operator-controller-manager -n openshift-operators >/dev/null 2>&1 do @@ -99,60 +43,29 @@ wait_for_gitops(){ for i in "${ARGO_DEPLOY_STABLE[@]}" do echo "Waiting for deployment $i" - oc rollout status deployment "$i" -n ${ARGO_NS} >/dev/null 2>&1 + oc rollout status deployment "$i" -n "${ARGO_NS}" >/dev/null 2>&1 done echo - echo "OpenShift GitOps successfully installed." } -install_gitops(){ +argo_install(){ echo - echo "Installing GitOps Operator." + echo "Installing GitOps Operator..." - # kustomize build components/operators/openshift-gitops-operator/operator/overlays/stable | oc apply -f - - oc apply -k "components/operators/openshift-gitops-operator/operator/overlays/${ARGO_CHANNEL}" + oc apply -k "${ARGO_KUSTOMIZE_OPERATOR}" echo "Pause ${SLEEP_SECONDS} seconds for the creation of the gitops-operator..." sleep "${SLEEP_SECONDS}" - wait_for_gitops + argo_wait_for_operator -} - -select_bootstrap_folder(){ - PS3="Please select a bootstrap folder by number: " - - echo - select bootstrap_dir in bootstrap/overlays/*/ - do - test -n "$bootstrap_dir" && break - echo ">>> Invalid Selection <<<"; - done - - bootstrap_cluster -} - -bootstrap_cluster(){ - - if [ -n "$bootstrap_dir" ]; then - echo "Selected: ${bootstrap_dir}" - else - select_bootstrap_folder - fi - - # kustomize build "${bootstrap_dir}" | oc apply -f - - oc apply -k "${bootstrap_dir}" - - wait_for_gitops - # apply the cr you know and love - oc apply -k "components/operators/openshift-gitops-operator/instance/overlays/default" + oc apply -k "${ARGO_KUSTOMIZE_INSTANCE}" echo - echo "GitOps has successfully deployed! Check the status of the sync here:" + echo "OpenShift GitOps successfully installed." - route=$(oc get route openshift-gitops-server -o jsonpath='{.spec.host}' -n ${ARGO_NS}) + argo_print_info - echo "https://${route}" } diff --git a/scripts/library/bin.sh b/scripts/library/bin.sh index 8fbefd08..272dabf0 100644 --- a/scripts/library/bin.sh +++ b/scripts/library/bin.sh @@ -27,6 +27,16 @@ check_bin(){ sleep 2 } +download_busybox(){ + DOWNLOAD_URL=https://www.busybox.net/downloads/binaries/1.35.0-x86_64-linux-musl/busybox + curl "${DOWNLOAD_URL}" -sLo "${BIN_PATH}/busybox" + chmod +x "${BIN_PATH}/busybox" + pushd "${BIN_PATH}" || return + ln -s busybox unzip + ln -s busybox bzcat + popd || return +} + download_helm(){ BIN_VERSION=latest DOWNLOAD_URL=https://mirror.openshift.com/pub/openshift-v4/clients/helm/${BIN_VERSION}/helm-linux-amd64.tar.gz @@ -59,12 +69,12 @@ download_s2i(){ } download_rclone(){ - curl -O https://downloads.rclone.org/rclone-current-linux-amd64.zip + curl -LsO https://downloads.rclone.org/rclone-current-linux-amd64.zip unzip rclone-current-linux-amd64.zip cd rclone-*-linux-amd64 || return cp rclone "${BIN_PATH}" - chown root:root "${BIN_PATH}/rclone" + chgrp root "${BIN_PATH}/rclone" chmod 755 "${BIN_PATH}/rclone" cd .. diff --git a/scripts/library/sealed_secrets.sh b/scripts/library/sealed_secrets.sh new file mode 100644 index 00000000..a28c1e3f --- /dev/null +++ b/scripts/library/sealed_secrets.sh @@ -0,0 +1,61 @@ +#!/bin/bash + +SEALED_SECRETS_FOLDER=components/operators/sealed-secrets/operator/overlays/default +SEALED_SECRETS_SECRET=bootstrap/sealed-secrets-secret.yaml + +sealed_secret_create(){ + read -r -p "Create NEW [${SEALED_SECRETS_SECRET}]? [y/N] " input + case $input in + [yY][eE][sS]|[yY]) + + oc apply -k "${SEALED_SECRETS_FOLDER}" + + # sanity check + [ -e "${SEALED_SECRETS_SECRET}" ] && return + + # TODO: explore using openssl + # oc -n sealed-secrets -o yaml \ + # create secret generic + + # just wait for it + k8s_wait_for_crd sealedsecrets.bitnami.com + oc -n sealed-secrets \ + rollout status deployment sealed-secrets-controller + sleep 10 + + oc -n sealed-secrets \ + -o yaml \ + get secret \ + -l sealedsecrets.bitnami.com/sealed-secrets-key=active \ + > ${SEALED_SECRETS_SECRET} + + ;; + [nN][oO]|[nN]) + echo + ;; + *) + echo + echo "!!NOTICE!!: Cluster automation MAY NOT WORK w/o a valid sealed secret" + echo "Choosing NO may have unintended results - see docs for more info" + echo "Contact a repo MAINTINAER to get a current sealed secrets key" + echo + echo 'You must choose yes or no to continue' + echo + sealed_secret_create + ;; + esac +} + +sealed_secret_check(){ + if [ -f ${SEALED_SECRETS_SECRET} ]; then + echo "Exists: ${SEALED_SECRETS_SECRET}" + oc apply -f "${SEALED_SECRETS_FOLDER}/namespace.yaml" + oc apply -f "${SEALED_SECRETS_SECRET}" || return + oc apply -k "${SEALED_SECRETS_FOLDER}" + else + echo "Missing: ${SEALED_SECRETS_SECRET}" + echo "The master key is required to bootstrap sealed secrets and CANNOT be checked into git." + echo + [ -n "${NON_INTERACTIVE}" ] || sealed_secret_create + fi +} diff --git a/scripts/library/unsorted.sh b/scripts/library/unsorted.sh index 1a248525..4c46b0f5 100644 --- a/scripts/library/unsorted.sh +++ b/scripts/library/unsorted.sh @@ -1 +1,37 @@ -#!/bin/sh +#!/bin/bash + +until_true(){ + echo "Running:" "${@}" + until "${@}" + do + sleep 1 + echo "and again..." + done + + echo "[OK]" +} + +select_folder(){ + FOLDER="${1:-options}" + PS3="Select by number: " + + [ -d "${FOLDER}" ] || return + + echo "Options" + + pushd "${FOLDER}" >/dev/null || return + + select selected in */ + do + [ -d "${selected}" ] && break + echo ">>> Invalid Selection <<<"; + done + + if [ -n "${selected}" ]; then + echo "Selected: ${selected}" + else + select_folder "${FOLDER}" + fi + + popd >/dev/null || return +} diff --git a/scripts/validate_manifests.sh b/scripts/validate_manifests.sh index 18b16a9e..bde71310 100755 --- a/scripts/validate_manifests.sh +++ b/scripts/validate_manifests.sh @@ -4,8 +4,8 @@ # DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" DIR="$(pwd)" -function display_help { - echo "./$(basename "$0") [ -d | --directory DIRECTORY ] [ -q | --quiet ] [ -h | --help | --vpc-keypair | --lab | --teardown | --redeploy | --clear-logs ] [ OPTIONAL ANSIBLE OPTIONS ] +display_help(){ + echo "./$(basename "$0") [ -d | --directory DIRECTORY ] [ -e | --enforce-all-schemas ] [ -h | --help ] [ -sl | --schema-location ] Script to validate the manifests generated by Kustomize Where: -d | --directory DIRECTORY Base directory containing Kustomize overlays @@ -21,61 +21,56 @@ IGNORE_MISSING_SCHEMAS="--ignore-missing-schemas" SCHEMA_LOCATION="${DIR}/openshift-json-schema" KUSTOMIZE_DIRS="${DIR}" -for i in "$@" -do - case $i in - -d=* | --directory=* ) - KUSTOMIZE_DIRS="${i#*=}" - shift - ;; - -e | --enforce-all-schemas ) - shift - IGNORE_MISSING_SCHEMAS="" - shift - ;; - -sl=* | --schema-location=* ) - SCHEMA_LOCATION="${i#*=}" - shift - ;; - -h | --help ) - display_help - exit 0 - ;; - esac -done - -for i in $(find "${KUSTOMIZE_DIRS}" -name "kustomization.yaml" -exec dirname {} \;) -do - - if [[ ${i} == *"./bootstrap"* ]]; then - echo - echo "Skipping validating $i" - echo - continue - fi +init(){ + for i in "${@}" + do + case $i in + -d | --directory ) + shift + KUSTOMIZE_DIRS="${1}" + shift + ;; + -e | --enforce-all-schemas ) + IGNORE_MISSING_SCHEMAS="" + shift + ;; + -sl | --schema-location ) + shift + SCHEMA_LOCATION="${1}" + shift + ;; + -h | --help ) + display_help + exit 0 + ;; + -*) echo >&2 "Invalid option: " "${@}" + exit 1 + ;; + esac + done +} - echo - echo "Validating $i" - echo +process_kustomization(){ - KUSTOMIZE_BUILD_OUTPUT=$(${KUSTOMIZE_CMD} "$i") + echo "Validating..." - build_response=$? + for BUILD in $(find "${KUSTOMIZE_DIRS}" -name "kustomization.yaml" -exec dirname {} \;) + do + echo "${BUILD}" - if [ $build_response -ne 0 ]; then - echo "Error building $i" - exit 1 - fi + # echo "$KUSTOMIZE_BUILD_OUTPUT" | kubeval ${IGNORE_MISSING_SCHEMAS} --schema-location="file://${SCHEMA_LOCATION}" --force-color + KUSTOMIZE_BUILD_OUTPUT=$(${KUSTOMIZE_CMD} "${BUILD}") -# echo "$KUSTOMIZE_BUILD_OUTPUT" | kubeval ${IGNORE_MISSING_SCHEMAS} --schema-location="file://${SCHEMA_LOCATION}" --force-color + build_response=$? -# validation_response=$? + if [ $build_response -ne 0 ]; then + echo "[ERROR]" + exit 1 + fi -# if [ $validation_response -ne 0 ]; then -# echo "Error validating $i" -# exit 1 -# fi -done + echo "[OK]" + done +} -echo -echo "Manifests successfully validated!" \ No newline at end of file +init "${@}" +process_kustomization