Update from RobGeada/trustyai-service-operator@921e941

trustyai-explainability · Feb 12, 2024 · 8fcf7b9 · 8fcf7b9
1 parent 921e941
commit 8fcf7b9
Show file tree

Hide file tree

Showing 20 changed files with 9,952 additions and 345 deletions.
diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
@@ -76,12 +76,28 @@ jobs:
           echo "IMAGE_NAME=${{ vars.QUAY_RELEASE_REPO }}" >> $GITHUB_ENV
       #
       # Run docker commands
-      - name: Put expiry date on CI-tagged image
-        if:  env.BUILD_CONTEXT == 'ci'
-        run: sed -i 's#summary="odh-trustyai-service-operator\"#summary="odh-trustyai-service-operator" \\ \n      quay.expires-after=7d#' Dockerfile
-      - name: Log in to Quay
-        run: docker login -u ${{ secrets.QUAY_ROBOT_USERNAME }} -p ${{ secrets.QUAY_ROBOT_SECRET }} quay.io
-      - name: Build image
-        run: docker build -t ${{ env.IMAGE_NAME }}:$TAG .
-      - name: Push to Quay CI repo
-        run: docker push ${{ env.IMAGE_NAME }}:$TAG
+#      - name: Put expiry date on CI-tagged image
+#        if:  env.BUILD_CONTEXT == 'ci'
+#        run: sed -i 's#summary="odh-trustyai-service-operator\"#summary="odh-trustyai-service-operator" \\ \n      quay.expires-after=7d#' Dockerfile
+#      - name: Log in to Quay
+#        run: docker login -u ${{ secrets.QUAY_ROBOT_USERNAME }} -p ${{ secrets.QUAY_ROBOT_SECRET }} quay.io
+#      - name: Build image
+#        run: docker build -t ${{ env.IMAGE_NAME }}:$TAG .
+#      - name: Push to Quay CI repo
+#        run: docker push ${{ env.IMAGE_NAME }}:$TAG
+      - name: Set params.env for CI
+        #if: env.BUILD_CONTEXT == 'ci'
+        run: "sed -i \"s#quay.io/trustyai/trustyai-service-operator:latest#${{ env.IMAGE_NAME }}:${TAG}#\" ./config/base/params.env"
+      # pysh to ci-manifest repo
+      - uses: cpina/github-action-push-to-another-repository@main
+        #if:  env.BUILD_CONTEXT == 'ci'
+        env:
+          SSH_DEPLOY_KEY: ${{ secrets.TRUSTYAI_CI_BOT_SSH_KEY}}
+        with:
+          source-directory: '.'
+          destination-github-username: 'trustyai-ci-bot'
+          destination-repository-username: 'trustyai-explainability'
+          destination-repository-name: 'trustyai-service-operator-ci'
+          target-branch: $TAG
+          create-target-branch-if-needed: 'true'
+
diff --git a/config/base/params.env b/config/base/params.env
@@ -1,3 +1,3 @@
 trustyaiServiceImage=quay.io/trustyai/trustyai-service:latest
-trustyaiOperatorImage=quay.io/trustyai/trustyai-service-operator:latest
+trustyaiOperatorImage=:
 oauthProxyImage=registry.redhat.io/openshift4/ose-oauth-proxy:latest
diff --git a/config/crd/bases/trustyai.opendatahub.io_trustyaiservices.yaml b/config/crd/bases/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:
+            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
                   properties:
-                    filename:
+                    lastTransitionTime:
+                      format: date-time
                       type: string
-                    format:
+                    message:
                       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:
+                    reason:
                       type: string
-                    format:
+                    status:
                       type: string
-                    size:
+                    type:
                       type: string
                   required:
-                    - folder
-                    - format
-                    - size
+                  - lastTransitionTime
+                  - message
+                  - reason
+                  - status
+                  - type
                   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
-                    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: {}
+                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: {}