-
Notifications
You must be signed in to change notification settings - Fork 59
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #43 from fgharo/rhoai-2.10-gitops-acceleration
Rhoai 2.10 gitops acceleration
- Loading branch information
Showing
23 changed files
with
273 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ../../base | ||
| - ../../../clusters/overlays/rhoai-stable-2.10 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| namespace: openshift-gitops | ||
|
|
||
| resources: | ||
| - ../../base | ||
| - ../../../components/argocd/apps/overlays/rhoai-stable-2.10 | ||
|
|
||
| patches: | ||
| # set the repo and branch for applications | ||
| - path: patch-application-repo-revision.yaml | ||
| target: | ||
| group: argoproj.io | ||
| 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 | ||
| # kind: Application | ||
| # version: v1alpha1 | ||
|
|
||
| replacements: | ||
| # copy the repo from the application to the applicationsets | ||
| - source: | ||
| kind: Application | ||
| fieldPath: spec.source.repoURL | ||
| targets: | ||
| - select: | ||
| kind: ApplicationSet | ||
| fieldPaths: | ||
| - spec.template.spec.source.repoURL | ||
| - select: | ||
| kind: ApplicationSet | ||
| name: tenants | ||
| fieldPaths: | ||
| - spec.generators.*.git.repoURL | ||
| # copy the branch from the application to the applicationsets | ||
| - source: | ||
| kind: Application | ||
| fieldPath: spec.source.targetRevision | ||
| targets: | ||
| - select: | ||
| kind: ApplicationSet | ||
| fieldPaths: | ||
| - spec.template.spec.source.targetRevision | ||
| - select: | ||
| kind: ApplicationSet | ||
| name: tenants | ||
| fieldPaths: | ||
| - spec.generators.*.git.revision |
2 changes: 2 additions & 0 deletions
2
clusters/overlays/rhoai-stable-2.10/patch-application-manual-sync.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| - op: remove | ||
| path: /spec/syncPolicy |
6 changes: 6 additions & 0 deletions
6
clusters/overlays/rhoai-stable-2.10/patch-application-repo-revision.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| - op: replace | ||
| path: /spec/source/repoURL | ||
| value: 'https://github.com/redhat-ai-services/ai-accelerator.git' | ||
| - op: replace | ||
| path: /spec/source/targetRevision | ||
| value: main |
2 changes: 2 additions & 0 deletions
2
clusters/overlays/rhoai-stable-2.10/patch-applicationset-manual-sync.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| - op: remove | ||
| path: /spec/template/spec/syncPolicy |
23 changes: 23 additions & 0 deletions
23
components/argocd/apps/overlays/rhoai-stable-2.10/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ../../base | ||
|
|
||
| patches: | ||
| - path: patch-cluster-config-app-of-apps.yaml | ||
| target: | ||
| kind: Application | ||
| name: cluster-config-app-of-apps | ||
| - path: patch-operators-list.yaml | ||
| target: | ||
| kind: ApplicationSet | ||
| name: cluster-operators | ||
| - path: patch-configs-list.yaml | ||
| target: | ||
| kind: ApplicationSet | ||
| name: cluster-configs | ||
| - path: patch-tenants-applicationset.yaml | ||
| target: | ||
| kind: ApplicationSet | ||
| name: tenants |
7 changes: 7 additions & 0 deletions
7
components/argocd/apps/overlays/rhoai-stable-2.10/patch-cluster-config-app-of-apps.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| apiVersion: argoproj.io/v1alpha1 | ||
| kind: Application | ||
| metadata: | ||
| name: cluster-config-app-of-apps | ||
| spec: | ||
| source: | ||
| path: clusters/overlays/rhoai-stable-2.10 |
13 changes: 13 additions & 0 deletions
13
components/argocd/apps/overlays/rhoai-stable-2.10/patch-configs-list.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| apiVersion: argoproj.io/v1alpha1 | ||
| kind: ApplicationSet | ||
| metadata: | ||
| name: cluster-configs | ||
| spec: | ||
| generators: | ||
| - list: | ||
| elements: | ||
| - cluster: local | ||
| url: https://kubernetes.default.svc | ||
| values: | ||
| name: user-workload-monitoring | ||
| path: components/cluster-configs/user-workload-monitoring/overlays/default |
44 changes: 44 additions & 0 deletions
44
components/argocd/apps/overlays/rhoai-stable-2.10/patch-operators-list.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| apiVersion: argoproj.io/v1alpha1 | ||
| kind: ApplicationSet | ||
| metadata: | ||
| name: cluster-operators | ||
| spec: | ||
| generators: | ||
| - list: | ||
| elements: | ||
| - cluster: local | ||
| url: https://kubernetes.default.svc | ||
| values: | ||
| name: openshift-ai-operator | ||
| path: components/operators/openshift-ai/aggregate/overlays/stable-2.10 | ||
| - cluster: local | ||
| url: https://kubernetes.default.svc | ||
| values: | ||
| name: openshift-gitops-operator | ||
| path: components/operators/openshift-gitops/aggregate/overlays/rhdp | ||
| - cluster: local | ||
| url: https://kubernetes.default.svc | ||
| values: | ||
| name: openshift-pipelines-operator | ||
| path: components/operators/openshift-pipelines/operator/overlays/latest | ||
| - cluster: local | ||
| url: https://kubernetes.default.svc | ||
| values: | ||
| name: openshift-serverless-operator | ||
| path: components/operators/openshift-serverless/operator/overlays/stable | ||
| - cluster: local | ||
| url: https://kubernetes.default.svc | ||
| values: | ||
| name: openshift-servicemesh-operator | ||
| path: components/operators/openshift-servicemesh/operator/overlays/stable | ||
|
|
||
| # - cluster: local | ||
| # url: https://kubernetes.default.svc | ||
| # values: | ||
| # name: openshift-logging-operator | ||
| # path: components/operators/openshift-logging/aggregate/overlays/default | ||
| # - cluster: local | ||
| # url: https://kubernetes.default.svc | ||
| # values: | ||
| # name: web-terminal-operator | ||
| # path: components/operators/web-terminal-operator/operator/overlays/fast |
3 changes: 3 additions & 0 deletions
3
components/argocd/apps/overlays/rhoai-stable-2.10/patch-tenants-applicationset.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| - op: replace | ||
| path: /spec/generators/0/git/directories/0/path | ||
| value: tenants/*/*/overlays/rhoai-stable-2.10 |
9 changes: 9 additions & 0 deletions
9
components/operators/openshift-ai/aggregate/overlays/stable-2.10/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| commonAnnotations: | ||
| argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true | ||
|
|
||
| resources: | ||
| - ../../../operator/overlays/stable-2.10 | ||
| - ../../../instance/overlays/stable-2.10 |
17 changes: 17 additions & 0 deletions
17
components/operators/openshift-ai/instance/overlays/stable-2.10/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| namespace: redhat-ods-applications | ||
|
|
||
| resources: | ||
| - ../../base | ||
|
|
||
| components: | ||
| - ../../components/components-serving | ||
| - ../../components/components-training | ||
| - ../../components/default-notebook-pvc-size | ||
| - ../../components/idle-notebook-culling | ||
| - ../../components/notebook-pod-sizes | ||
| - ../../components/make-kubeadmin-cluster-admin | ||
| - ../../components/model-server-pod-sizes | ||
| - ../../components/rhoai-dashboard-access |
11 changes: 11 additions & 0 deletions
11
components/operators/openshift-ai/operator/overlays/stable-2.10/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ../../base | ||
|
|
||
| patches: | ||
| - target: | ||
| kind: Subscription | ||
| name: rhods-operator | ||
| path: patch-channel.yaml |
3 changes: 3 additions & 0 deletions
3
components/operators/openshift-ai/operator/overlays/stable-2.10/patch-channel.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| - op: replace | ||
| path: /spec/channel | ||
| value: stable-2.10 |
5 changes: 5 additions & 0 deletions
5
tenants/ai-custom-workbenches/namespaces/overlays/rhoai-stable-2.10/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ../../base |
10 changes: 10 additions & 0 deletions
10
tenants/ai-example/datascience-pipelines/overlays/rhoai-stable-2.10/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ../../base | ||
|
|
||
| patches: | ||
| - target: | ||
| kind: DataSciencePipelinesApplication | ||
| path: patch-dspa-for-2.10.yaml |
8 changes: 8 additions & 0 deletions
8
tenants/ai-example/datascience-pipelines/overlays/rhoai-stable-2.10/patch-dspa-for-2.10.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| - op: remove | ||
| path: /spec/dspVersion | ||
| - op: remove | ||
| path: /spec/objectStorage/enableExternalRoute | ||
| - op: remove | ||
| path: /spec/objectStorage/externalStorage/basePath | ||
| - op: remove | ||
| path: /spec/objectStorage/externalStorage/region |
5 changes: 5 additions & 0 deletions
5
tenants/ai-example/multi-model-serving-minio/overlays/rhoai-stable-2.10/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ../../base |
5 changes: 5 additions & 0 deletions
5
tenants/ai-example/multi-model-serving/overlays/rhoai-stable-2.10/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ../../base/ |
5 changes: 5 additions & 0 deletions
5
tenants/ai-example/namespaces/overlays/rhoai-stable-2.10/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ../../base |
5 changes: 5 additions & 0 deletions
5
tenants/ai-example/single-model-serving-minio/overlays/rhoai-stable-2.10/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ../../base |
5 changes: 5 additions & 0 deletions
5
tenants/ai-example/single-model-serving-tgis/overlays/rhoai-stable-2.10/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ../../base |
23 changes: 23 additions & 0 deletions
23
tenants/ai-example/workbenches/overlays/rhoai-stable-2.10/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
|
|
||
| resources: | ||
| - ../../base | ||
|
|
||
| images: | ||
| - name: image-registry.openshift-image-registry.svc:5000/redhat-ods-applications/s2i-minimal-notebook | ||
| newTag: "2023.2" | ||
|
|
||
| replacements: | ||
| - source: | ||
| kind: Notebook | ||
| group: kubeflow.org | ||
| name: example-workbench | ||
| fieldPath: spec.template.spec.containers.[name=example-workbench].image | ||
| targets: | ||
| - select: | ||
| kind: Notebook | ||
| group: kubeflow.org | ||
| name: example-workbench | ||
| fieldPaths: | ||
| - spec.template.spec.containers.[name=example-workbench].env.[name=JUPYTER_IMAGE].value |