Merge branch 'main' into acm-update

.github/workflows/spellcheck.yaml

@@ -12,6 +12,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Code Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
       - name: Spellcheck
-        uses: rojopolis/spellcheck-github-actions@e36f662b21ead3f6f29794ac5c35069bf236463c # 0.37.0
+        uses: rojopolis/spellcheck-github-actions@cd079c0f6a24c326cb8a4fa5dc8bbf16227990bd # 0.40.0

.github/workflows/validate-manifests.yaml

@@ -23,7 +23,7 @@ jobs:
       #     sudo chmod +x ${BIN_PATH}/kustomize
       #
       - name: Code Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
       - name: Verify Kustomize CLI Installation
         run: |
@@ -39,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Code Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
       - name: Validate YAML
         uses: ibiqlik/action-yamllint@2576378a8e339169678f9939646ee3ee325e845c  # v3
         with:
@@ -49,7 +49,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Code Checkout
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4
+        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
       - name: Run ShellCheck
         uses: ludeeus/action-shellcheck@master
         with:

.wordlist-md

@@ -17,12 +17,17 @@ CICD
 CRD
 CRDs
 CheCluster
+ClusterPolicy
 ClusterRoleBindings
 ClusterTask
+CodeFlare
 CodeReady
 Codeflare
+ConfigMap
+DCGM
 DNS
 DataScienceCluster
+DataSciencePipelines
 Dev
 DevSpaces
 DevWorkspace
@@ -43,6 +48,7 @@ IgnoreExtraneous
 JSON
 Jaeger
 Jenkins
+KServe
 Kafka
 Keycloak
 Kibana
@@ -59,6 +65,7 @@ MTA
 MachineConfig
 MachineSet
 Minio
+ModelMesh
 MultiClusterHub
 NFD
 NMState
@@ -80,6 +87,7 @@ Querier
 RBAC
 README
 RHACM
+RHOAI
 Rollout
 SAR
 SDKs
@@ -118,6 +126,7 @@ approver
 argocd
 argoproj
 arn
+auth
 authorino
 autoscaling
 aws
@@ -129,11 +138,14 @@ checluster
 cicd
 cli
 clusterissuer
+clusterpolicies
 clusterrolebinding
 composable
 config
 configmap
+culler
 datasource
+dcgmExporter
 deployable
 dev
 devfile
@@ -171,10 +183,14 @@ io
 jaeger
 jenkins
 json
+jsonpath
 kafka
 kataconfig
 kiali
 knative
+kubeadmin
+kubectl
+kubernetes
 kustomization
 kustomize
 labeler
@@ -211,10 +227,13 @@ postgres
 pre
 prem
 prometheus
+pvc
 redhat
 redistributions
 repo
+rh
 rhel
+rhoai
 rhpds
 runtime
 sagemaker
@@ -233,6 +252,7 @@ tekton
 templating
 thanos
 traefik
+triton
 truly
 vSphere
 vscode

.yamllint

@@ -1,5 +1,8 @@
 extends: default
 
+ignore:
+  - "**/charts/*" # ignore locally rendered helm charts
+
 rules:
   braces:
     ignore: /grafana-operator/base/instance/grafana.yaml
@@ -10,3 +13,5 @@ rules:
   truthy:
     ignore: .github/workflows/
   comments-indentation: disable
+  comments:
+    min-spaces-from-content: 1

ack-system/base/user-config-cm.yaml

@@ -11,3 +11,4 @@ data:
   AWS_ENDPOINT_URL: ""
   ENABLE_LEADER_ELECTION: "true"
   LEADER_ELECTION_NAMESPACE: ""
+  RECONCILE_DEFAULT_MAX_CONCURRENT_SYNCS: "1"

ack-system/scripts/setup.sh

@@ -31,9 +31,11 @@ ocp_aws_get_key(){
 }
 
 # create secrets for ack controllers
-aws_setup_ack_system(){
+ocp_aws_setup_ack_system(){
   NAMESPACE=ack-system
 
+  ocp_aws_get_key
+
   setup_namespace "${NAMESPACE}"
 
   oc apply -k ../"${NAMESPACE}"/aggregate/popular
@@ -50,9 +52,8 @@ aws_setup_ack_system(){
 
     < ../ack-${type}-controller/operator/overlays/alpha/user-secrets-secret.yaml \
       sed "s@UPDATE_AWS_ACCESS_KEY_ID@${AWS_ACCESS_KEY_ID}@; s@UPDATE_AWS_SECRET_ACCESS_KEY@${AWS_SECRET_ACCESS_KEY}@" | \
-      oc -n ${NAMESPACE} apply -f -
+      oc -n "${NAMESPACE}" apply -f -
   done
 }
 
-ocp_aws_get_key
-aws_setup_ack_system
+ocp_aws_setup_ack_system

advanced-cluster-management/README.md

@@ -11,6 +11,9 @@ The current *overlays* available are for the following channels:
 * [release-2.6](operator/overlays/release-2.6)
 * [release-2.7](operator/overlays/release-2.7)
 * [release-2.8](operator/overlays/release-2.8)
+* [release-2.9](operator/overlays/release-2.9)
+* [release-2.10](operator/overlays/release-2.10)
+* [release-2.11](operator/overlays/release-2.11)
 
 ## Usage
 

advanced-cluster-management/operator/overlays/release-2.11/kustomization.yaml

@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+patches:
+  - target:
+      kind: Subscription
+      name: advanced-cluster-management
+    path: patch-channel.yaml

advanced-cluster-management/operator/overlays/release-2.11/patch-channel.yaml

@@ -0,0 +1,3 @@
+- op: replace
+  path: /spec/channel
+  value: release-2.11

openshift-ai

@@ -0,0 +1 @@
+rhods-operator

openshift-data-foundation-operator/README.md

@@ -5,6 +5,7 @@ Installs the OpenShift Data Foundation operator.
 Do not use the `base` directory directly, as you will need to patch the `channel` based on the version of OpenShift you are using, or the version of the operator you want to use.
 
 The current *overlays* available are for the following channels:
+* [stable-4.16](operator/overlays/stable-4.16)
 * [stable-4.15](operator/overlays/stable-4.15)
 * [stable-4.14](operator/overlays/stable-4.14)
 * [stable-4.13](operator/overlays/stable-4.13)

openshift-data-foundation-operator/operator/overlays/stable-4.16/README.md

@@ -0,0 +1 @@
+Installs the *stable-4.16* channel version of the OpenShift Data Foundation Operator

openshift-data-foundation-operator/operator/overlays/stable-4.16/kustomization.yaml

@@ -0,0 +1,17 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: openshift-storage
+
+
+resources:
+  - ../../base
+patches:
+  - path: patch-channel.yaml
+    target:
+      group: operators.coreos.com
+      kind: Subscription
+      name: odf-operator
+      namespace: openshift-storage
+      version: v1alpha1

openshift-data-foundation-operator/operator/overlays/stable-4.16/patch-channel.yaml

@@ -0,0 +1,3 @@
+- op: replace
+  path: /spec/channel
+  value: stable-4.16

openshift-gitops-operator/operator/components/disable-default-instance/README.md

@@ -0,0 +1,23 @@
+# disable-default-instance
+
+## Purpose
+This component disables the creation of a default ArgoCD instance in the `openshift-gitops` namespace.
+
+For more information on this option please refer to the following:
+
+[5 global environment variables provided by OpenShift GitOps](https://developers.redhat.com/articles/2023/03/06/5-global-environment-variables-provided-openshift-gitops)
+
+## Usage
+
+This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file:
+
+```
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+components:
+  - ../../components/disable-default-instance
+```

openshift-gitops-operator/operator/components/disable-default-instance/kustomization.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: patch-subscription.yaml
+    target:
+      kind: Subscription

openshift-gitops-operator/operator/components/disable-default-instance/patch-subscription.yaml

@@ -0,0 +1,9 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: openshift-gitops-operator
+spec:
+  config:
+    env:
+      - name: DISABLE_DEFAULT_ARGOCD_INSTANCE
+        value: true

rhods-operator/INFO.md

@@ -0,0 +1,22 @@
+# rhods-operator
+
+Red Hat OpenShift AI is a complete platform for the entire lifecycle of your AI/ML projects.
+
+When using Red Hat OpenShift AI, your users will find all the tools they would expect from a modern AI/ML platform in an interface that is intuitive, requires no local install, and is backed by the power of your OpenShift cluster.
+
+Your Data Scientists will feel right at home with quick and simple access to the Notebook interface they are used to. They can leverage the default Notebook Images (Including PyTorch, tensorflow, and CUDA), or add custom ones. Your MLOps engineers will be able to leverage Data Science Pipelines to easily parallelize and/or schedule the required workloads. They can then quickly serve, monitor, and update the created AI/ML models. They can do that by either using the provided out-of-the-box OpenVino Server Model Runtime or by adding their own custom serving runtime instead. These activities are tied together with the concept of Data Science Projects, simplifying both organization and collaboration.
+
+But beyond the individual features, one of the key aspects of this platform is its flexibility. Not only can you augment it with your own Customer Workbench Image and Custom Model Serving Runtime Images, but you will also have a consistent experience across any infrastructure footprint. Be it in the public cloud, private cloud, on-premises, and even in disconnected clusters. Red Hat OpenShift AI can be installed on any supported OpenShift. It can scale out or in depending on the size of your team and its computing requirements.
+
+Finally, thanks to the operator-driven deployment and updates, the administrative load of the platform is very light, leaving everyone more time to focus on the work that makes a difference.
+
+### Components
+* Dashboard
+* Curated Workbench Images (incl CUDA, PyTorch, Tensorflow, code-server)
+* Ability to add Custom Images
+* Ability to leverage accelerators (such as NVIDIA GPU)
+* Data Science Pipelines (including Elyra notebook interface)
+* Model Serving using ModelMesh and Kserve.
+* Ability to use other runtimes for serving
+* Model Monitoring
+* Distributed workloads (KubeRay, CodeFlare, Kueue)

openshift-ai/README.md → rhods-operator/README.md

@@ -6,23 +6,26 @@ Do not use the `base` directory directly, as you will need to patch the `channel
 
 The current *overlays* available are for the following channels:
 
+* [alpha](operator/overlays/alpha)
 * [beta](operator/overlays/beta)
-* [fast](operator/overlays/beta)
+* [embedded](operator/overlays/embedded)
+* [eus-2.8](operator/overlays/eus-2.8)
+* [fast](operator/overlays/fast)
 * [stable](operator/overlays/stable)
-
+* [stable-2.8](operator/overlays/stable-2.8)
 
 ## Usage
 
 If you have cloned the `gitops-catalog` repository, you can install Red Hat OpenShift AI based on the overlay of your choice by running from the root (`gitops-catalog`) directory.
 
 ```
-oc apply -k openshift-ai/operator/overlays/<channel>
+oc apply -k rhods-operator/operator/overlays/<channel>
 ```
 
 Or, without cloning:
 
 ```
-oc apply -k https://github.com/redhat-cop/gitops-catalog/openshift-ai/operator/overlays/<channel>
+oc apply -k https://github.com/redhat-cop/gitops-catalog/rhods-operator/operator/overlays/<channel>
 ```
 
 As part of a different overlay in your own GitOps repo:
@@ -31,5 +34,5 @@ As part of a different overlay in your own GitOps repo:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
-  - https://github.com/redhat-cop/gitops-catalog/openshift-ai/operator/overlays/<channel>?ref=main
+  - https://github.com/redhat-cop/gitops-catalog/rhods-operator/operator/overlays/<channel>?ref=main
 ```

rhods-operator/aggregate/overlays/eus-2.8-nvidia-gpu/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.8
+  - ../../../instance/overlays/eus-2.8-nvidia-gpu