refactor / cleanup

redhat-na-ssa · Oct 18, 2023 · f33d81d · f33d81d
1 parent be738b3
commit f33d81d
Show file tree

Hide file tree

Showing 49 changed files with 13 additions and 65 deletions.
diff --git a/components/configs/aggragates/rhods/kustomization.yaml b/components/configs/aggragates/rhods/kustomization.yaml
@@ -2,41 +2,20 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
+  - ../../../configs/cluster/console/overlays/default
   - ../../../operators/rhods-operator/operator/overlays/stable
-  - ../../kustomized/custom-notebook-images
   - ../../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/...onfigs/kustomized/custom-images/README.md → ...onfigs/apply-only/custom-images/README.md b/...onfigs/kustomized/custom-images/README.md → ...onfigs/apply-only/custom-images/README.md
diff --git a/...kustomized/custom-images/s2i-r-shiny.yaml → ...apply-only/custom-images/s2i-r-shiny.yaml b/...kustomized/custom-images/s2i-r-shiny.yaml → ...apply-only/custom-images/s2i-r-shiny.yaml
diff --git a/...stomized/custom-notebook-images/README.md → ...ustomized/custom-notebook-images/NOTES.md b/...stomized/custom-notebook-images/README.md → ...ustomized/custom-notebook-images/NOTES.md
diff --git a/...ebook-images/code-server/imagestream.yaml → ...-images/base/code-server/imagestream.yaml b/...ebook-images/code-server/imagestream.yaml → ...-images/base/code-server/imagestream.yaml
diff --git a/...ook-images/code-server/kustomization.yaml → ...mages/base/code-server/kustomization.yaml b/...ook-images/code-server/kustomization.yaml → ...mages/base/code-server/kustomization.yaml
diff --git a/...custom-notebook-images/kustomization.yaml → ...m-notebook-images/base/kustomization.yaml b/...custom-notebook-images/kustomization.yaml → ...m-notebook-images/base/kustomization.yaml
diff --git a/...om-notebook-images/lightgbm/Containerfile → ...tebook-images/base/lightgbm/Containerfile b/...om-notebook-images/lightgbm/Containerfile → ...tebook-images/base/lightgbm/Containerfile
diff --git a/...d/custom-notebook-images/lightgbm/Pipfile → ...tom-notebook-images/base/lightgbm/Pipfile b/...d/custom-notebook-images/lightgbm/Pipfile → ...tom-notebook-images/base/lightgbm/Pipfile
diff --git a/...tom-notebook-images/lightgbm/Pipfile.lock → ...otebook-images/base/lightgbm/Pipfile.lock b/...tom-notebook-images/lightgbm/Pipfile.lock → ...otebook-images/base/lightgbm/Pipfile.lock
diff --git a/...-notebook-images/lightgbm/buildconfig.yml → ...book-images/base/lightgbm/buildconfig.yml b/...-notebook-images/lightgbm/buildconfig.yml → ...book-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
diff --git a/...-notebook-images/lightgbm/imagestream.yml → ...book-images/base/lightgbm/imagestream.yml b/...-notebook-images/lightgbm/imagestream.yml → ...book-images/base/lightgbm/imagestream.yml
diff --git a/...tebook-images/lightgbm/kustomization.yaml → ...k-images/base/lightgbm/kustomization.yaml b/...tebook-images/lightgbm/kustomization.yaml → ...k-images/base/lightgbm/kustomization.yaml
diff --git a/.../custom-notebook-images/namespace-rb.yaml → ...om-notebook-images/base/namespace-rb.yaml b/.../custom-notebook-images/namespace-rb.yaml → ...om-notebook-images/base/namespace-rb.yaml
diff --git a/...zed/custom-notebook-images/namespace.yaml → ...ustom-notebook-images/base/namespace.yaml b/...zed/custom-notebook-images/namespace.yaml → ...ustom-notebook-images/base/namespace.yaml
diff --git a/...stom-notebook-images/opencv/Containerfile → ...notebook-images/base/opencv/Containerfile b/...stom-notebook-images/opencv/Containerfile → ...notebook-images/base/opencv/Containerfile
diff --git a/...k-images/opencv/buildconfig-graphviz.yaml → ...ges/base/opencv/buildconfig-graphviz.yaml b/...k-images/opencv/buildconfig-graphviz.yaml → ...ges/base/opencv/buildconfig-graphviz.yaml
diff --git a/...m-notebook-images/opencv/buildconfig.yaml → ...ebook-images/base/opencv/buildconfig.yaml b/...m-notebook-images/opencv/buildconfig.yaml → ...ebook-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/...m-notebook-images/opencv/imagestream.yaml → ...ebook-images/base/opencv/imagestream.yaml b/...m-notebook-images/opencv/imagestream.yaml → ...ebook-images/base/opencv/imagestream.yaml
diff --git a/...notebook-images/opencv/kustomization.yaml → ...ook-images/base/opencv/kustomization.yaml b/...notebook-images/opencv/kustomization.yaml → ...ook-images/base/opencv/kustomization.yaml
diff --git a/...-notebook-images/rstudio/imagestream.yaml → ...book-images/base/rstudio/imagestream.yaml b/...-notebook-images/rstudio/imagestream.yaml → ...book-images/base/rstudio/imagestream.yaml
diff --git a/...otebook-images/rstudio/kustomization.yaml → ...ok-images/base/rstudio/kustomization.yaml b/...otebook-images/rstudio/kustomization.yaml → ...ok-images/base/rstudio/kustomization.yaml
diff --git a/...gates/custom-notebooks/kustomization.yaml → ...-images/overlays/rhods/kustomization.yaml b/...gates/custom-notebooks/kustomization.yaml → ...-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
diff --git a/components/configs/kustomized/pipeline-images/s2i-build-ingest.yaml b/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
diff --git a/components/configs/kustomized/smart-cities/kustomization.yaml b/components/configs/kustomized/smart-cities/kustomization.yaml
diff --git a/components/configs/kustomized/smart-cities/namespace-rb.yaml b/components/configs/kustomized/smart-cities/namespace-rb.yaml
diff --git a/components/configs/kustomized/smart-cities/namespace.yaml b/components/configs/kustomized/smart-cities/namespace.yaml
diff --git a/...nts/configs/kustomized/airflow/Chart.yaml → dump/airflow/Chart.yaml b/...nts/configs/kustomized/airflow/Chart.yaml → dump/airflow/Chart.yaml
diff --git a/...ents/configs/kustomized/airflow/README.md → dump/airflow/README.md b/...ents/configs/kustomized/airflow/README.md → dump/airflow/README.md
diff --git a/...nfigs/kustomized/airflow/app-airflow.yaml → dump/airflow/app-airflow.yaml b/...nfigs/kustomized/airflow/app-airflow.yaml → dump/airflow/app-airflow.yaml
diff --git a/...ts/configs/kustomized/airflow/get_helm.sh → dump/airflow/get_helm.sh b/...ts/configs/kustomized/airflow/get_helm.sh → dump/airflow/get_helm.sh
diff --git a/...igs/kustomized/airflow/kustomization.yaml → dump/airflow/kustomization.yaml b/...igs/kustomized/airflow/kustomization.yaml → dump/airflow/kustomization.yaml
diff --git a/...ts/configs/kustomized/airflow/values.yaml → dump/airflow/values.yaml b/...ts/configs/kustomized/airflow/values.yaml → dump/airflow/values.yaml
diff --git a/...gs/kustomized/datasci-pipelines/README.md → dump/datasci-pipelines/README.md b/...gs/kustomized/datasci-pipelines/README.md → dump/datasci-pipelines/README.md
diff --git a/...gs/kustomized/datasci-pipelines/dspa.yaml → dump/datasci-pipelines/dspa.yaml b/...gs/kustomized/datasci-pipelines/dspa.yaml → dump/datasci-pipelines/dspa.yaml
diff --git a/...ized/datasci-pipelines/kustomization.yaml → dump/datasci-pipelines/kustomization.yaml b/...ized/datasci-pipelines/kustomization.yaml → dump/datasci-pipelines/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 #   component: demo
 
 resources:
-- dspa.yaml
+  - dspa.yaml
diff --git a/...omized/datasci-pipelines/requirements.txt → dump/datasci-pipelines/requirements.txt b/...omized/datasci-pipelines/requirements.txt → dump/datasci-pipelines/requirements.txt
diff --git a/...omized/datasci-project/kustomization.yaml → dump/datasci-project/kustomization.yaml b/...omized/datasci-project/kustomization.yaml → dump/datasci-project/kustomization.yaml
diff --git a/...tomized/datasci-project/minio-secret.yaml → dump/datasci-project/minio-secret.yaml b/...tomized/datasci-project/minio-secret.yaml → dump/datasci-project/minio-secret.yaml
diff --git a/...kustomized/datasci-project/namespace.yaml → dump/datasci-project/namespace.yaml b/...kustomized/datasci-project/namespace.yaml → dump/datasci-project/namespace.yaml
diff --git a/...kustomized/dev-catalog/builder-image.yaml → dump/dev-catalog/builder-image.yaml b/...kustomized/dev-catalog/builder-image.yaml → dump/dev-catalog/builder-image.yaml
diff --git a/...nfigs/kustomized/dev-catalog/devfile.yaml → dump/dev-catalog/devfile.yaml b/...nfigs/kustomized/dev-catalog/devfile.yaml → dump/dev-catalog/devfile.yaml
diff --git a/...omized/dev-catalog/helm-codekow-repo.yaml → dump/dev-catalog/helm-codekow-repo.yaml b/...omized/dev-catalog/helm-codekow-repo.yaml → dump/dev-catalog/helm-codekow-repo.yaml
diff --git a/...figs/kustomized/dev-catalog/template.yaml → dump/dev-catalog/template.yaml b/...figs/kustomized/dev-catalog/template.yaml → dump/dev-catalog/template.yaml
diff --git a/...igs/kustomized/pgadmin4/app-pgadmin4.yaml → dump/pgadmin4/app-pgadmin4.yaml b/...igs/kustomized/pgadmin4/app-pgadmin4.yaml → dump/pgadmin4/app-pgadmin4.yaml
diff --git a/...gs/kustomized/pgadmin4/kustomization.yaml → dump/pgadmin4/kustomization.yaml b/...gs/kustomized/pgadmin4/kustomization.yaml → dump/pgadmin4/kustomization.yaml
diff --git a/...igs/kustomized/pgadmin4/namespace-rb.yaml → dump/pgadmin4/namespace-rb.yaml b/...igs/kustomized/pgadmin4/namespace-rb.yaml → dump/pgadmin4/namespace-rb.yaml