Merge branch 'trustyai-explainability:main' into main

red-hat-data-services · Jan 12, 2024 · 3f6a5dd · 3f6a5dd
2 parents f1fd530 + dc5d489
commit 3f6a5dd
Show file tree

Hide file tree

Showing 46 changed files with 1,576 additions and 781 deletions.
diff --git a/.github/workflows/lint-yaml.yaml b/.github/workflows/lint-yaml.yaml
@@ -0,0 +1,14 @@
+name: YAML lint
+
+on: [push, pull_request]
+
+jobs:
+  lintAllTheThings:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: yaml-lint
+        uses: ibiqlik/action-yamllint@v3
+        with:
+          file_or_dir: config/**/*.yaml
+          config_file: .yamllint.yaml
diff --git a/.yamllint.yaml b/.yamllint.yaml
@@ -0,0 +1,6 @@
+extends: default
+
+rules:
+  line-length:
+    max: 80
+    level: warning
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-[![Controller Tests](https://github.com/trustyai-explainability/trustyai-service-operator/actions/workflows/controller-tests.yaml/badge.svg)](https://github.com/trustyai-explainability/trustyai-service-operator/actions/workflows/controller-tests.yaml)
+[![Controller Tests](https://github.com/trustyai-explainability/trustyai-service-operator/actions/workflows/controller-tests.yaml/badge.svg)](https://github.com/trustyai-explainability/trustyai-service-operator/actions/workflows/controller-tests.yaml)[![YAML lint](https://github.com/trustyai-explainability/trustyai-service-operator/actions/workflows/lint-yaml.yaml/badge.svg)](https://github.com/trustyai-explainability/trustyai-service-operator/actions/workflows/lint-yaml.yaml)
 # TrustyAI Kubernetes Operator
 
 ## Overview

diff --git a/config/base/kustomization.yaml b/config/base/kustomization.yaml
@@ -1,18 +1,14 @@
-#namespace: trustyai-service-operator-system
-
+---
 namePrefix: trustyai-service-operator-
 
 resources:
-- ../crd
-- ../rbac
-- ../manager
+  - ../crd
+  - ../rbac
+  - ../manager
 
 commonLabels:
   app.kubernetes.io/part-of: trustyai
 
-patchesStrategicMerge:
-- manager_auth_proxy_patch.yaml
-
 configMapGenerator:
   - env: params.env
     name: config
@@ -37,4 +33,11 @@ vars:
       name: config
       apiVersion: v1
     fieldref:
-      fieldpath: data.trustyaiOperatorImage
+      fieldpath: data.trustyaiOperatorImage
+  - name: oauthProxyImage
+    objref:
+      kind: ConfigMap
+      name: config
+      apiVersion: v1
+    fieldref:
+      fieldpath: data.oauthProxyImage
diff --git a/config/base/manager_auth_proxy_patch.yaml b/config/base/manager_auth_proxy_patch.yaml
diff --git a/config/base/manager_config_patch.yaml b/config/base/manager_config_patch.yaml
diff --git a/config/base/params.env b/config/base/params.env
@@ -1,2 +1,3 @@
 trustyaiServiceImage=quay.io/trustyai/trustyai-service:latest
-trustyaiOperatorImage=quay.io/trustyai/trustyai-service-operator:latest
+trustyaiOperatorImage=quay.io/trustyai/trustyai-service-operator:latest
+oauthProxyImage=registry.redhat.io/openshift4/ose-oauth-proxy:latest
diff --git a/config/base/params.yaml b/config/base/params.yaml
@@ -1,3 +1,4 @@
+---
 varReference:
   - kind: Deployment
-    path: spec/template/spec/containers[]/image
+    path: spec/template/spec/containers[]/image
diff --git a/config/crd/bases/trustyai.opendatahub.io.trustyai.opendatahub.io_trustyaiservices.yaml b/config/crd/bases/trustyai.opendatahub.io.trustyai.opendatahub.io_trustyaiservices.yaml
@@ -15,108 +15,108 @@ spec:
     singular: trustyaiservice
   scope: Namespaced
   versions:
-  - name: v1alpha1
-    schema:
-      openAPIV3Schema:
-        description: TrustyAIService is the Schema for the trustyaiservices API
-        properties:
-          apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
+    - name: v1alpha1
+      schema:
+        openAPIV3Schema:
+          description: TrustyAIService is the Schema for the trustyaiservices API
+          properties:
+            apiVersion:
+              description: 'APIVersion defines the versioned schema of this representation
               of an object. Servers should convert recognized schemas to the latest
               internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-            type: string
-          kind:
-            description: 'Kind is a string value representing the REST resource this
+              type: string
+            kind:
+              description: 'Kind is a string value representing the REST resource this
               object represents. Servers may infer this from the endpoint the client
               submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-            type: string
-          metadata:
-            type: object
-          spec:
-            description: TrustyAIServiceSpec defines the desired state of TrustyAIService
-            properties:
-              data:
-                properties:
-                  filename:
-                    type: string
-                  format:
-                    type: string
-                required:
-                - filename
-                - format
-                type: object
-              metrics:
-                properties:
-                  batchSize:
-                    type: integer
-                  schedule:
-                    type: string
-                required:
-                - schedule
-                type: object
-              replicas:
-                description: Number of replicas
-                format: int32
-                type: integer
-              storage:
-                properties:
-                  folder:
-                    type: string
-                  format:
-                    type: string
-                  size:
-                    type: string
-                required:
-                - folder
-                - format
-                - size
-                type: object
-            required:
-            - data
-            - metrics
-            - storage
-            type: object
-          status:
-            description: TrustyAIServiceStatus defines the observed state of TrustyAIService
-            properties:
-              conditions:
-                items:
-                  description: Condition represents possible conditions of a TrustyAIServiceStatus
+              type: string
+            metadata:
+              type: object
+            spec:
+              description: TrustyAIServiceSpec defines the desired state of TrustyAIService
+              properties:
+                data:
                   properties:
-                    lastTransitionTime:
-                      format: date-time
+                    filename:
                       type: string
-                    message:
+                    format:
                       type: string
-                    reason:
+                  required:
+                    - filename
+                    - format
+                  type: object
+                metrics:
+                  properties:
+                    batchSize:
+                      type: integer
+                    schedule:
+                      type: string
+                  required:
+                    - schedule
+                  type: object
+                replicas:
+                  description: Number of replicas
+                  format: int32
+                  type: integer
+                storage:
+                  properties:
+                    folder:
                       type: string
-                    status:
+                    format:
                       type: string
-                    type:
+                    size:
                       type: string
                   required:
-                  - lastTransitionTime
-                  - message
-                  - reason
-                  - status
-                  - type
+                    - folder
+                    - format
+                    - size
                   type: object
-                type: array
-              phase:
-                description: Define your status fields here
-                type: string
-              ready:
-                type: string
-              replicas:
-                format: int32
-                type: integer
-            required:
-            - conditions
-            - phase
-            - replicas
-            type: object
-        type: object
-    served: true
-    storage: true
-    subresources:
-      status: {}
+              required:
+                - data
+                - metrics
+                - storage
+              type: object
+            status:
+              description: TrustyAIServiceStatus defines the observed state of TrustyAIService
+              properties:
+                conditions:
+                  items:
+                    description: Condition represents possible conditions of a TrustyAIServiceStatus
+                    properties:
+                      lastTransitionTime:
+                        format: date-time
+                        type: string
+                      message:
+                        type: string
+                      reason:
+                        type: string
+                      status:
+                        type: string
+                      type:
+                        type: string
+                    required:
+                      - lastTransitionTime
+                      - message
+                      - reason
+                      - status
+                      - type
+                    type: object
+                  type: array
+                phase:
+                  description: Define your status fields here
+                  type: string
+                ready:
+                  type: string
+                replicas:
+                  format: int32
+                  type: integer
+              required:
+                - conditions
+                - phase
+                - replicas
+              type: object
+          type: object
+      served: true
+      storage: true
+      subresources:
+        status: {}
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -1,10 +1,10 @@
 resources:
-- bases/trustyai.opendatahub.io.trustyai.opendatahub.io_trustyaiservices.yaml
+  - bases/trustyai.opendatahub.io.trustyai.opendatahub.io_trustyaiservices.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 
 configurations:
-- kustomizeconfig.yaml
+  - kustomizeconfig.yaml
diff --git a/config/crd/kustomizeconfig.yaml b/config/crd/kustomizeconfig.yaml
@@ -1,18 +1,18 @@
 nameReference:
-- kind: Service
-  version: v1
-  fieldSpecs:
-  - kind: CustomResourceDefinition
+  - kind: Service
     version: v1
-    group: apiextensions.k8s.io
-    path: spec/conversion/webhook/clientConfig/service/name
+    fieldSpecs:
+      - kind: CustomResourceDefinition
+        version: v1
+        group: apiextensions.k8s.io
+        path: spec/conversion/webhook/clientConfig/service/name
 
 namespace:
-- kind: CustomResourceDefinition
-  version: v1
-  group: apiextensions.k8s.io
-  path: spec/conversion/webhook/clientConfig/service/namespace
-  create: false
+  - kind: CustomResourceDefinition
+    version: v1
+    group: apiextensions.k8s.io
+    path: spec/conversion/webhook/clientConfig/service/namespace
+    create: false
 
 varReference:
-- path: metadata/annotations
+  - path: metadata/annotations
diff --git a/config/crd/patches/webhook_in_trustyaiservices.yaml b/config/crd/patches/webhook_in_trustyaiservices.yaml
@@ -12,4 +12,4 @@ spec:
           name: webhook-service
           path: /convert
       conversionReviewVersions:
-      - v1
+        - v1
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -1,4 +1,4 @@
 resources:
-- manager.yaml
+  - manager.yaml
 apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
+kind: Kustomization