From 900735248b9f34c1304bcc4e275c52fe3f6b3fc4 Mon Sep 17 00:00:00 2001 From: fharo Date: Wed, 7 Aug 2024 21:07:06 -0700 Subject: [PATCH 01/10] Adding initial changes for accelerating the deployment of rhoai 2.10 using ai-accelerator gitops project. --- .../rhoai-eus-2.10/kustomization.yaml | 6 ++ .../rhoai-eus-2.10/kustomization.yaml | 56 +++++++++++++++++++ .../patch-application-manual-sync.yaml | 2 + .../patch-application-repo-revision.yaml | 8 +++ .../patch-applicationset-manual-sync.yaml | 2 + .../rhoai-eus-2.10/kustomization.yaml | 23 ++++++++ .../patch-cluster-config-app-of-apps.yaml | 7 +++ .../rhoai-eus-2.10/patch-configs-list.yaml | 13 +++++ .../rhoai-eus-2.10/patch-operators-list.yaml | 44 +++++++++++++++ .../patch-tenants-applicationset.yaml | 3 + .../overlays/eus-2.10/kustomization.yaml | 9 +++ .../overlays/eus-2.10/kustomization.yaml | 11 ++++ .../overlays/eus-2.10/patch-channel.yaml | 3 + 13 files changed, 187 insertions(+) create mode 100644 bootstrap/overlays/rhoai-eus-2.10/kustomization.yaml create mode 100644 clusters/overlays/rhoai-eus-2.10/kustomization.yaml create mode 100644 clusters/overlays/rhoai-eus-2.10/patch-application-manual-sync.yaml create mode 100644 clusters/overlays/rhoai-eus-2.10/patch-application-repo-revision.yaml create mode 100644 clusters/overlays/rhoai-eus-2.10/patch-applicationset-manual-sync.yaml create mode 100644 components/argocd/apps/overlays/rhoai-eus-2.10/kustomization.yaml create mode 100644 components/argocd/apps/overlays/rhoai-eus-2.10/patch-cluster-config-app-of-apps.yaml create mode 100644 components/argocd/apps/overlays/rhoai-eus-2.10/patch-configs-list.yaml create mode 100644 components/argocd/apps/overlays/rhoai-eus-2.10/patch-operators-list.yaml create mode 100644 components/argocd/apps/overlays/rhoai-eus-2.10/patch-tenants-applicationset.yaml create mode 100644 components/operators/openshift-ai/aggregate/overlays/eus-2.10/kustomization.yaml create mode 100644 components/operators/openshift-ai/operator/overlays/eus-2.10/kustomization.yaml create mode 100644 components/operators/openshift-ai/operator/overlays/eus-2.10/patch-channel.yaml diff --git a/bootstrap/overlays/rhoai-eus-2.10/kustomization.yaml b/bootstrap/overlays/rhoai-eus-2.10/kustomization.yaml new file mode 100644 index 00000000..48c04ab2 --- /dev/null +++ b/bootstrap/overlays/rhoai-eus-2.10/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: +- ../../base +- ../../../clusters/overlays/rhoai-eus-2.10 diff --git a/clusters/overlays/rhoai-eus-2.10/kustomization.yaml b/clusters/overlays/rhoai-eus-2.10/kustomization.yaml new file mode 100644 index 00000000..c3882171 --- /dev/null +++ b/clusters/overlays/rhoai-eus-2.10/kustomization.yaml @@ -0,0 +1,56 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: openshift-gitops + +resources: +- ../../base +- ../../../components/argocd/apps/overlays/rhoai-eus-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 diff --git a/clusters/overlays/rhoai-eus-2.10/patch-application-manual-sync.yaml b/clusters/overlays/rhoai-eus-2.10/patch-application-manual-sync.yaml new file mode 100644 index 00000000..d289dd4a --- /dev/null +++ b/clusters/overlays/rhoai-eus-2.10/patch-application-manual-sync.yaml @@ -0,0 +1,2 @@ +- op: remove + path: /spec/syncPolicy diff --git a/clusters/overlays/rhoai-eus-2.10/patch-application-repo-revision.yaml b/clusters/overlays/rhoai-eus-2.10/patch-application-repo-revision.yaml new file mode 100644 index 00000000..4d9916fd --- /dev/null +++ b/clusters/overlays/rhoai-eus-2.10/patch-application-repo-revision.yaml @@ -0,0 +1,8 @@ +- op: replace + path: /spec/source/repoURL + # TODO Change back when ready to merge back to upstream. + # value: 'https://github.com/redhat-ai-services/ai-accelerator.git' + value: 'https://github.com/fgharo/ai-accelerator.git' +- op: replace + path: /spec/source/targetRevision + value: main diff --git a/clusters/overlays/rhoai-eus-2.10/patch-applicationset-manual-sync.yaml b/clusters/overlays/rhoai-eus-2.10/patch-applicationset-manual-sync.yaml new file mode 100644 index 00000000..a60ffc01 --- /dev/null +++ b/clusters/overlays/rhoai-eus-2.10/patch-applicationset-manual-sync.yaml @@ -0,0 +1,2 @@ +- op: remove + path: /spec/template/spec/syncPolicy diff --git a/components/argocd/apps/overlays/rhoai-eus-2.10/kustomization.yaml b/components/argocd/apps/overlays/rhoai-eus-2.10/kustomization.yaml new file mode 100644 index 00000000..36329f40 --- /dev/null +++ b/components/argocd/apps/overlays/rhoai-eus-2.10/kustomization.yaml @@ -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 diff --git a/components/argocd/apps/overlays/rhoai-eus-2.10/patch-cluster-config-app-of-apps.yaml b/components/argocd/apps/overlays/rhoai-eus-2.10/patch-cluster-config-app-of-apps.yaml new file mode 100644 index 00000000..b3095439 --- /dev/null +++ b/components/argocd/apps/overlays/rhoai-eus-2.10/patch-cluster-config-app-of-apps.yaml @@ -0,0 +1,7 @@ +apiVersion: argoproj.io/v1alpha1 +kind: Application +metadata: + name: cluster-config-app-of-apps +spec: + source: + path: clusters/overlays/rhoai-eus-2.10 diff --git a/components/argocd/apps/overlays/rhoai-eus-2.10/patch-configs-list.yaml b/components/argocd/apps/overlays/rhoai-eus-2.10/patch-configs-list.yaml new file mode 100644 index 00000000..cb8d4f9c --- /dev/null +++ b/components/argocd/apps/overlays/rhoai-eus-2.10/patch-configs-list.yaml @@ -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 diff --git a/components/argocd/apps/overlays/rhoai-eus-2.10/patch-operators-list.yaml b/components/argocd/apps/overlays/rhoai-eus-2.10/patch-operators-list.yaml new file mode 100644 index 00000000..cfab75d7 --- /dev/null +++ b/components/argocd/apps/overlays/rhoai-eus-2.10/patch-operators-list.yaml @@ -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/eus-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 diff --git a/components/argocd/apps/overlays/rhoai-eus-2.10/patch-tenants-applicationset.yaml b/components/argocd/apps/overlays/rhoai-eus-2.10/patch-tenants-applicationset.yaml new file mode 100644 index 00000000..f4cd8eb9 --- /dev/null +++ b/components/argocd/apps/overlays/rhoai-eus-2.10/patch-tenants-applicationset.yaml @@ -0,0 +1,3 @@ +- op: replace + path: /spec/generators/0/git/directories/0/path + value: tenants/*/*/overlays/rhoai-eus-2.10 diff --git a/components/operators/openshift-ai/aggregate/overlays/eus-2.10/kustomization.yaml b/components/operators/openshift-ai/aggregate/overlays/eus-2.10/kustomization.yaml new file mode 100644 index 00000000..ed9f58e2 --- /dev/null +++ b/components/operators/openshift-ai/aggregate/overlays/eus-2.10/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +commonAnnotations: + argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true + +resources: +- ../../../operator/overlays/eus-2.10 +- ../../../instance/overlays/eus-2.10 diff --git a/components/operators/openshift-ai/operator/overlays/eus-2.10/kustomization.yaml b/components/operators/openshift-ai/operator/overlays/eus-2.10/kustomization.yaml new file mode 100644 index 00000000..975881f4 --- /dev/null +++ b/components/operators/openshift-ai/operator/overlays/eus-2.10/kustomization.yaml @@ -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 diff --git a/components/operators/openshift-ai/operator/overlays/eus-2.10/patch-channel.yaml b/components/operators/openshift-ai/operator/overlays/eus-2.10/patch-channel.yaml new file mode 100644 index 00000000..db6d2e2f --- /dev/null +++ b/components/operators/openshift-ai/operator/overlays/eus-2.10/patch-channel.yaml @@ -0,0 +1,3 @@ +- op: replace + path: /spec/channel + value: eus-2.10 From 484ef38e971cd0f37c2ee18f2bb0aee03034085f Mon Sep 17 00:00:00 2001 From: fharo Date: Wed, 7 Aug 2024 21:26:36 -0700 Subject: [PATCH 02/10] Replacing targetRevision to my dev branch rhoai-2.10-gitops-acceleration also turning on manual sync for more control. Signed-off-by: fharo --- .../rhoai-eus-2.10/kustomization.yaml | 22 ++++++++++--------- .../patch-application-repo-revision.yaml | 4 +++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/clusters/overlays/rhoai-eus-2.10/kustomization.yaml b/clusters/overlays/rhoai-eus-2.10/kustomization.yaml index c3882171..9223aa39 100644 --- a/clusters/overlays/rhoai-eus-2.10/kustomization.yaml +++ b/clusters/overlays/rhoai-eus-2.10/kustomization.yaml @@ -14,16 +14,18 @@ patches: 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 + # TODO Comment back when merging back to upstream. + # TODO Also test with 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 diff --git a/clusters/overlays/rhoai-eus-2.10/patch-application-repo-revision.yaml b/clusters/overlays/rhoai-eus-2.10/patch-application-repo-revision.yaml index 4d9916fd..267e80b2 100644 --- a/clusters/overlays/rhoai-eus-2.10/patch-application-repo-revision.yaml +++ b/clusters/overlays/rhoai-eus-2.10/patch-application-repo-revision.yaml @@ -5,4 +5,6 @@ value: 'https://github.com/fgharo/ai-accelerator.git' - op: replace path: /spec/source/targetRevision - value: main + # TODO Change back when ready to merge back to upstream. + # value: main + value: rhoai-2.10-gitops-acceleration From 3ac6ed21d2646337f3714457e04ba4c8da989d33 Mon Sep 17 00:00:00 2001 From: fharo Date: Wed, 7 Aug 2024 21:35:48 -0700 Subject: [PATCH 03/10] Fixing indentation so as to find the patches. Signed-off-by: fharo --- .../rhoai-eus-2.10/kustomization.yaml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/clusters/overlays/rhoai-eus-2.10/kustomization.yaml b/clusters/overlays/rhoai-eus-2.10/kustomization.yaml index 9223aa39..d17c5512 100644 --- a/clusters/overlays/rhoai-eus-2.10/kustomization.yaml +++ b/clusters/overlays/rhoai-eus-2.10/kustomization.yaml @@ -13,19 +13,19 @@ patches: target: group: argoproj.io kind: Application - # Uncomment patches to disable automatic sync - # TODO Comment back when merging back to upstream. - # TODO Also test with 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 +# Uncomment patches to disable automatic sync +# TODO Comment back when merging back to upstream. +# TODO Also test with 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 From ad366ce36ac6389511fd38b33170fd6908674f6e Mon Sep 17 00:00:00 2001 From: fharo Date: Wed, 7 Aug 2024 21:45:56 -0700 Subject: [PATCH 04/10] There is no eus-2.10 channel in Ocp 2.15 yet. Eventually stable-2.10 will become that but not yet. In meantime point at stable-2.10. --- .../openshift-ai/operator/overlays/eus-2.10/patch-channel.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/operators/openshift-ai/operator/overlays/eus-2.10/patch-channel.yaml b/components/operators/openshift-ai/operator/overlays/eus-2.10/patch-channel.yaml index db6d2e2f..9bc0ec7a 100644 --- a/components/operators/openshift-ai/operator/overlays/eus-2.10/patch-channel.yaml +++ b/components/operators/openshift-ai/operator/overlays/eus-2.10/patch-channel.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/channel - value: eus-2.10 + value: stable-2.10 From de9fb0cdd22fc18fd311ab5d9b5281b548c77cdb Mon Sep 17 00:00:00 2001 From: fharo Date: Thu, 8 Aug 2024 00:44:19 -0700 Subject: [PATCH 05/10] git ignore was ignoring this component. Using -f option to add it Signed-off-by: fharo --- .../overlays/eus-2.10/kustomization.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 components/operators/openshift-ai/instance/overlays/eus-2.10/kustomization.yaml diff --git a/components/operators/openshift-ai/instance/overlays/eus-2.10/kustomization.yaml b/components/operators/openshift-ai/instance/overlays/eus-2.10/kustomization.yaml new file mode 100644 index 00000000..70561945 --- /dev/null +++ b/components/operators/openshift-ai/instance/overlays/eus-2.10/kustomization.yaml @@ -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 From ed939d4b274942a77f1daee7d2a212944f3b0a6a Mon Sep 17 00:00:00 2001 From: fharo Date: Mon, 12 Aug 2024 15:50:26 -0700 Subject: [PATCH 06/10] Mistakenly renamed things using eus instead of stable. Signed-off-by: fharo --- .../{rhoai-eus-2.10 => rhoai-stable-2.10}/kustomization.yaml | 0 .../{rhoai-eus-2.10 => rhoai-stable-2.10}/kustomization.yaml | 0 .../patch-application-manual-sync.yaml | 0 .../patch-application-repo-revision.yaml | 0 .../patch-applicationset-manual-sync.yaml | 0 .../{rhoai-eus-2.10 => rhoai-stable-2.10}/kustomization.yaml | 0 .../patch-cluster-config-app-of-apps.yaml | 0 .../{rhoai-eus-2.10 => rhoai-stable-2.10}/patch-configs-list.yaml | 0 .../patch-operators-list.yaml | 0 .../patch-tenants-applicationset.yaml | 0 .../overlays/{eus-2.10 => stable-2.10}/kustomization.yaml | 0 .../overlays/{eus-2.10 => stable-2.10}/kustomization.yaml | 0 .../overlays/{eus-2.10 => stable-2.10}/kustomization.yaml | 0 .../overlays/{eus-2.10 => stable-2.10}/patch-channel.yaml | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename bootstrap/overlays/{rhoai-eus-2.10 => rhoai-stable-2.10}/kustomization.yaml (100%) rename clusters/overlays/{rhoai-eus-2.10 => rhoai-stable-2.10}/kustomization.yaml (100%) rename clusters/overlays/{rhoai-eus-2.10 => rhoai-stable-2.10}/patch-application-manual-sync.yaml (100%) rename clusters/overlays/{rhoai-eus-2.10 => rhoai-stable-2.10}/patch-application-repo-revision.yaml (100%) rename clusters/overlays/{rhoai-eus-2.10 => rhoai-stable-2.10}/patch-applicationset-manual-sync.yaml (100%) rename components/argocd/apps/overlays/{rhoai-eus-2.10 => rhoai-stable-2.10}/kustomization.yaml (100%) rename components/argocd/apps/overlays/{rhoai-eus-2.10 => rhoai-stable-2.10}/patch-cluster-config-app-of-apps.yaml (100%) rename components/argocd/apps/overlays/{rhoai-eus-2.10 => rhoai-stable-2.10}/patch-configs-list.yaml (100%) rename components/argocd/apps/overlays/{rhoai-eus-2.10 => rhoai-stable-2.10}/patch-operators-list.yaml (100%) rename components/argocd/apps/overlays/{rhoai-eus-2.10 => rhoai-stable-2.10}/patch-tenants-applicationset.yaml (100%) rename components/operators/openshift-ai/aggregate/overlays/{eus-2.10 => stable-2.10}/kustomization.yaml (100%) rename components/operators/openshift-ai/instance/overlays/{eus-2.10 => stable-2.10}/kustomization.yaml (100%) rename components/operators/openshift-ai/operator/overlays/{eus-2.10 => stable-2.10}/kustomization.yaml (100%) rename components/operators/openshift-ai/operator/overlays/{eus-2.10 => stable-2.10}/patch-channel.yaml (100%) diff --git a/bootstrap/overlays/rhoai-eus-2.10/kustomization.yaml b/bootstrap/overlays/rhoai-stable-2.10/kustomization.yaml similarity index 100% rename from bootstrap/overlays/rhoai-eus-2.10/kustomization.yaml rename to bootstrap/overlays/rhoai-stable-2.10/kustomization.yaml diff --git a/clusters/overlays/rhoai-eus-2.10/kustomization.yaml b/clusters/overlays/rhoai-stable-2.10/kustomization.yaml similarity index 100% rename from clusters/overlays/rhoai-eus-2.10/kustomization.yaml rename to clusters/overlays/rhoai-stable-2.10/kustomization.yaml diff --git a/clusters/overlays/rhoai-eus-2.10/patch-application-manual-sync.yaml b/clusters/overlays/rhoai-stable-2.10/patch-application-manual-sync.yaml similarity index 100% rename from clusters/overlays/rhoai-eus-2.10/patch-application-manual-sync.yaml rename to clusters/overlays/rhoai-stable-2.10/patch-application-manual-sync.yaml diff --git a/clusters/overlays/rhoai-eus-2.10/patch-application-repo-revision.yaml b/clusters/overlays/rhoai-stable-2.10/patch-application-repo-revision.yaml similarity index 100% rename from clusters/overlays/rhoai-eus-2.10/patch-application-repo-revision.yaml rename to clusters/overlays/rhoai-stable-2.10/patch-application-repo-revision.yaml diff --git a/clusters/overlays/rhoai-eus-2.10/patch-applicationset-manual-sync.yaml b/clusters/overlays/rhoai-stable-2.10/patch-applicationset-manual-sync.yaml similarity index 100% rename from clusters/overlays/rhoai-eus-2.10/patch-applicationset-manual-sync.yaml rename to clusters/overlays/rhoai-stable-2.10/patch-applicationset-manual-sync.yaml diff --git a/components/argocd/apps/overlays/rhoai-eus-2.10/kustomization.yaml b/components/argocd/apps/overlays/rhoai-stable-2.10/kustomization.yaml similarity index 100% rename from components/argocd/apps/overlays/rhoai-eus-2.10/kustomization.yaml rename to components/argocd/apps/overlays/rhoai-stable-2.10/kustomization.yaml diff --git a/components/argocd/apps/overlays/rhoai-eus-2.10/patch-cluster-config-app-of-apps.yaml b/components/argocd/apps/overlays/rhoai-stable-2.10/patch-cluster-config-app-of-apps.yaml similarity index 100% rename from components/argocd/apps/overlays/rhoai-eus-2.10/patch-cluster-config-app-of-apps.yaml rename to components/argocd/apps/overlays/rhoai-stable-2.10/patch-cluster-config-app-of-apps.yaml diff --git a/components/argocd/apps/overlays/rhoai-eus-2.10/patch-configs-list.yaml b/components/argocd/apps/overlays/rhoai-stable-2.10/patch-configs-list.yaml similarity index 100% rename from components/argocd/apps/overlays/rhoai-eus-2.10/patch-configs-list.yaml rename to components/argocd/apps/overlays/rhoai-stable-2.10/patch-configs-list.yaml diff --git a/components/argocd/apps/overlays/rhoai-eus-2.10/patch-operators-list.yaml b/components/argocd/apps/overlays/rhoai-stable-2.10/patch-operators-list.yaml similarity index 100% rename from components/argocd/apps/overlays/rhoai-eus-2.10/patch-operators-list.yaml rename to components/argocd/apps/overlays/rhoai-stable-2.10/patch-operators-list.yaml diff --git a/components/argocd/apps/overlays/rhoai-eus-2.10/patch-tenants-applicationset.yaml b/components/argocd/apps/overlays/rhoai-stable-2.10/patch-tenants-applicationset.yaml similarity index 100% rename from components/argocd/apps/overlays/rhoai-eus-2.10/patch-tenants-applicationset.yaml rename to components/argocd/apps/overlays/rhoai-stable-2.10/patch-tenants-applicationset.yaml diff --git a/components/operators/openshift-ai/aggregate/overlays/eus-2.10/kustomization.yaml b/components/operators/openshift-ai/aggregate/overlays/stable-2.10/kustomization.yaml similarity index 100% rename from components/operators/openshift-ai/aggregate/overlays/eus-2.10/kustomization.yaml rename to components/operators/openshift-ai/aggregate/overlays/stable-2.10/kustomization.yaml diff --git a/components/operators/openshift-ai/instance/overlays/eus-2.10/kustomization.yaml b/components/operators/openshift-ai/instance/overlays/stable-2.10/kustomization.yaml similarity index 100% rename from components/operators/openshift-ai/instance/overlays/eus-2.10/kustomization.yaml rename to components/operators/openshift-ai/instance/overlays/stable-2.10/kustomization.yaml diff --git a/components/operators/openshift-ai/operator/overlays/eus-2.10/kustomization.yaml b/components/operators/openshift-ai/operator/overlays/stable-2.10/kustomization.yaml similarity index 100% rename from components/operators/openshift-ai/operator/overlays/eus-2.10/kustomization.yaml rename to components/operators/openshift-ai/operator/overlays/stable-2.10/kustomization.yaml diff --git a/components/operators/openshift-ai/operator/overlays/eus-2.10/patch-channel.yaml b/components/operators/openshift-ai/operator/overlays/stable-2.10/patch-channel.yaml similarity index 100% rename from components/operators/openshift-ai/operator/overlays/eus-2.10/patch-channel.yaml rename to components/operators/openshift-ai/operator/overlays/stable-2.10/patch-channel.yaml From aa9a3a4b92282bb4f98fe8e0b55bca51ab31c30e Mon Sep 17 00:00:00 2001 From: fharo Date: Mon, 12 Aug 2024 15:51:50 -0700 Subject: [PATCH 07/10] Mistakenly renamed things using eus instead of stable. Signed-off-by: fharo --- bootstrap/overlays/rhoai-stable-2.10/kustomization.yaml | 2 +- clusters/overlays/rhoai-stable-2.10/kustomization.yaml | 2 +- .../rhoai-stable-2.10/patch-cluster-config-app-of-apps.yaml | 2 +- .../apps/overlays/rhoai-stable-2.10/patch-operators-list.yaml | 2 +- .../rhoai-stable-2.10/patch-tenants-applicationset.yaml | 2 +- .../aggregate/overlays/stable-2.10/kustomization.yaml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bootstrap/overlays/rhoai-stable-2.10/kustomization.yaml b/bootstrap/overlays/rhoai-stable-2.10/kustomization.yaml index 48c04ab2..38cfb8a0 100644 --- a/bootstrap/overlays/rhoai-stable-2.10/kustomization.yaml +++ b/bootstrap/overlays/rhoai-stable-2.10/kustomization.yaml @@ -3,4 +3,4 @@ kind: Kustomization resources: - ../../base -- ../../../clusters/overlays/rhoai-eus-2.10 +- ../../../clusters/overlays/rhoai-stable-2.10 diff --git a/clusters/overlays/rhoai-stable-2.10/kustomization.yaml b/clusters/overlays/rhoai-stable-2.10/kustomization.yaml index d17c5512..fae66bbe 100644 --- a/clusters/overlays/rhoai-stable-2.10/kustomization.yaml +++ b/clusters/overlays/rhoai-stable-2.10/kustomization.yaml @@ -5,7 +5,7 @@ namespace: openshift-gitops resources: - ../../base -- ../../../components/argocd/apps/overlays/rhoai-eus-2.10 +- ../../../components/argocd/apps/overlays/rhoai-stable-2.10 patches: # set the repo and branch for applications diff --git a/components/argocd/apps/overlays/rhoai-stable-2.10/patch-cluster-config-app-of-apps.yaml b/components/argocd/apps/overlays/rhoai-stable-2.10/patch-cluster-config-app-of-apps.yaml index b3095439..4901a977 100644 --- a/components/argocd/apps/overlays/rhoai-stable-2.10/patch-cluster-config-app-of-apps.yaml +++ b/components/argocd/apps/overlays/rhoai-stable-2.10/patch-cluster-config-app-of-apps.yaml @@ -4,4 +4,4 @@ metadata: name: cluster-config-app-of-apps spec: source: - path: clusters/overlays/rhoai-eus-2.10 + path: clusters/overlays/rhoai-stable-2.10 diff --git a/components/argocd/apps/overlays/rhoai-stable-2.10/patch-operators-list.yaml b/components/argocd/apps/overlays/rhoai-stable-2.10/patch-operators-list.yaml index cfab75d7..6352ec23 100644 --- a/components/argocd/apps/overlays/rhoai-stable-2.10/patch-operators-list.yaml +++ b/components/argocd/apps/overlays/rhoai-stable-2.10/patch-operators-list.yaml @@ -10,7 +10,7 @@ spec: url: https://kubernetes.default.svc values: name: openshift-ai-operator - path: components/operators/openshift-ai/aggregate/overlays/eus-2.10 + path: components/operators/openshift-ai/aggregate/overlays/stable-2.10 - cluster: local url: https://kubernetes.default.svc values: diff --git a/components/argocd/apps/overlays/rhoai-stable-2.10/patch-tenants-applicationset.yaml b/components/argocd/apps/overlays/rhoai-stable-2.10/patch-tenants-applicationset.yaml index f4cd8eb9..02d61025 100644 --- a/components/argocd/apps/overlays/rhoai-stable-2.10/patch-tenants-applicationset.yaml +++ b/components/argocd/apps/overlays/rhoai-stable-2.10/patch-tenants-applicationset.yaml @@ -1,3 +1,3 @@ - op: replace path: /spec/generators/0/git/directories/0/path - value: tenants/*/*/overlays/rhoai-eus-2.10 + value: tenants/*/*/overlays/rhoai-stable-2.10 diff --git a/components/operators/openshift-ai/aggregate/overlays/stable-2.10/kustomization.yaml b/components/operators/openshift-ai/aggregate/overlays/stable-2.10/kustomization.yaml index ed9f58e2..db45b0e3 100644 --- a/components/operators/openshift-ai/aggregate/overlays/stable-2.10/kustomization.yaml +++ b/components/operators/openshift-ai/aggregate/overlays/stable-2.10/kustomization.yaml @@ -5,5 +5,5 @@ commonAnnotations: argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true resources: -- ../../../operator/overlays/eus-2.10 -- ../../../instance/overlays/eus-2.10 +- ../../../operator/overlays/stable-2.10 +- ../../../instance/overlays/stable-2.10 From 1a2c4cc74752bf873d84bfc6500a630e46835ce3 Mon Sep 17 00:00:00 2001 From: fharo Date: Mon, 12 Aug 2024 18:30:31 -0700 Subject: [PATCH 08/10] Adding tenant kustomization files for rhoai-stable-2.10 mirroring rhoai-eus-2.8. --- .../rhoai-stable-2.10/kustomization.yaml | 5 ++++ .../rhoai-stable-2.10/kustomization.yaml | 10 ++++++++ .../patch-dspa-for-2.10.yaml | 8 +++++++ .../rhoai-stable-2.10/kustomization.yaml | 5 ++++ .../rhoai-stable-2.10/kustomization.yaml | 5 ++++ .../rhoai-stable-2.10/kustomization.yaml | 5 ++++ .../rhoai-stable-2.10/kustomization.yaml | 5 ++++ .../rhoai-stable-2.10/kustomization.yaml | 5 ++++ .../rhoai-stable-2.10/kustomization.yaml | 23 +++++++++++++++++++ 9 files changed, 71 insertions(+) create mode 100644 tenants/ai-custom-workbenches/namespaces/overlays/rhoai-stable-2.10/kustomization.yaml create mode 100644 tenants/ai-example/datascience-pipelines/overlays/rhoai-stable-2.10/kustomization.yaml create mode 100644 tenants/ai-example/datascience-pipelines/overlays/rhoai-stable-2.10/patch-dspa-for-2.10.yaml create mode 100644 tenants/ai-example/multi-model-serving-minio/overlays/rhoai-stable-2.10/kustomization.yaml create mode 100644 tenants/ai-example/multi-model-serving/overlays/rhoai-stable-2.10/kustomization.yaml create mode 100644 tenants/ai-example/namespaces/overlays/rhoai-stable-2.10/kustomization.yaml create mode 100644 tenants/ai-example/single-model-serving-minio/overlays/rhoai-stable-2.10/kustomization.yaml create mode 100644 tenants/ai-example/single-model-serving-tgis/overlays/rhoai-stable-2.10/kustomization.yaml create mode 100644 tenants/ai-example/workbenches/overlays/rhoai-stable-2.10/kustomization.yaml diff --git a/tenants/ai-custom-workbenches/namespaces/overlays/rhoai-stable-2.10/kustomization.yaml b/tenants/ai-custom-workbenches/namespaces/overlays/rhoai-stable-2.10/kustomization.yaml new file mode 100644 index 00000000..774a422d --- /dev/null +++ b/tenants/ai-custom-workbenches/namespaces/overlays/rhoai-stable-2.10/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base diff --git a/tenants/ai-example/datascience-pipelines/overlays/rhoai-stable-2.10/kustomization.yaml b/tenants/ai-example/datascience-pipelines/overlays/rhoai-stable-2.10/kustomization.yaml new file mode 100644 index 00000000..a847a6e5 --- /dev/null +++ b/tenants/ai-example/datascience-pipelines/overlays/rhoai-stable-2.10/kustomization.yaml @@ -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 diff --git a/tenants/ai-example/datascience-pipelines/overlays/rhoai-stable-2.10/patch-dspa-for-2.10.yaml b/tenants/ai-example/datascience-pipelines/overlays/rhoai-stable-2.10/patch-dspa-for-2.10.yaml new file mode 100644 index 00000000..a13e1ef7 --- /dev/null +++ b/tenants/ai-example/datascience-pipelines/overlays/rhoai-stable-2.10/patch-dspa-for-2.10.yaml @@ -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 diff --git a/tenants/ai-example/multi-model-serving-minio/overlays/rhoai-stable-2.10/kustomization.yaml b/tenants/ai-example/multi-model-serving-minio/overlays/rhoai-stable-2.10/kustomization.yaml new file mode 100644 index 00000000..774a422d --- /dev/null +++ b/tenants/ai-example/multi-model-serving-minio/overlays/rhoai-stable-2.10/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base diff --git a/tenants/ai-example/multi-model-serving/overlays/rhoai-stable-2.10/kustomization.yaml b/tenants/ai-example/multi-model-serving/overlays/rhoai-stable-2.10/kustomization.yaml new file mode 100644 index 00000000..a47b2ec2 --- /dev/null +++ b/tenants/ai-example/multi-model-serving/overlays/rhoai-stable-2.10/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base/ diff --git a/tenants/ai-example/namespaces/overlays/rhoai-stable-2.10/kustomization.yaml b/tenants/ai-example/namespaces/overlays/rhoai-stable-2.10/kustomization.yaml new file mode 100644 index 00000000..774a422d --- /dev/null +++ b/tenants/ai-example/namespaces/overlays/rhoai-stable-2.10/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base diff --git a/tenants/ai-example/single-model-serving-minio/overlays/rhoai-stable-2.10/kustomization.yaml b/tenants/ai-example/single-model-serving-minio/overlays/rhoai-stable-2.10/kustomization.yaml new file mode 100644 index 00000000..774a422d --- /dev/null +++ b/tenants/ai-example/single-model-serving-minio/overlays/rhoai-stable-2.10/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base diff --git a/tenants/ai-example/single-model-serving-tgis/overlays/rhoai-stable-2.10/kustomization.yaml b/tenants/ai-example/single-model-serving-tgis/overlays/rhoai-stable-2.10/kustomization.yaml new file mode 100644 index 00000000..774a422d --- /dev/null +++ b/tenants/ai-example/single-model-serving-tgis/overlays/rhoai-stable-2.10/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base diff --git a/tenants/ai-example/workbenches/overlays/rhoai-stable-2.10/kustomization.yaml b/tenants/ai-example/workbenches/overlays/rhoai-stable-2.10/kustomization.yaml new file mode 100644 index 00000000..81e300d1 --- /dev/null +++ b/tenants/ai-example/workbenches/overlays/rhoai-stable-2.10/kustomization.yaml @@ -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 From 9bfe0cf9e76342ede3f3f51f9e14d097adfc47a0 Mon Sep 17 00:00:00 2001 From: fharo Date: Wed, 25 Sep 2024 00:17:59 -0700 Subject: [PATCH 09/10] Changing repo revision patch back to ai-accelerator main branch as per code review. Signed-off-by: fharo --- .../rhoai-stable-2.10/kustomization.yaml | 22 +++++++++---------- .../patch-application-repo-revision.yaml | 8 ++----- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/clusters/overlays/rhoai-stable-2.10/kustomization.yaml b/clusters/overlays/rhoai-stable-2.10/kustomization.yaml index fae66bbe..1fec5ba3 100644 --- a/clusters/overlays/rhoai-stable-2.10/kustomization.yaml +++ b/clusters/overlays/rhoai-stable-2.10/kustomization.yaml @@ -14,18 +14,16 @@ patches: group: argoproj.io kind: Application # Uncomment patches to disable automatic sync -# TODO Comment back when merging back to upstream. -# TODO Also test with 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 +# - 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 diff --git a/clusters/overlays/rhoai-stable-2.10/patch-application-repo-revision.yaml b/clusters/overlays/rhoai-stable-2.10/patch-application-repo-revision.yaml index 267e80b2..f9fde11d 100644 --- a/clusters/overlays/rhoai-stable-2.10/patch-application-repo-revision.yaml +++ b/clusters/overlays/rhoai-stable-2.10/patch-application-repo-revision.yaml @@ -1,10 +1,6 @@ - op: replace path: /spec/source/repoURL - # TODO Change back when ready to merge back to upstream. - # value: 'https://github.com/redhat-ai-services/ai-accelerator.git' - value: 'https://github.com/fgharo/ai-accelerator.git' + value: 'https://github.com/redhat-ai-services/ai-accelerator.git' - op: replace path: /spec/source/targetRevision - # TODO Change back when ready to merge back to upstream. - # value: main - value: rhoai-2.10-gitops-acceleration + value: main \ No newline at end of file From a942e9c97714bc4d53179ad39fc2f81d4467717c Mon Sep 17 00:00:00 2001 From: Trevor Royer Date: Wed, 25 Sep 2024 10:59:09 -0600 Subject: [PATCH 10/10] Add new line eof --- .../rhoai-stable-2.10/patch-application-repo-revision.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clusters/overlays/rhoai-stable-2.10/patch-application-repo-revision.yaml b/clusters/overlays/rhoai-stable-2.10/patch-application-repo-revision.yaml index f9fde11d..1abff624 100644 --- a/clusters/overlays/rhoai-stable-2.10/patch-application-repo-revision.yaml +++ b/clusters/overlays/rhoai-stable-2.10/patch-application-repo-revision.yaml @@ -3,4 +3,4 @@ value: 'https://github.com/redhat-ai-services/ai-accelerator.git' - op: replace path: /spec/source/targetRevision - value: main \ No newline at end of file + value: main