[minor] Add support for standalone AIBroker deployment with dependencies (MinIO, ODH, KModel, AIBroker Tenant)

instance-applications/111-ibm-minio/Chart.yaml

@@ -0,0 +1,11 @@
+apiVersion: v2
+name: ibm-minio
+description: IBM MINIO
+type: application
+version: 1.0.0
+
+dependencies:
+- name: junitreporter
+  version: 1.0.0
+  repository: "file://../../sub-charts/junitreporter/"
+  condition: junitreporter.devops_mongo_uri != ""

instance-applications/111-ibm-minio/README.md

@@ -0,0 +1,3 @@
+IBM minio
+===============================================================================
+Deploy and configure minio storage with configurable version

instance-applications/111-ibm-minio/templates/02-minio-pvc.yaml

@@ -0,0 +1,16 @@
+---
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: minio-pvc
+  namespace: {{ .Values.minio_namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "112"
+spec:
+  accessModes:
+    - ReadWriteOnce
+  volumeMode: Filesystem
+  storageClassName: {{ .Values.minio_storage_class }}
+  resources:
+    requests:
+      storage: {{ .Values.minio_storage_size }}

instance-applications/111-ibm-minio/templates/03-minio-deployment.yaml

@@ -0,0 +1,37 @@
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: {{ .Values.minio_instance_name }}
+  namespace: {{ .Values.minio_namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "113"
+spec:
+  selector:
+    matchLabels:
+      app: {{ .Values.minio_instance_name }}
+  template:
+    metadata:
+      labels:
+        app: {{ .Values.minio_instance_name }}
+    spec:
+      volumes:
+        - name: storage
+          persistentVolumeClaim:
+            claimName: minio-pvc
+      containers:
+        - name: {{ .Values.minio_instance_name }}
+          image: {{ .Values.minio_image }}
+          command:
+            - /bin/bash
+            - -c
+          args:
+            - minio server /data --console-address :9090
+          env:
+            - name: MINIO_ROOT_USER
+              value: {{ .Values.minio_root_user }}
+            - name: MINIO_ROOT_PASSWORD
+              value: {{ .Values.minio_root_password }}
+          volumeMounts:
+            - mountPath: /data
+              name: storage

instance-applications/111-ibm-minio/templates/04-minio-service.yaml

@@ -0,0 +1,21 @@
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: minio-service
+  namespace: {{ .Values.minio_namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "114"
+spec:
+  type: ClusterIP
+  ports:
+    - name: api
+      port: 9000
+      targetPort: 9000
+      protocol: TCP
+    - name: console
+      port: 9090
+      targetPort: 9090
+      protocol: TCP
+  selector:
+    app: {{ .Values.minio_instance_name }}

instance-applications/111-ibm-minio/templates/05-minio-route.yaml

@@ -0,0 +1,18 @@
+---
+kind: Route
+apiVersion: route.openshift.io/v1
+metadata:
+  name: minio-route
+  namespace: {{ .Values.minio_namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "115"
+spec:
+  to:
+    kind: Service
+    name: minio-service
+    weight: 100
+  port:
+    targetPort: 9090
+  tls:
+    termination: edge
+    insecureEdgeTerminationPolicy: None

instance-applications/111-ibm-minio/values.yaml

@@ -0,0 +1,8 @@
+---
+minio_namespace: "minio"
+minio_instance_name: "minio"
+minio_root_user: "minio"
+minio_root_password: ""
+minio_storage_class: "default"
+minio_storage_size: "40Gi"
+minio_image: "quay.io/minio/minio:latest"

instance-applications/112-ibm-odh/Chart.yaml

@@ -0,0 +1,11 @@
+apiVersion: v2
+name: ibm-odh
+description: IBM ODH
+type: application
+version: 1.0.0
+
+dependencies:
+- name: junitreporter
+  version: 1.0.0
+  repository: "file://../../sub-charts/junitreporter/"
+  condition: junitreporter.devops_mongo_uri != ""

instance-applications/112-ibm-odh/README.md

@@ -0,0 +1,3 @@
+IBM ODH
+===============================================================================
+Deploy and configure ODH with configurable version

instance-applications/112-ibm-odh/templates/01-odh-pipeline-operator-subcription.yaml

@@ -0,0 +1,16 @@
+---
+
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: {{ .Values.odh_pipeline_name }}
+  namespace: {{ .Values.odh_pipeline_namespace}}
+  annotations:
+    argocd.argoproj.io/sync-wave: "116"
+spec:
+  channel: {{ .Values.odh_pipeline_channel }}
+  installPlanApproval: {{ .Values.odh_pipeline_installplan }}
+  name: {{ .Values.odh_pipeline_operatorName }}
+  source: {{ .Values.odh_pipeline_source }}
+  sourceNamespace: {{ .Values.odh_pipeline_sourceNamespace }}
+

instance-applications/112-ibm-odh/templates/02-odh-serverless-subscription.yaml

@@ -0,0 +1,37 @@
+---
+
+apiVersion: v1
+kind: Namespace
+metadata:
+    name:  {{ .Values.serverless_namespace}}
+    annotations:
+      argocd.argoproj.io/sync-wave: "117"
+
+---
+
+apiVersion: operators.coreos.com/v1
+kind: OperatorGroup
+metadata:
+    name: operatorgroup
+    namespace: {{ .Values.serverless_namespace}}
+    annotations:
+      argocd.argoproj.io/sync-wave: "117"
+---
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+    name: {{ .Values.serverless_operator_name}}
+    namespace: {{ .Values.serverless_namespace}}
+    annotations:
+      argocd.argoproj.io/sync-wave: "118"
+spec:
+    channel: stable
+    installPlanApproval: Automatic
+    name: {{ .Values.serverless_operator_name}}
+    source: {{ .Values.serverless_operator_source}}
+    sourceNamespace: {{ .Values.serverless_operator_sourceNamespace}}
+
+
+
+
+

instance-applications/112-ibm-odh/templates/03-odh-servicemesh-operator-sa.yaml

@@ -0,0 +1,24 @@
+---
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: servicemeshoperator
+  namespace: openshift-operators
+  annotations:
+    argocd.argoproj.io/sync-wave: "118"
+spec:
+  channel: stable
+  installPlanApproval: Automatic
+  name: servicemeshoperator
+  source: redhat-operators
+  sourceNamespace: openshift-marketplace
+
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: istio-operator
+  namespace: openshift-operators
+  annotations:
+      argocd.argoproj.io/sync-wave: "119"
+

instance-applications/112-ibm-odh/templates/04-odh-authorino-operator.yaml

@@ -0,0 +1,13 @@
+---
+apiVersion: operators.coreos.com/v1alpha1
+kind: Subscription
+metadata:
+  name: authorino-operator
+  namespace: openshift-operators
+  annotations:
+    argocd.argoproj.io/sync-wave: "121"
+spec:
+  channel: stable
+  name: authorino-operator
+  source: community-operators
+  sourceNamespace: openshift-marketplace

instance-applications/112-ibm-odh/templates/05-odh-operator-job.yaml

@@ -0,0 +1,148 @@
+{{- $_job_name_prefix := "installplanpatch" }}
+
+{{- /*
+Use the build/bin/set-cli-image-digest.sh script to update this value across all charts.
+Included in $_job_hash (see below).
+*/}}
+{{- $_cli_image_digest := "sha256:934706a7173d45ea53c3d191afa6d75b4e41d25422e6a3685f1c57d1ddf49a00" }}
+
+{{- /*
+A dict of values that influence the behaviour of the job in some way.
+Any changes to values in this dict will trigger a rerun of the job.
+Since jobs must be idemopotent, it's generally safe to pass in values here that are not
+strictly necessary (i.e. including some values that don't actually influence job behaviour).
+We may want to refine this further though for jobs that can take a long time to complete.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_config_values := omit .Values "junitreporter" }}
+
+{{- /*
+Increment this value whenever you make a change to an immutable field of the Job resource.
+E.g. passing in a new environment variable.
+Included in $_job_hash (see below).
+*/}}
+{{- $_job_version := "v3" }}
+
+{{- /*
+10 char hash appended to the job name taking into account $_job_config_values, $_job_version and $_cli_image_digest
+This is to ensure ArgoCD will create a new job resource intead of attempting (and failing) to update an
+immutable field of any existing Job resource.
+*/}}
+{{- $_job_hash := print ($_job_config_values | toYaml) $_cli_image_digest $_job_version | adler32sum }}
+
+{{- $_job_name := join "-" (list $_job_name_prefix $_job_hash )}}
+
+
+{{- /*
+Set as the value for the mas.ibm.com/job-cleanup-group label on the Job resource.
+
+When the auto_delete flag is not set on the root application, a CronJob in the cluster uses this label 
+to identify old Job resources that should be pruned on behalf of ArgoCD.
+
+Any Job resources in the same namespace that have the mas.ibm.com/job-cleanup-group with this value
+will be considered to belong to the same cleanup group. All but the most recent (i.e. with the latest "creation_timestamp")
+Jobs will be automatically deleted.
+
+$_job_cleanup_group can usually just be based on $_job_name_prefix. There are some special cases
+where multiple Jobs are created in our templates using a Helm loop. In those cases, additional descriminators
+must be added to $_job_cleanup_group.
+
+By convention, we sha1sum this value to guarantee we never exceed the 63 char limit regardless of which discriminators
+are required here.
+
+*/}}
+{{- $_job_cleanup_group := cat $_job_name_prefix | sha1sum }}
+
+---
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: {{ .Values.odh_namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "122"
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: installplan-approver
+  namespace: {{ .Values.odh_namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "123"
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: installplan-approver
+  namespace: {{ .Values.odh_namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "124"
+rules:
+  - apiGroups: ["operators.coreos.com"]
+    resources: ["installplans"]
+    verbs: ["get", "list", "patch"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: installplan-approver
+  namespace: {{ .Values.odh_namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "125"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: installplan-approver
+subjects:
+  - kind: ServiceAccount
+    name: installplan-approver
+    namespace: {{ .Values.odh_namespace }}
+---
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ $_job_name }}-{{ .Values.odh_operator_version }}
+  namespace: {{ .Values.odh_namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "127"
+  labels:
+    mas.ibm.com/job-cleanup-group: {{ $_job_cleanup_group }}
+spec:
+  template:
+    spec:
+      serviceAccountName: installplan-approver
+      containers:
+        - name: installplanjob
+          image: quay.io/ibmmas/cli@{{ $_cli_image_digest }}
+          imagePullPolicy: IfNotPresent
+          resources:
+            limits:
+              cpu: 200m
+              memory: 512Mi
+            requests:
+              cpu: 10m
+              memory: 64Mi
+          env:
+            - name: ODH_NAMESPACE
+              value: "{{ .Values.odh_namespace }}"
+            - name: ODH_VERSION
+              value: "{{ .Values.odh_operator_version }}"
+          command:
+            - /bin/sh
+            - -c
+            - |
+              echo "Waiting for InstallPlans to be created..."
+              sleep 60
+
+              for i in $(seq 1 20); do
+                IP=$(oc get installplan -n "${ODH_NAMESPACE}" -o json \
+                  | jq -r --arg ODH_VERSION "$ODH_VERSION" '.items[] | select(.spec.clusterServiceVersionNames[] == $ODH_VERSION) | .metadata.name')
+
+                if [ "$IP" ]; then
+                  echo "Approving InstallPlan for ODH: $IP"
+                  oc patch installplan $IP -n ${ODH_NAMESPACE} --type merge --patch '{"spec":{"approved":true}}'
+                  break
+                fi
+                echo "InstallPlan not found. Retry $i..."
+                sleep 15
+              done
+      restartPolicy: OnFailure