refactor: ocp functions + aro gpus

Author: codekow

.wordlist-md

@@ -30,6 +30,8 @@ ArgoCD's
 argoproj
 arn
 ARN
+aro
+ARO
 auth
 authfile
 authorino
@@ -219,6 +221,7 @@ managementState
 mariadb
 mastersSchedulable
 memberof
+microsoft
 mig
 minio
 mkdir
@@ -246,6 +249,7 @@ nodeFeatureDiscovery
 noobaa
 Noobaa
 NuGet
+nv
 nvidia
 Nvidia's
 nw

.wordlist-sh

@@ -195,6 +195,7 @@ mutatingwebhookconfiguration
 namedCertificates
 nat
 nbB
+ncast
 ne
 newkey
 NGC
@@ -206,6 +207,7 @@ NoScoring
 ns
 NUM
 nvme
+nvv
 oadp
 observability
 observabilityaddons
@@ -270,6 +272,7 @@ servingCerts
 sha
 shellcheck
 SingleNamespace
+sizebasic
 skel
 sl
 sL

components/cluster-configs/autoscale/base/job.yaml

@@ -2,7 +2,7 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: job-setup-machineset
+  name: job-setup-autoscale
 rules:
 - apiGroups:
   - machine.openshift.io
@@ -22,6 +22,7 @@ rules:
   - secrets
   resourceNames:
   - aws-creds
+  - azure-credentials
   verbs:
   - get
   - list
@@ -33,24 +34,24 @@ rules:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: job-setup-machineset
+  name: job-setup-autoscale
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: job-setup-machineset
+  name: job-setup-autoscale
 subjects:
   - kind: ServiceAccount
-    name: job-setup-machineset
+    name: job-setup-autoscale
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: job-setup-machineset
+  name: job-setup-autoscale
 ---
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: job-setup-machineset
+  name: job-setup-autoscale
   annotations:
     argocd.argoproj.io/hook: Sync
     # argocd.argoproj.io/hook-delete-policy: HookSucceeded
@@ -80,9 +81,9 @@ spec:
       volumes:
         - name: scripts
           configMap:
-            name: job-setup-machineset
+            name: job-setup-autoscale
             defaultMode: 0755
       restartPolicy: Never
       terminationGracePeriodSeconds: 30
-      serviceAccount: job-setup-machineset
-      serviceAccountName: job-setup-machineset
+      serviceAccount: job-setup-autoscale
+      serviceAccountName: job-setup-autoscale

components/cluster-configs/autoscale/base/kustomization.yaml

@@ -16,9 +16,9 @@ generatorOptions:
   disableNameSuffixHash: true
 
 configMapGenerator:
-  - name: job-setup-machineset
+  - name: job-setup-autoscale
     files:
       - job.sh
       # - ../../../../../../scripts/library/ocp.sh
       # kludge: refer to source
-      - https://raw.githubusercontent.com/redhat-na-ssa/demo-ai-gitops-catalog/v0.09/scripts/library/ocp.sh
+      - https://raw.githubusercontent.com/redhat-na-ssa/demo-ai-gitops-catalog/v0.12/scripts/library/ocp.sh

components/operators/aikit-operator/instance/overlays/default/kustomization.yaml

@@ -2,7 +2,7 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-namespace: stackrox
+namespace: redhat-ods-applications
 
 resources:
   - ../../base

components/operators/gpu-operator-certified/aggregate/overlays/aws/kustomization.yaml

@@ -7,3 +7,5 @@ resources:
 
 components:
   - ../components/monitoring-dashboard
+  - ../components/aro-gpu-machineset
+  - ../components/aws-gpu-machineset

components/operators/gpu-operator-certified/instance/base/kustomization.yaml

@@ -0,0 +1,24 @@
+# aws-gpu-machineset
+
+## Purpose
+
+This component is designed to setup a MachineSet with GPUs on an ARO based OpenShift cluster.
+
+This component triggers a job that creates a MachineSet based on your current MachineSet.
+
+This component has been tested using ARO based OpenShift instances provisioned by demo.redhat.com.
+
+## 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/aro-gpu-machineset
+```

components/operators/gpu-operator-certified/instance/components/aro-gpu-machineset/README.md

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# shellcheck disable=SC1091
+. /scripts/ocp.sh
+
+INSTANCE_TYPE=${INSTANCE_TYPE:-Standard_NC4as_T4_v3}
+
+ocp_aro_cluster || exit 0
+ocp_aro_machineset_create_gpu "${INSTANCE_TYPE}"
+ocp_machineset_create_autoscale
+# ocp_machineset_taint_gpu

components/operators/gpu-operator-certified/instance/components/aro-gpu-machineset/job.sh

@@ -0,0 +1,90 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: job-aro-gpu-machineset
+  namespace: nvidia-gpu-operator
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
+metadata:
+  name: job-aro-gpu-machineset
+rules:
+- apiGroups:
+  - machine.openshift.io
+  resources:
+  - machinesets
+  verbs:
+  - '*'
+- apiGroups:
+  - autoscaling.openshift.io
+  resources:
+  - machineautoscalers
+  verbs:
+  - '*'
+- apiGroups:
+  - ''
+  resources:
+  - secrets
+  resourceNames:
+  - azure-credentials
+  verbs:
+  - get
+  - list
+# - nonResourceURLs:
+#   - '*'
+#   verbs:
+#   - '*'
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRoleBinding
+metadata:
+  name: job-aro-gpu-machineset
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: job-aro-gpu-machineset
+subjects:
+  - kind: ServiceAccount
+    name: job-aro-gpu-machineset
+    namespace: nvidia-gpu-operator
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  generateName: job-aro-gpu-machineset-
+  name: job-aro-gpu-machineset
+  namespace: nvidia-gpu-operator
+  # annotations:
+  #   argocd.argoproj.io/hook: Sync
+    # argocd.argoproj.io/hook-delete-policy: HookSucceeded
+spec:
+  template:
+    spec:
+      containers:
+        - name: job-aro-gpu-machineset
+          # image: image-registry.openshift-image-registry.svc:5000/openshift/tools:latest
+          image: registry.redhat.io/openshift4/ose-cli
+          env:
+            - name: INSTANCE_TYPE
+              value: "Standard_NC4as_T4_v3"
+            - name: NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace
+          command:
+            - /bin/bash
+            - -c
+            - /scripts/job.sh
+          volumeMounts:
+            - name: scripts
+              mountPath: /scripts
+      volumes:
+        - name: scripts
+          configMap:
+            name: job-aro-gpu-machineset
+            defaultMode: 0755
+      restartPolicy: Never
+      terminationGracePeriodSeconds: 30
+      serviceAccount: job-aro-gpu-machineset
+      serviceAccountName: job-aro-gpu-machineset