diff --git a/components/configs/aggragates/rhods/kustomization.yaml b/components/configs/aggragates/rhods/kustomization.yaml index 412d5767..bc287a53 100644 --- a/components/configs/aggragates/rhods/kustomization.yaml +++ b/components/configs/aggragates/rhods/kustomization.yaml @@ -2,40 +2,20 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../kustomized/custom-notebook-images + - ../../../configs/cluster/console/overlays/default + - ../../../operators/rhods-operator/operator/overlays/stable - ../../kustomized/rhods - ../../kustomized/rhods-projects + - ../../kustomized/custom-notebook-images/overlays/rhods patches: - target: - group: image.openshift.io - kind: ImageStream + kind: ConsoleNotification + name: banner-top patch: |- - op: replace - path: /metadata/namespace - value: redhat-ods-applications - - target: - group: image.openshift.io - kind: ImageStreamTag - patch: |- - - op: replace - path: /metadata/namespace - value: redhat-ods-applications - - target: - group: build.openshift.io - kind: BuildConfig - patch: |- - - op: replace - path: /spec/output/to/namespace - value: redhat-ods-applications - - target: - group: build.openshift.io - kind: BuildConfig - # name: opencv-notebook-graphviz - patch: |- - - op: replace - path: /spec/strategy/dockerStrategy/from/namespace - value: redhat-ods-applications + path: /spec/text + value: 'DEMO: Red Hat Open Data Science (RHODS)' - target: group: user.openshift.io version: v1 diff --git a/components/configs/kustomized/custom-images/README.md b/components/configs/apply-only/custom-images/README.md similarity index 100% rename from components/configs/kustomized/custom-images/README.md rename to components/configs/apply-only/custom-images/README.md diff --git a/components/configs/kustomized/custom-images/s2i-r-shiny.yaml b/components/configs/apply-only/custom-images/s2i-r-shiny.yaml similarity index 100% rename from components/configs/kustomized/custom-images/s2i-r-shiny.yaml rename to components/configs/apply-only/custom-images/s2i-r-shiny.yaml diff --git a/components/configs/kustomized/custom-notebook-images/README.md b/components/configs/kustomized/custom-notebook-images/NOTES.md similarity index 100% rename from components/configs/kustomized/custom-notebook-images/README.md rename to components/configs/kustomized/custom-notebook-images/NOTES.md diff --git a/components/configs/kustomized/custom-notebook-images/code-server/imagestream.yaml b/components/configs/kustomized/custom-notebook-images/base/code-server/imagestream.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/code-server/imagestream.yaml rename to components/configs/kustomized/custom-notebook-images/base/code-server/imagestream.yaml diff --git a/components/configs/kustomized/custom-notebook-images/code-server/kustomization.yaml b/components/configs/kustomized/custom-notebook-images/base/code-server/kustomization.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/code-server/kustomization.yaml rename to components/configs/kustomized/custom-notebook-images/base/code-server/kustomization.yaml diff --git a/components/configs/kustomized/custom-notebook-images/kustomization.yaml b/components/configs/kustomized/custom-notebook-images/base/kustomization.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/kustomization.yaml rename to components/configs/kustomized/custom-notebook-images/base/kustomization.yaml diff --git a/components/configs/kustomized/custom-notebook-images/lightgbm/Containerfile b/components/configs/kustomized/custom-notebook-images/base/lightgbm/Containerfile similarity index 100% rename from components/configs/kustomized/custom-notebook-images/lightgbm/Containerfile rename to components/configs/kustomized/custom-notebook-images/base/lightgbm/Containerfile diff --git a/components/configs/kustomized/custom-notebook-images/lightgbm/Pipfile b/components/configs/kustomized/custom-notebook-images/base/lightgbm/Pipfile similarity index 100% rename from components/configs/kustomized/custom-notebook-images/lightgbm/Pipfile rename to components/configs/kustomized/custom-notebook-images/base/lightgbm/Pipfile diff --git a/components/configs/kustomized/custom-notebook-images/lightgbm/Pipfile.lock b/components/configs/kustomized/custom-notebook-images/base/lightgbm/Pipfile.lock similarity index 100% rename from components/configs/kustomized/custom-notebook-images/lightgbm/Pipfile.lock rename to components/configs/kustomized/custom-notebook-images/base/lightgbm/Pipfile.lock diff --git a/components/configs/kustomized/custom-notebook-images/lightgbm/buildconfig.yml b/components/configs/kustomized/custom-notebook-images/base/lightgbm/buildconfig.yml similarity index 82% rename from components/configs/kustomized/custom-notebook-images/lightgbm/buildconfig.yml rename to components/configs/kustomized/custom-notebook-images/base/lightgbm/buildconfig.yml index f91eb572..0f347eb2 100644 --- a/components/configs/kustomized/custom-notebook-images/lightgbm/buildconfig.yml +++ b/components/configs/kustomized/custom-notebook-images/base/lightgbm/buildconfig.yml @@ -8,6 +8,7 @@ metadata: spec: runPolicy: Serial triggers: + - type: ConfigChange - type: ImageChange imageChange: from: @@ -16,7 +17,7 @@ spec: source: git: uri: https://github.com/codekow/demo-ai-gitops-catalog.git - contextDir: components/demos/instance/custom-notebook-images/lightgbm + contextDir: components/configs/kustomized/custom-notebook-images/base/lightgbm strategy: dockerStrategy: from: @@ -26,4 +27,4 @@ spec: output: to: kind: ImageStreamTag - name: lightgbm:3.3.5 + name: lightgbm:3.3.5 \ No newline at end of file diff --git a/components/configs/kustomized/custom-notebook-images/lightgbm/imagestream.yml b/components/configs/kustomized/custom-notebook-images/base/lightgbm/imagestream.yml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/lightgbm/imagestream.yml rename to components/configs/kustomized/custom-notebook-images/base/lightgbm/imagestream.yml diff --git a/components/configs/kustomized/custom-notebook-images/lightgbm/kustomization.yaml b/components/configs/kustomized/custom-notebook-images/base/lightgbm/kustomization.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/lightgbm/kustomization.yaml rename to components/configs/kustomized/custom-notebook-images/base/lightgbm/kustomization.yaml diff --git a/components/configs/kustomized/custom-notebook-images/namespace-rb.yaml b/components/configs/kustomized/custom-notebook-images/base/namespace-rb.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/namespace-rb.yaml rename to components/configs/kustomized/custom-notebook-images/base/namespace-rb.yaml diff --git a/components/configs/kustomized/custom-notebook-images/namespace.yaml b/components/configs/kustomized/custom-notebook-images/base/namespace.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/namespace.yaml rename to components/configs/kustomized/custom-notebook-images/base/namespace.yaml diff --git a/components/configs/kustomized/custom-notebook-images/opencv/Containerfile b/components/configs/kustomized/custom-notebook-images/base/opencv/Containerfile similarity index 100% rename from components/configs/kustomized/custom-notebook-images/opencv/Containerfile rename to components/configs/kustomized/custom-notebook-images/base/opencv/Containerfile diff --git a/components/configs/kustomized/custom-notebook-images/opencv/buildconfig-graphviz.yaml b/components/configs/kustomized/custom-notebook-images/base/opencv/buildconfig-graphviz.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/opencv/buildconfig-graphviz.yaml rename to components/configs/kustomized/custom-notebook-images/base/opencv/buildconfig-graphviz.yaml diff --git a/components/configs/kustomized/custom-notebook-images/opencv/buildconfig.yaml b/components/configs/kustomized/custom-notebook-images/base/opencv/buildconfig.yaml similarity index 83% rename from components/configs/kustomized/custom-notebook-images/opencv/buildconfig.yaml rename to components/configs/kustomized/custom-notebook-images/base/opencv/buildconfig.yaml index 69800e1a..fea1092e 100644 --- a/components/configs/kustomized/custom-notebook-images/opencv/buildconfig.yaml +++ b/components/configs/kustomized/custom-notebook-images/base/opencv/buildconfig.yaml @@ -7,7 +7,7 @@ spec: type: Git git: uri: https://github.com/codekow/demo-ai-gitops-catalog.git - contextDir: components/demos/instance/custom-notebook-images/opencv + contextDir: components/configs/kustomized/custom-notebook-images/base/opencv strategy: type: Docker dockerStrategy: @@ -23,3 +23,4 @@ spec: namespace: custom-notebooks triggers: - type: ConfigChange + # - type: ImageChange diff --git a/components/configs/kustomized/custom-notebook-images/opencv/imagestream.yaml b/components/configs/kustomized/custom-notebook-images/base/opencv/imagestream.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/opencv/imagestream.yaml rename to components/configs/kustomized/custom-notebook-images/base/opencv/imagestream.yaml diff --git a/components/configs/kustomized/custom-notebook-images/opencv/kustomization.yaml b/components/configs/kustomized/custom-notebook-images/base/opencv/kustomization.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/opencv/kustomization.yaml rename to components/configs/kustomized/custom-notebook-images/base/opencv/kustomization.yaml diff --git a/components/configs/kustomized/custom-notebook-images/rstudio/imagestream.yaml b/components/configs/kustomized/custom-notebook-images/base/rstudio/imagestream.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/rstudio/imagestream.yaml rename to components/configs/kustomized/custom-notebook-images/base/rstudio/imagestream.yaml diff --git a/components/configs/kustomized/custom-notebook-images/rstudio/kustomization.yaml b/components/configs/kustomized/custom-notebook-images/base/rstudio/kustomization.yaml similarity index 100% rename from components/configs/kustomized/custom-notebook-images/rstudio/kustomization.yaml rename to components/configs/kustomized/custom-notebook-images/base/rstudio/kustomization.yaml diff --git a/components/configs/aggragates/custom-notebooks/kustomization.yaml b/components/configs/kustomized/custom-notebook-images/overlays/rhods/kustomization.yaml similarity index 95% rename from components/configs/aggragates/custom-notebooks/kustomization.yaml rename to components/configs/kustomized/custom-notebook-images/overlays/rhods/kustomization.yaml index 88edaebc..65d6e145 100644 --- a/components/configs/aggragates/custom-notebooks/kustomization.yaml +++ b/components/configs/kustomized/custom-notebook-images/overlays/rhods/kustomization.yaml @@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - ../../kustomized/custom-notebook-images + - ../../base patches: - target: diff --git a/components/configs/kustomized/pipeline-images/kustomization.yaml b/components/configs/kustomized/pipeline-images/kustomization.yaml deleted file mode 100644 index 8197300f..00000000 --- a/components/configs/kustomized/pipeline-images/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: -- s2i-build-ingest.yaml -- s2i-build-train.yaml \ No newline at end of file diff --git a/components/configs/kustomized/pipeline-images/s2i-build-ingest.yaml b/components/configs/kustomized/pipeline-images/s2i-build-ingest.yaml deleted file mode 100644 index e69de29b..00000000 diff --git a/components/configs/kustomized/pipeline-images/s2i-build-train.yaml b/components/configs/kustomized/pipeline-images/s2i-build-train.yaml deleted file mode 100644 index e69de29b..00000000 diff --git a/components/configs/kustomized/smart-cities/kustomization.yaml b/components/configs/kustomized/smart-cities/kustomization.yaml deleted file mode 100644 index 99a3ea29..00000000 --- a/components/configs/kustomized/smart-cities/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: - - namespace.yaml - - namespace-rb.yaml diff --git a/components/configs/kustomized/smart-cities/namespace-rb.yaml b/components/configs/kustomized/smart-cities/namespace-rb.yaml deleted file mode 100644 index 29fe3ac2..00000000 --- a/components/configs/kustomized/smart-cities/namespace-rb.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: smart-cities-admin - namespace: smart-cities -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/configs/kustomized/smart-cities/namespace.yaml b/components/configs/kustomized/smart-cities/namespace.yaml deleted file mode 100644 index 4bca4858..00000000 --- a/components/configs/kustomized/smart-cities/namespace.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: smart-cities - annotations: - openshift.io/display-name: Smart Cities (Demo) - labels: - argocd.argoproj.io/managed-by: cluster-config diff --git a/components/configs/kustomized/airflow/Chart.yaml b/dump/airflow/Chart.yaml similarity index 100% rename from components/configs/kustomized/airflow/Chart.yaml rename to dump/airflow/Chart.yaml diff --git a/components/configs/kustomized/airflow/README.md b/dump/airflow/README.md similarity index 100% rename from components/configs/kustomized/airflow/README.md rename to dump/airflow/README.md diff --git a/components/configs/kustomized/airflow/app-airflow.yaml b/dump/airflow/app-airflow.yaml similarity index 100% rename from components/configs/kustomized/airflow/app-airflow.yaml rename to dump/airflow/app-airflow.yaml diff --git a/components/configs/kustomized/airflow/get_helm.sh b/dump/airflow/get_helm.sh similarity index 100% rename from components/configs/kustomized/airflow/get_helm.sh rename to dump/airflow/get_helm.sh diff --git a/components/configs/kustomized/airflow/kustomization.yaml b/dump/airflow/kustomization.yaml similarity index 100% rename from components/configs/kustomized/airflow/kustomization.yaml rename to dump/airflow/kustomization.yaml diff --git a/components/configs/kustomized/airflow/values.yaml b/dump/airflow/values.yaml similarity index 100% rename from components/configs/kustomized/airflow/values.yaml rename to dump/airflow/values.yaml diff --git a/components/configs/kustomized/datasci-pipelines/README.md b/dump/datasci-pipelines/README.md similarity index 100% rename from components/configs/kustomized/datasci-pipelines/README.md rename to dump/datasci-pipelines/README.md diff --git a/components/configs/kustomized/datasci-pipelines/dspa.yaml b/dump/datasci-pipelines/dspa.yaml similarity index 100% rename from components/configs/kustomized/datasci-pipelines/dspa.yaml rename to dump/datasci-pipelines/dspa.yaml diff --git a/components/configs/kustomized/datasci-pipelines/kustomization.yaml b/dump/datasci-pipelines/kustomization.yaml similarity index 88% rename from components/configs/kustomized/datasci-pipelines/kustomization.yaml rename to dump/datasci-pipelines/kustomization.yaml index 7e9b949b..619aa294 100644 --- a/components/configs/kustomized/datasci-pipelines/kustomization.yaml +++ b/dump/datasci-pipelines/kustomization.yaml @@ -5,4 +5,4 @@ kind: Kustomization # component: demo resources: -- dspa.yaml + - dspa.yaml diff --git a/components/configs/kustomized/datasci-pipelines/requirements.txt b/dump/datasci-pipelines/requirements.txt similarity index 100% rename from components/configs/kustomized/datasci-pipelines/requirements.txt rename to dump/datasci-pipelines/requirements.txt diff --git a/components/configs/kustomized/datasci-project/kustomization.yaml b/dump/datasci-project/kustomization.yaml similarity index 100% rename from components/configs/kustomized/datasci-project/kustomization.yaml rename to dump/datasci-project/kustomization.yaml diff --git a/components/configs/kustomized/datasci-project/minio-secret.yaml b/dump/datasci-project/minio-secret.yaml similarity index 100% rename from components/configs/kustomized/datasci-project/minio-secret.yaml rename to dump/datasci-project/minio-secret.yaml diff --git a/components/configs/kustomized/datasci-project/namespace.yaml b/dump/datasci-project/namespace.yaml similarity index 100% rename from components/configs/kustomized/datasci-project/namespace.yaml rename to dump/datasci-project/namespace.yaml diff --git a/components/configs/kustomized/dev-catalog/builder-image.yaml b/dump/dev-catalog/builder-image.yaml similarity index 100% rename from components/configs/kustomized/dev-catalog/builder-image.yaml rename to dump/dev-catalog/builder-image.yaml diff --git a/components/configs/kustomized/dev-catalog/devfile.yaml b/dump/dev-catalog/devfile.yaml similarity index 100% rename from components/configs/kustomized/dev-catalog/devfile.yaml rename to dump/dev-catalog/devfile.yaml diff --git a/components/configs/kustomized/dev-catalog/helm-codekow-repo.yaml b/dump/dev-catalog/helm-codekow-repo.yaml similarity index 100% rename from components/configs/kustomized/dev-catalog/helm-codekow-repo.yaml rename to dump/dev-catalog/helm-codekow-repo.yaml diff --git a/components/configs/kustomized/dev-catalog/template.yaml b/dump/dev-catalog/template.yaml similarity index 100% rename from components/configs/kustomized/dev-catalog/template.yaml rename to dump/dev-catalog/template.yaml diff --git a/components/configs/kustomized/pgadmin4/app-pgadmin4.yaml b/dump/pgadmin4/app-pgadmin4.yaml similarity index 100% rename from components/configs/kustomized/pgadmin4/app-pgadmin4.yaml rename to dump/pgadmin4/app-pgadmin4.yaml diff --git a/components/configs/kustomized/pgadmin4/kustomization.yaml b/dump/pgadmin4/kustomization.yaml similarity index 100% rename from components/configs/kustomized/pgadmin4/kustomization.yaml rename to dump/pgadmin4/kustomization.yaml diff --git a/components/configs/kustomized/pgadmin4/namespace-rb.yaml b/dump/pgadmin4/namespace-rb.yaml similarity index 100% rename from components/configs/kustomized/pgadmin4/namespace-rb.yaml rename to dump/pgadmin4/namespace-rb.yaml